Change warp options

2024-02-20 22:16:47 +03:30
parent c279e3550e
commit dc1b342ff6
11 changed files with 82 additions and 68 deletions
--- a/assets/translations/strings_en.i18n.json
+++ b/assets/translations/strings_en.i18n.json
@@ -243,6 +243,7 @@
            },
            "generateWarpConfig": "Generate WARP config",
            "missingWarpConfig": "Missing WARP config",
+            "warpConfigGenerated": "WARP config generated",
            "pageTitle": "Config Options",
            "logLevel": "Log Level",
            "resolveDestination": "Resolve Destination",
--- a/lib/features/config_option/data/config_option_repository.dart
+++ b/lib/features/config_option/data/config_option_repository.dart
@@ -18,7 +18,7 @@ abstract interface class ConfigOptionRepository {
    ConfigOptionPatch patch,
  );
  TaskEither<ConfigOptionFailure, Unit> resetConfigOption();
-  TaskEither<ConfigOptionFailure, Unit> generateWarpConfig();
+  TaskEither<ConfigOptionFailure, String> generateWarpConfig();
 }

 abstract interface class SingBoxConfigOptionRepository {
@@ -115,7 +115,7 @@ class ConfigOptionRepositoryImpl
  }

  @override
-  TaskEither<ConfigOptionFailure, Unit> generateWarpConfig() {
+  TaskEither<ConfigOptionFailure, String> generateWarpConfig() {
    return exceptionHandler(
      () async {
        final options = getConfigOption().getOrElse((l) => throw l);
@@ -131,8 +131,9 @@ class ConfigOptionRepositoryImpl
                ConfigOptionPatch(
                  warpAccountId: warp.accountId,
                  warpAccessToken: warp.accessToken,
+                  warpWireguardConfig: warp.wireguardConfig,
                ),
-              ),
+              ).map((_) => warp.log),
            )
            .run();
      },
--- a/lib/features/config_option/model/config_option_entity.dart
+++ b/lib/features/config_option/model/config_option_entity.dart
@@ -68,6 +68,7 @@ class ConfigOptionEntity with _$ConfigOptionEntity {
    @OptionalRangeJsonConverter()
    @Default(OptionalRange())
    OptionalRange warpNoise,
+    @Default("") String warpWireguardConfig,
  }) = _ConfigOptionEntity;

  factory ConfigOptionEntity.initial() => ConfigOptionEntity(
@@ -140,6 +141,7 @@ class ConfigOptionEntity with _$ConfigOptionEntity {
      warpCleanIp: patch.warpCleanIp ?? warpCleanIp,
      warpPort: patch.warpPort ?? warpPort,
      warpNoise: patch.warpNoise ?? warpNoise,
+      warpWireguardConfig: patch.warpWireguardConfig ?? warpWireguardConfig,
    );
  }

@@ -184,17 +186,20 @@ class ConfigOptionEntity with _$ConfigOptionEntity {
      muxPadding: muxPadding,
      muxMaxStreams: muxMaxStreams,
      muxProtocol: muxProtocol,
-      enableWarp: enableWarp,
-      warpDetourMode: warpDetourMode,
-      warpLicenseKey: warpLicenseKey,
-      warpAccountId: warpAccountId,
-      warpAccessToken: warpAccessToken,
-      warpCleanIp: warpCleanIp,
-      warpPort: warpPort,
-      warpNoise: warpNoise,
      geoipPath: geoipPath,
      geositePath: geositePath,
      rules: rules,
+      warp: SingboxWarpOption(
+        enable: enableWarp,
+        mode: warpDetourMode,
+        licenseKey: warpLicenseKey,
+        accountId: warpAccountId,
+        accessToken: warpAccessToken,
+        cleanIp: warpCleanIp,
+        cleanPort: warpPort,
+        warpNoise: warpNoise,
+        wireguardConfig: warpWireguardConfig,
+      ),
    );
  }

@@ -248,6 +253,7 @@ class ConfigOptionPatch with _$ConfigOptionPatch {
    String? warpCleanIp,
    int? warpPort,
    @OptionalRangeJsonConverter() OptionalRange? warpNoise,
+    String? warpWireguardConfig,
  }) = _ConfigOptionPatch;

  factory ConfigOptionPatch.fromJson(Map<String, dynamic> json) =>
--- a/lib/features/config_option/notifier/warp_option_notifier.dart
+++ b/lib/features/config_option/notifier/warp_option_notifier.dart
@@ -1,4 +1,3 @@
-import 'package:fpdart/fpdart.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hiddify/core/preferences/preferences_provider.dart';
 import 'package:hiddify/features/config_option/data/config_option_data_providers.dart';
@@ -27,7 +26,7 @@ class WarpOptionNotifier extends _$WarpOptionNotifier with AppLogger {
    return WarpOptions(
      consentGiven: consent,
      configGeneration: hasWarpConfig
-          ? const AsyncValue.data(unit)
+          ? const AsyncValue.data("")
          : AsyncError(const MissingWarpConfigFailure(), StackTrace.current),
    );
  }
@@ -66,6 +65,6 @@ class WarpOptionNotifier extends _$WarpOptionNotifier with AppLogger {
 class WarpOptions with _$WarpOptions {
  const factory WarpOptions({
    required bool consentGiven,
-    required AsyncValue<Unit> configGeneration,
+    required AsyncValue<String> configGeneration,
  }) = _WarpOptions;
 }
--- a/lib/features/config_option/overview/warp_options_widgets.dart
+++ b/lib/features/config_option/overview/warp_options_widgets.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:hiddify/core/localization/translations.dart';
 import 'package:hiddify/core/model/constants.dart';
 import 'package:hiddify/core/model/optional_range.dart';
+import 'package:hiddify/core/widget/custom_alert_dialog.dart';
 import 'package:hiddify/features/config_option/model/config_option_entity.dart';
 import 'package:hiddify/features/config_option/notifier/warp_option_notifier.dart';
 import 'package:hiddify/features/settings/widgets/settings_input_dialog.dart';
@@ -32,6 +33,18 @@ class WarpOptionsTiles extends HookConsumerWidget {
    final warpPrefaceCompleted = warpOptions.consentGiven;
    final canChangeOptions = warpPrefaceCompleted && options.enableWarp;

+    ref.listen(
+      warpOptionNotifierProvider.select((value) => value.configGeneration),
+      (previous, next) async {
+        if (next case AsyncData(value: final log) when log.isNotEmpty) {
+          await CustomAlertDialog(
+            title: t.settings.config.warpConfigGenerated,
+            message: log,
+          ).show(context);
+        }
+      },
+    );
+
    return Column(
      children: [
        SwitchListTile(
--- a/lib/singbox/model/singbox_config_option.dart
+++ b/lib/singbox/model/singbox_config_option.dart
@@ -51,17 +51,10 @@ class SingboxConfigOption with _$SingboxConfigOption {
    required bool muxPadding,
    required int muxMaxStreams,
    required MuxProtocol muxProtocol,
-    required bool enableWarp,
-    required WarpDetourMode warpDetourMode,
-    required String warpLicenseKey,
-    required String warpAccountId,
-    required String warpAccessToken,
-    required String warpCleanIp,
-    required int warpPort,
-    @OptionalRangeJsonConverter() required OptionalRange warpNoise,
    required String geoipPath,
    required String geositePath,
    required List<SingboxRule> rules,
+    required SingboxWarpOption warp,
  }) = _SingboxConfigOption;

  String format() {
@@ -72,3 +65,21 @@ class SingboxConfigOption with _$SingboxConfigOption {
  factory SingboxConfigOption.fromJson(Map<String, dynamic> json) =>
      _$SingboxConfigOptionFromJson(json);
 }
+
+@freezed
+class SingboxWarpOption with _$SingboxWarpOption {
+  const factory SingboxWarpOption({
+    required bool enable,
+    required WarpDetourMode mode,
+    required String wireguardConfig,
+    required String licenseKey,
+    required String accountId,
+    required String accessToken,
+    required String cleanIp,
+    required int cleanPort,
+    @OptionalRangeJsonConverter() required OptionalRange warpNoise,
+  }) = _SingboxWarpOption;
+
+  factory SingboxWarpOption.fromJson(Map<String, dynamic> json) =>
+      _$SingboxWarpOptionFromJson(json);
+}
--- a/lib/singbox/model/warp_account.dart
+++ b/lib/singbox/model/warp_account.dart
@@ -1,17 +1,26 @@
-import 'package:flutter/foundation.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
+import 'dart:convert';

-part 'warp_account.freezed.dart';
-part 'warp_account.g.dart';
+typedef WarpResponse = ({
+  String log,
+  String accountId,
+  String accessToken,
+  String wireguardConfig,
+});

-@freezed
-class WarpAccount with _$WarpAccount {
-  const factory WarpAccount({
-    required String licenseKey,
-    required String accountId,
-    required String accessToken,
-  }) = _WarpAccount;
-
-  factory WarpAccount.fromJson(Map<String, dynamic> json) =>
-      _$WarpAccountFromJson(json);
+WarpResponse warpFromJson(dynamic json) {
+  if (json
+      case {
+        "account-id": final String newAccountId,
+        "access-token": final String newAccessToken,
+        "log": final String log,
+        "config": final Map<String, dynamic> wireguardConfig,
+      }) {
+    return (
+      log: log,
+      accountId: newAccountId,
+      accessToken: newAccessToken,
+      wireguardConfig: jsonEncode(wireguardConfig),
+    );
+  }
+  throw Exception("invalid response");
 }
--- a/lib/singbox/service/ffi_singbox_service.dart
+++ b/lib/singbox/service/ffi_singbox_service.dart
@@ -457,7 +457,7 @@ class FFISingboxService with InfraLogger implements SingboxService {
  }

  @override
-  TaskEither<String, WarpAccount> generateWarpConfig({
+  TaskEither<String, WarpResponse> generateWarpConfig({
    required String licenseKey,
    required String previousAccountId,
    required String previousAccessToken,
@@ -477,20 +477,7 @@ class FFISingboxService with InfraLogger implements SingboxService {
          if (response.startsWith("error:")) {
            return left(response.replaceFirst('error:', ""));
          }
-          if (jsonDecode(response)
-              case {
-                "account-id": final String newAccountId,
-                "access-token": final String newAccessToken,
-              }) {
-            return right(
-              WarpAccount(
-                licenseKey: licenseKey,
-                accountId: newAccountId,
-                accessToken: newAccessToken,
-              ),
-            );
-          }
-          return left("invalid response");
+          return right(warpFromJson(jsonDecode(response)));
        },
      ),
    );
--- a/lib/singbox/service/platform_singbox_service.dart
+++ b/lib/singbox/service/platform_singbox_service.dart
@@ -266,7 +266,7 @@ class PlatformSingboxService with InfraLogger implements SingboxService {
  }

  @override
-  TaskEither<String, WarpAccount> generateWarpConfig({
+  TaskEither<String, WarpResponse> generateWarpConfig({
    required String licenseKey,
    required String previousAccountId,
    required String previousAccessToken,
@@ -282,20 +282,7 @@ class PlatformSingboxService with InfraLogger implements SingboxService {
            "previous-access-token": previousAccessToken,
          },
        );
-        if (jsonDecode(warpConfig as String)
-            case {
-              "account-id": final String newAccountId,
-              "access-token": final String newAccessToken,
-            }) {
-          return right(
-            WarpAccount(
-              licenseKey: licenseKey,
-              accountId: newAccountId,
-              accessToken: newAccessToken,
-            ),
-          );
-        }
-        return left("invalid response");
+        return right(warpFromJson(jsonDecode(warpConfig as String)));
      },
    );
  }
--- a/lib/singbox/service/singbox_service.dart
+++ b/lib/singbox/service/singbox_service.dart
@@ -87,7 +87,7 @@ abstract interface class SingboxService {

  TaskEither<String, Unit> clearLogs();

-  TaskEither<String, WarpAccount> generateWarpConfig({
+  TaskEither<String, WarpResponse> generateWarpConfig({
    required String licenseKey,
    required String previousAccountId,
    required String previousAccessToken,
--- a/2
+++ b/2