MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

finished implementation

Browse Source
This commit is contained in:
Fabian Freund
2025-09-14 11:41:01 +02:00
parent ac0f3b5dcc
commit a8334ae684
30 changed files with 848 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/tor/domain/repositories/builtin_bridges.dart
+49
View File
@@ -0,0 +1,49 @@
import 'package:pluggable_transports_proxy/pluggable_transports_proxy.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:weblibre/core/logger.dart';
import 'package:weblibre/features/tor/data/services/builtin_bridges.dart';
part 'builtin_bridges.g.dart';
@Riverpod()
class BuiltinBridgesRepository extends _$BuiltinBridgesRepository {
Future<void> updateIfNecessary() async {
final lastUpdate = await ref
.read(builtinBridgesServiceProvider.notifier)
.lastUpdate();
if (lastUpdate == null ||
DateTime.now().difference(lastUpdate) > const Duration(days: 2)) {
BuiltInBridges? remoteBridges;
try {
remoteBridges = await service.getBuiltinBridges();
} catch (e, s) {
logger.e('Failed fetching builtin bridges', error: e, stackTrace: s);
}
if (remoteBridges != null) {
await ref
.read(builtinBridgesServiceProvider.notifier)
.updateStoredBuiltinBridges(remoteBridges);
}
}
}
Future<BuiltInBridges> getBridges({bool tryUpdate = true}) async {
if (tryUpdate) {
await updateIfNecessary();
}
final storedBridges = await ref
.read(builtinBridgesServiceProvider.notifier)
.getStoredBuiltinBridges();
return storedBridges ??
await ref
.read(builtinBridgesServiceProvider.notifier)
.getBundledBuiltinBridges();
}
@override
void build(MoatService service) {}
}
app/lib/features/tor/domain/repositories/builtin_bridges.g.dart
+166
View File
@@ -0,0 +1,166 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'builtin_bridges.dart';
// **************************************************************************
// RiverpodGenerator
// **************************************************************************
String _$builtinBridgesRepositoryHash() =>
r'05fc40a7742fc266aeb76b4e3f1d9bdfdb8d448f';
/// Copied from Dart SDK
class _SystemHash {
_SystemHash._();
static int combine(int hash, int value) {
// ignore: parameter_assignments
hash = 0x1fffffff & (hash + value);
// ignore: parameter_assignments
hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
return hash ^ (hash >> 6);
}
static int finish(int hash) {
// ignore: parameter_assignments
hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
// ignore: parameter_assignments
hash = hash ^ (hash >> 11);
return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
}
}
abstract class _$BuiltinBridgesRepository
extends BuildlessAutoDisposeNotifier<void> {
late final MoatService service;
void build(MoatService service);
}
/// See also [BuiltinBridgesRepository].
@ProviderFor(BuiltinBridgesRepository)
const builtinBridgesRepositoryProvider = BuiltinBridgesRepositoryFamily();
/// See also [BuiltinBridgesRepository].
class BuiltinBridgesRepositoryFamily extends Family<void> {
/// See also [BuiltinBridgesRepository].
const BuiltinBridgesRepositoryFamily();
/// See also [BuiltinBridgesRepository].
BuiltinBridgesRepositoryProvider call(MoatService service) {
return BuiltinBridgesRepositoryProvider(service);
}
@override
BuiltinBridgesRepositoryProvider getProviderOverride(
covariant BuiltinBridgesRepositoryProvider provider,
) {
return call(provider.service);
}
static const Iterable<ProviderOrFamily>? _dependencies = null;
@override
Iterable<ProviderOrFamily>? get dependencies => _dependencies;
static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
@override
Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
_allTransitiveDependencies;
@override
String? get name => r'builtinBridgesRepositoryProvider';
}
/// See also [BuiltinBridgesRepository].
class BuiltinBridgesRepositoryProvider
extends AutoDisposeNotifierProviderImpl<BuiltinBridgesRepository, void> {
/// See also [BuiltinBridgesRepository].
BuiltinBridgesRepositoryProvider(MoatService service)
: this._internal(
() => BuiltinBridgesRepository()..service = service,
from: builtinBridgesRepositoryProvider,
name: r'builtinBridgesRepositoryProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$builtinBridgesRepositoryHash,
dependencies: BuiltinBridgesRepositoryFamily._dependencies,
allTransitiveDependencies:
BuiltinBridgesRepositoryFamily._allTransitiveDependencies,
service: service,
);
BuiltinBridgesRepositoryProvider._internal(
super._createNotifier, {
required super.name,
required super.dependencies,
required super.allTransitiveDependencies,
required super.debugGetCreateSourceHash,
required super.from,
required this.service,
}) : super.internal();
final MoatService service;
@override
void runNotifierBuild(covariant BuiltinBridgesRepository notifier) {
return notifier.build(service);
}
@override
Override overrideWith(BuiltinBridgesRepository Function() create) {
return ProviderOverride(
origin: this,
override: BuiltinBridgesRepositoryProvider._internal(
() => create()..service = service,
from: from,
name: null,
dependencies: null,
allTransitiveDependencies: null,
debugGetCreateSourceHash: null,
service: service,
),
);
}
@override
AutoDisposeNotifierProviderElement<BuiltinBridgesRepository, void>
createElement() {
return _BuiltinBridgesRepositoryProviderElement(this);
}
@override
bool operator ==(Object other) {
return other is BuiltinBridgesRepositoryProvider &&
other.service == service;
}
@override
int get hashCode {
var hash = _SystemHash.combine(0, runtimeType.hashCode);
hash = _SystemHash.combine(hash, service.hashCode);
return _SystemHash.finish(hash);
}
}
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
mixin BuiltinBridgesRepositoryRef on AutoDisposeNotifierProviderRef<void> {
/// The parameter `service` of this provider.
MoatService get service;
}
class _BuiltinBridgesRepositoryProviderElement
extends AutoDisposeNotifierProviderElement<BuiltinBridgesRepository, void>
with BuiltinBridgesRepositoryRef {
_BuiltinBridgesRepositoryProviderElement(super.provider);
@override
MoatService get service =>
(origin as BuiltinBridgesRepositoryProvider).service;
}
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
app/lib/features/tor/domain/services/tor_proxy.dart
+105 -8
View File
@@ -20,13 +20,17 @@
import 'dart:async';
import 'dart:ui';
import 'package:collection/collection.dart';
import 'package:flutter_background_service/flutter_background_service.dart';
import 'package:nullability/nullability.dart';
import 'package:pluggable_transports_proxy/pluggable_transports_proxy.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:rxdart/rxdart.dart';
import 'package:weblibre/core/logger.dart';
import 'package:weblibre/features/geckoview/features/browser/domain/providers/lifecycle.dart';
import 'package:weblibre/features/tor/domain/repositories/builtin_bridges.dart';
import 'package:weblibre/features/tor/utils/tor_entrypoint.dart';
import 'package:weblibre/features/user/data/models/tor_settings.dart';
import 'package:weblibre/features/user/domain/repositories/tor_settings.dart';
part 'tor_proxy.g.dart';
@@ -38,9 +42,19 @@ class _TorService {
ValueStream<int?> get portStream => _portSubject.stream;
Future<void> start({ProxyType? proxyType, String? bridgeLines}) async {
Future<void> startOrReconfigure({
ProxyType? proxyType,
String? bridgeLines,
}) async {
await service.startService();
service.invoke('start', {
service.invoke('startOrReconfigure', {
if (proxyType != null) 'proxyType': proxyType.name,
if (bridgeLines != null) 'bridgeLines': bridgeLines,
});
}
Future<void> reconfigure({ProxyType? proxyType, String? bridgeLines}) async {
service.invoke('reconfigure', {
if (proxyType != null) 'proxyType': proxyType.name,
if (bridgeLines != null) 'bridgeLines': bridgeLines,
});
@@ -101,7 +115,7 @@ class TorProxyService extends _$TorProxyService {
});
}
Future<void> connect({bool forceReconnect = false}) async {
Future<void> startOrReconfigure({bool forceReconnect = false}) async {
final currentPort = await requestSync();
if (currentPort == null || forceReconnect) {
@@ -111,14 +125,97 @@ class TorProxyService extends _$TorProxyService {
.read(torSettingsRepositoryProvider.notifier)
.fetchSettings();
if (torSettings.autoConfig) {
final moat = MoatService();
final config = await moat.autoConf();
Setting? setting;
if (torSettings.config == TorConnectionConfig.auto) {
List<Setting>? config;
todo
final moat = MoatService();
try {
await moat.initialize();
config = await moat.autoConf(
cannotConnectWithoutPt: torSettings.requireBridge,
);
if (config == null && torSettings.requireBridge) {
config = MoatService.convertBuiltinToSettings(
await ref
.read(builtinBridgesRepositoryProvider(moat).notifier)
.getBridges(),
);
}
} catch (e, s) {
logger.e('Failed auto configure bridges', error: e, stackTrace: s);
} finally {
await moat.dispose();
}
setting = config.mapNotNull(
(config) =>
config.firstWhereOrNull(
(setting) => setting.bridge.type == TransportType.obfs4,
) ??
config.firstWhereOrNull(
(setting) => setting.bridge.type == TransportType.snowflake,
),
);
} else if (torSettings.config != TorConnectionConfig.direct) {
List<Setting>? config;
final moat = MoatService();
try {
await moat.initialize();
if (torSettings.fetchRemoteBridges) {
config = await moat.getDefaultBridges();
}
if (config == null && torSettings.requireBridge) {
config = MoatService.convertBuiltinToSettings(
await ref
.read(builtinBridgesRepositoryProvider(moat).notifier)
.getBridges(tryUpdate: torSettings.fetchRemoteBridges),
);
}
setting = config.mapNotNull(
(config) => config.firstWhereOrNull(
(setting) =>
setting.bridge.type ==
switch (torSettings.config) {
TorConnectionConfig.auto => throw UnimplementedError(),
TorConnectionConfig.direct => throw UnimplementedError(),
TorConnectionConfig.obfs4 => TransportType.obfs4,
TorConnectionConfig.snowflake => TransportType.snowflake,
},
),
);
} catch (e, s) {
logger.e('Failed auto configure bridges', error: e, stackTrace: s);
} finally {
await moat.dispose();
}
}
if (setting != null) {
switch (setting.bridge.type) {
case TransportType.obfs4:
await _tor.startOrReconfigure(
proxyType: ProxyType.obfs4,
bridgeLines: setting.bridge.bridges?.join('\n'),
);
case TransportType.snowflake:
await _tor.startOrReconfigure(
proxyType: ProxyType.snowflake,
bridgeLines: setting.bridge.bridges?.join('\n'),
);
case TransportType.meek:
case TransportType.meekAzure:
case TransportType.webtunnel:
throw UnimplementedError();
}
} else {
await _tor.startOrReconfigure();
}
await _tor.start();
_enableHeartbeatTimer();
}
}
app/lib/features/tor/domain/services/tor_proxy.g.dart
+26
View File
@@ -0,0 +1,26 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'tor_proxy.dart';
// **************************************************************************
// RiverpodGenerator
// **************************************************************************
String _$torProxyServiceHash() => r'82b4964ddf14d02893ebbea3b25d91216359ba10';
/// See also [TorProxyService].
@ProviderFor(TorProxyService)
final torProxyServiceProvider =
AsyncNotifierProvider<TorProxyService, int?>.internal(
TorProxyService.new,
name: r'torProxyServiceProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$torProxyServiceHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$TorProxyService = AsyncNotifier<int?>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package