Merge pull request #228 from Muska-Ami/dev

Muska-Ami · web-flow · commit 65f7622759db · 2025-02-02T17:22:17.000+08:00
Update to 1.0.1+1
diff --git a/RELEASE_CHANGELOG.md b/RELEASE_CHANGELOG.md
@@ -4,24 +4,23 @@
 
 ### GUI
 
-- 使用随机可用端口进行授权
-- 修复了 Task 潜在的异常问题
-- 修复一个错误的日志输出
+-/-
 
 ### CLI
 
-- 使用随机可用端口进行授权
+- 修复了 CLI 无法授权的问题
+- 修复了 CLI 在部分系统上退出行为异常的问题
 
 ### NyaLCF Core
 
-- 使用随机端口分配启动鉴权回调服务
+- 更新到 LoCyanFrp 0.51.3-8 #2025020201
 
 ## 版本信息
 
-- nyalcf_gui: 1.0.0
-- nyalcf_cli: 1.0.0
+- nyalcf_gui: 1.0.1
+- nyalcf_cli: 1.0.1
 - nyalcf_env: 2.0.0
-- nyalcf_core: 2.0.1
+- nyalcf_core: 2.0.2
 - nyalcf_inject: 2.0.0
 
 <!-- Some change log here -->
diff --git a/nyalcf_cli/bin/nyalcf_cli.dart b/nyalcf_cli/bin/nyalcf_cli.dart
@@ -3,12 +3,6 @@ import 'dart:io';
 
 // Package imports:
 import 'package:args/args.dart';
-import 'package:nyalcf_core/storages/configurations/launcher_configuration_storage.dart';
-import 'package:nyalcf_core/storages/injector.dart';
-import 'package:nyalcf_core/utils/logger.dart';
-import 'package:nyalcf_core_extend/utils/path_provider.dart';
-import 'package:nyalcf_inject/nyalcf_inject.dart';
-
 // Project imports:
 import 'package:nyalcf/arguments.dart';
 import 'package:nyalcf/commands/authorize.dart';
@@ -17,8 +11,14 @@ import 'package:nyalcf/commands/download.dart';
 import 'package:nyalcf/commands/logout.dart';
 import 'package:nyalcf/commands/start.dart';
 import 'package:nyalcf/state.dart';
+import 'package:nyalcf_core/storages/configurations/launcher_configuration_storage.dart';
+import 'package:nyalcf_core/storages/injector.dart';
+import 'package:nyalcf_core/utils/logger.dart';
+import 'package:nyalcf_core_extend/storages/injector.dart';
+import 'package:nyalcf_core_extend/utils/path_provider.dart';
+import 'package:nyalcf_inject/nyalcf_inject.dart';
 
-final version = '0.0.3';
+final version = '1.0.1+1';
 
 ArgParser buildParser() {
   return Arguments.all;
@@ -36,6 +36,7 @@ void main(List<String> arguments) async {
   /// 初始化配置文件等
   await PathProvider.loadPath();
   await StoragesInjector.init();
+  await CliStoragesInjector.init();
   await Logger.init();
 
   final lcs = LauncherConfigurationStorage();
@@ -53,7 +54,6 @@ void main(List<String> arguments) async {
     // Process the parsed arguments.
     if (results.wasParsed('help')) {
       printUsage(argParser);
-      return;
     }
 
     // 登录登出
@@ -72,7 +72,6 @@ void main(List<String> arguments) async {
     // 版本信息
     if (results.wasParsed('version')) {
       Logger.info('Nya LoCyanFrp! CLI version: $version');
-      return;
     }
 
     // 下载 Frpc
diff --git a/nyalcf_cli/lib/commands/authorize.dart b/nyalcf_cli/lib/commands/authorize.dart
@@ -30,37 +30,48 @@ class Authorize implements Command {
     final ApiClient api = ApiClient();
 
     final port = await startHttpServer();
-    Logger.info(
-      'Please open this link to authorize: '
-      'http://dashboard.locyanfrp.cn/auth/oauth/authorize'
+    await Logger.info('Please open this link to authorize:');
+    await Logger.info(
+      'https://dashboard.locyanfrp.cn/auth/oauth/authorize'
       '?app_id=1'
       '&scopes=User,Proxy,Sign'
       '&redirect_url='
       'https%3A%2F%2Fdashboard.locyanfrp.cn%2Fcallback%2Fauth%2Foauth%2Flocalhost%3Fport%3D$port%26ssl%3Dfalse%26path%3D%2Foauth%2Fcallback',
     );
     Logger.write('Waiting callback...');
-    Future.doWhile(() async {
+    await Future.doWhile(() async {
       await Future.delayed(const Duration(milliseconds: 1000)); // 延迟检查
       return !_callback;
     });
-    if (_refreshToken == null) exit(1);
+    Logger.write('Continuing authorizing...\n');
+    if (_refreshToken == null) {
+      Logger.error('No refresh token callback, quit.');
+      exit(1);
+    }
     final rs = await api.post(PostAccessToken(
       appId: 1,
       refreshToken: _refreshToken!,
     ));
-    if (rs == null) exit(1);
+    if (rs == null) {
+      Logger.error('Request access token failed.');
+      exit(1);
+    }
     final int userId = rs.data['data']['user_id'];
     final String accessToken = rs.data['data']['access_token'];
     _tokenStorage.setRefreshToken(_refreshToken!);
     _tokenStorage.setAccessToken(accessToken);
 
+    Logger.info('Getting user info...');
+
     final apix = ApiClient(accessToken: accessToken);
     final rsInfo = await apix.get(user_info.GetInfo(
       userId: userId,
     ));
     final rsFrpToken = await apix.get(user_frp_token.GetToken(
       userId: userId,
     ));
+    Logger.debug(rsInfo);
+    Logger.debug(rsFrpToken);
     if (rsInfo == null || rsFrpToken == null) exit(1);
     final userInfo = UserInfoModel(
       username: rsInfo.data['data']['username'],
@@ -70,11 +81,15 @@ class Authorize implements Command {
           "${md5.convert(utf8.encode(rsInfo.data['data']['email']))}",
       inbound: rsInfo.data['data']['inbound'],
       outbound: rsInfo.data['data']['outbound'],
-      traffic: rsInfo.data['data']['traffic'],
+      traffic: num.parse(rsInfo.data['data']['traffic']),
     );
     UserInfoStorage.save(userInfo);
     final frpToken = rsFrpToken.data['data']['frp_token'];
     _tokenStorage.setFrpToken(frpToken);
+    _tokenStorage.save();
+    Logger.info('Authorized success.');
+    await OAuth.close();
+    exit(0);
   }
 
   Future<int> startHttpServer() async {
diff --git a/nyalcf_cli/lib/commands/config.dart b/nyalcf_cli/lib/commands/config.dart
@@ -1,3 +1,6 @@
+// Dart imports:
+import 'dart:io';
+
 // Package imports:
 import 'package:nyalcf_core/storages/configurations/launcher_configuration_storage.dart';
 import 'package:nyalcf_core/utils/logger.dart';
@@ -35,6 +38,7 @@ class Config implements Command {
     } else {
       Logger.error('No valid arguments provided.');
     }
+    exit(0);
   }
 
   dynamic _convert(dynamic originValue, String input) {
diff --git a/nyalcf_cli/lib/commands/download.dart b/nyalcf_cli/lib/commands/download.dart
@@ -67,16 +67,16 @@ class Download implements Command {
           await FrpClient().download(
             architecture: _selectedArch,
             platform: platform,
-            version: '0.51.3-6',
-            name: 'LoCyanFrp-0.51.3-6 #2024100301',
+            version: '0.51.3-8',
+            name: 'LoCyanFrp-0.51.3-8 #2025020201',
             cancelToken: _cancelToken,
             onReceiveProgress: callback,
             onFailed: onFailed,
             useMirror: false,
           );
           Logger.write('Please wait, extracting frpc...');
           await FrpcArchive.extract(
-              platform: platform, arch: _selectedArch, version: '0.51.3-6');
+              platform: platform, arch: _selectedArch, version: '0.51.3-8');
           Logger.info('Success!');
         } else {
           Logger.error(
@@ -87,6 +87,7 @@ class Download implements Command {
       default:
         Logger.error('No valid arguments provided.');
     }
+    exit(0);
   }
 
   void getPlatformFrpcArchList() {
diff --git a/nyalcf_cli/lib/commands/logout.dart b/nyalcf_cli/lib/commands/logout.dart
@@ -1,5 +1,8 @@
 // Package imports:
 
+// Dart imports:
+import 'dart:io';
+
 // Package imports:
 import 'package:nyalcf_core/storages/stores/user_info_storage.dart';
 import 'package:nyalcf_core/utils/logger.dart';
@@ -12,5 +15,6 @@ class Logout implements Command {
   Future<void> main(List<String> args) async {
     await UserInfoStorage.logout();
     Logger.info('Session data removed.');
+    exit(0);
   }
 }
diff --git a/nyalcf_cli/lib/commands/start.dart b/nyalcf_cli/lib/commands/start.dart
@@ -22,11 +22,11 @@ class Start implements Command {
       final user = await userInfo;
       if (_tokenStorage.getFrpToken() == null) {
         Logger.error('No frp token found, please do authorize first.');
-        return;
+        exit(0);
       }
       if (user == null) {
         Logger.error('No valid arguments provided.');
-        return;
+        exit(0);
       }
       for (var proxyId in args) {
         final frpcPath = await FrpcStorage().getFilePath(skipCheck: false);
@@ -44,7 +44,7 @@ class Start implements Command {
           Logger.info('Started proxy: $proxyId');
         } else {
           Logger.error('You have no frpc installed yet!');
-          return;
+          exit(0);
         }
       }
 
@@ -63,7 +63,7 @@ class Start implements Command {
           for (var process in ProcessManager.processList) {
             process.process.kill();
           }
-          return;
+          exit(0);
         }
       });
     } else {
diff --git a/nyalcf_cli/nyalcf_core_extend/lib/storages/injector.dart b/nyalcf_cli/nyalcf_core_extend/lib/storages/injector.dart
@@ -0,0 +1,11 @@
+// Project imports:
+import 'package:nyalcf_core_extend/storages/token_storage.dart';
+
+class CliStoragesInjector {
+  /// 初始化数据存储
+  static init() async {
+    final ts = TokenStorage();
+
+    await ts.initCfg();
+  }
+}
diff --git a/nyalcf_cli/nyalcf_core_extend/lib/storages/token_storage.dart b/nyalcf_cli/nyalcf_core_extend/lib/storages/token_storage.dart
@@ -6,25 +6,26 @@ import 'package:nyalcf_core/storages/json_configuration.dart';
 
 class TokenStorage extends JsonConfiguration {
   @override
-  File get file => File('$path/frpc/proxies/autostart.json');
+  File get file => File('$path/token.json');
 
   @override
   String get handle => 'TOKEN';
 
   @override
   Map<String, dynamic> get defConfig => {
-    'refresh_token': null,
-    'access_token': null,
-    'frp_token': null,
-  };
+        'refresh_token': null,
+        'access_token': null,
+        'frp_token': null,
+      };
 
   void setRefreshToken(String value) => cfg.setString('refresh_token', value);
-  String? getRefreshToken() => cfg.getString('refresh_token', defConfig['refresh_token']);
+  String? getRefreshToken() =>
+      cfg.getString('refresh_token', defConfig['refresh_token']);
 
   void setAccessToken(String value) => cfg.setString('access_token', value);
-  String? getAccessToken() => cfg.getString('access_token', defConfig['access_token']);
+  String? getAccessToken() =>
+      cfg.getString('access_token', defConfig['access_token']);
 
   void setFrpToken(String value) => cfg.setString('frp_token', value);
   String? getFrpToken() => cfg.getString('frp_token', defConfig['frp_token']);
-
 }
diff --git a/nyalcf_cli/nyalcf_core_extend/pubspec.lock b/nyalcf_cli/nyalcf_core_extend/pubspec.lock
@@ -260,7 +260,7 @@ packages:
       path: "../../nyalcf_core"
       relative: true
     source: path
-    version: "2.0.0"
+    version: "2.0.2"
   nyalcf_env:
     dependency: transitive
     description:
diff --git a/nyalcf_cli/nyalcf_core_extend/pubspec.yaml b/nyalcf_cli/nyalcf_core_extend/pubspec.yaml
@@ -1,6 +1,6 @@
 name: nyalcf_core_extend
 description: "Nya LoCyanFrp! core extend module."
-version: 2.0.1
+version: 2.0.2
 homepage: https://nyalcf.1l1.icu
 publish_to: none
 
diff --git a/nyalcf_cli/pubspec.lock b/nyalcf_cli/pubspec.lock
@@ -260,14 +260,14 @@ packages:
       path: "../nyalcf_core"
       relative: true
     source: path
-    version: "2.0.0"
+    version: "2.0.2"
   nyalcf_core_extend:
     dependency: "direct main"
     description:
       path: nyalcf_core_extend
       relative: true
     source: path
-    version: "2.0.0"
+    version: "2.0.2"
   nyalcf_env:
     dependency: "direct main"
     description:
diff --git a/nyalcf_cli/pubspec.yaml b/nyalcf_cli/pubspec.yaml
@@ -1,6 +1,6 @@
 name: nyalcf
 description: "[CLI]The next generation of LoCyanFrp launcher."
-version: 1.0.0+4
+version: 1.0.1+1
 homepage: https://nyalcf.1l1.icu
 publish_to: none
 # repository: https://github.com/my_org/my_repo
diff --git a/nyalcf_core/lib/network/basic_config.dart b/nyalcf_core/lib/network/basic_config.dart
@@ -17,7 +17,7 @@ BaseOptions baseOptions = BaseOptions(
         '${Platform.operatingSystemVersion}',
   },
 );
-final apiV2Url = ENV_UNIVERSAL_API_URL ?? 'https://api-v2.locyanfrp.cn/api/v2';
+final apiV2Url = ENV_UNIVERSAL_API_URL ?? 'https://api.locyanfrp.cn/v2';
 // const apiV2Url = 'http://localhost:18080/api/v2';
 const githubApiUrl = 'https://api-gh.1l1.icu';
 const githubMainUrl = 'https://github.com';
diff --git a/nyalcf_core/lib/storages/configurations/frpc_configuration_storage.dart b/nyalcf_core/lib/storages/configurations/frpc_configuration_storage.dart
@@ -14,7 +14,7 @@ class FrpcConfigurationStorage extends JsonConfiguration {
   @override
   Map<String, dynamic> get defConfig => {
         'settings': {
-          'frpc_version': '0.51.3-6',
+          'frpc_version': '0.51.3-8',
           'frpc_download_mirror': true,
           'frpc_download_mirror_id': 'muska-github-mirror',
         },
@@ -38,25 +38,28 @@ class FrpcConfigurationStorage extends JsonConfiguration {
       };
 
   /// 获取使用的 Frpc 版本
-  String getSettingsFrpcVersion() => cfg.getString('settings.frpc_version', defConfig['settings']['frpc_version']);
+  String getSettingsFrpcVersion() => cfg.getString(
+      'settings.frpc_version', defConfig['settings']['frpc_version']);
 
   /// 设置使用的 Frpc 版本
   /// [value] Frpc 版本
   void setSettingsFrpcVersion(String value) =>
       cfg.setString('settings.frpc_version', value);
 
   /// 获取是否使用镜像源
-  bool getSettingsFrpcDownloadMirror() =>
-      cfg.getBool('settings.frpc_download_mirror', defConfig['settings']['frpc_download_mirror']);
+  bool getSettingsFrpcDownloadMirror() => cfg.getBool(
+      'settings.frpc_download_mirror',
+      defConfig['settings']['frpc_download_mirror']);
 
   /// 设置设置使用镜像源
   /// [value] 是否使用镜像源
   void setSettingsFrpcDownloadMirror(bool value) =>
       cfg.setBool('settings.frpc_download_mirror', value);
 
   /// 获取使用的镜像源 ID
-  String getSettingsFrpcDownloadMirrorId() =>
-      cfg.getString('settings.frpc_download_mirror_id', defConfig['settings']['frpc_download_mirror_id']);
+  String getSettingsFrpcDownloadMirrorId() => cfg.getString(
+      'settings.frpc_download_mirror_id',
+      defConfig['settings']['frpc_download_mirror_id']);
 
   /// 设置使用的镜像源 ID
   void setSettingsFrpcDownloadMirrorId(String value) =>
@@ -86,7 +89,8 @@ class FrpcConfigurationStorage extends JsonConfiguration {
   List<Map<String, dynamic>> getDownloadMirrors() {
     // 无法 cast，使用 for 转换一下类型
     final list = <Map<String, dynamic>>[];
-    for (var single in cfg.getList('lists.frpc_download_mirrors', defConfig['lists']['frpc_download_mirrors'])) {
+    for (var single in cfg.getList('lists.frpc_download_mirrors',
+        defConfig['lists']['frpc_download_mirrors'])) {
       list.add(single);
     }
     return list;
diff --git a/nyalcf_core/pubspec.yaml b/nyalcf_core/pubspec.yaml
diff --git a/nyalcf_gui/nyalcf_core_extend/pubspec.lock b/nyalcf_gui/nyalcf_core_extend/pubspec.lock
diff --git a/nyalcf_gui/nyalcf_core_extend/pubspec.yaml b/nyalcf_gui/nyalcf_core_extend/pubspec.yaml
diff --git a/nyalcf_gui/nyalcf_ui/lib/models/frpc_download_dialog.dart b/nyalcf_gui/nyalcf_ui/lib/models/frpc_download_dialog.dart
diff --git a/nyalcf_gui/pubspec.lock b/nyalcf_gui/pubspec.lock
diff --git a/nyalcf_gui/pubspec.yaml b/nyalcf_gui/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+// Dart imports:`
	`2`	`+import 'dart:io';`
	`3`	`+`
`1`	`4`	`// Package imports:`
`2`	`5`	`import 'package:nyalcf_core/storages/configurations/launcher_configuration_storage.dart';`
`3`	`6`	`import 'package:nyalcf_core/utils/logger.dart';`
`@@ -35,6 +38,7 @@ class Config implements Command {`
`35`	`38`	`} else {`
`36`	`39`	`Logger.error('No valid arguments provided.');`
`37`	`40`	`}`
	`41`	`+ exit(0);`
`38`	`42`	`}`
`39`	`43`
`40`	`44`	`dynamic _convert(dynamic originValue, String input) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`// Package imports:`
`2`	`2`
	`3`	`+// Dart imports:`
	`4`	`+import 'dart:io';`
	`5`	`+`
`3`	`6`	`// Package imports:`
`4`	`7`	`import 'package:nyalcf_core/storages/stores/user_info_storage.dart';`
`5`	`8`	`import 'package:nyalcf_core/utils/logger.dart';`
`@@ -12,5 +15,6 @@ class Logout implements Command {`
`12`	`15`	`Future<void> main(List<String> args) async {`
`13`	`16`	`await UserInfoStorage.logout();`
`14`	`17`	`Logger.info('Session data removed.');`
	`18`	`+ exit(0);`
`15`	`19`	`}`
`16`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ class Start implements Command {`
`22`	`22`	`final user = await userInfo;`
`23`	`23`	`if (_tokenStorage.getFrpToken() == null) {`
`24`	`24`	`Logger.error('No frp token found, please do authorize first.');`
`25`		`- return;`
	`25`	`+ exit(0);`
`26`	`26`	`}`
`27`	`27`	`if (user == null) {`
`28`	`28`	`Logger.error('No valid arguments provided.');`
`29`		`- return;`
	`29`	`+ exit(0);`
`30`	`30`	`}`
`31`	`31`	`for (var proxyId in args) {`
`32`	`32`	`final frpcPath = await FrpcStorage().getFilePath(skipCheck: false);`
`@@ -44,7 +44,7 @@ class Start implements Command {`
`44`	`44`	`Logger.info('Started proxy: $proxyId');`
`45`	`45`	`} else {`
`46`	`46`	`Logger.error('You have no frpc installed yet!');`
`47`		`- return;`
	`47`	`+ exit(0);`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`@@ -63,7 +63,7 @@ class Start implements Command {`
`63`	`63`	`for (var process in ProcessManager.processList) {`
`64`	`64`	`process.process.kill();`
`65`	`65`	`}`
`66`		`- return;`
	`66`	`+ exit(0);`
`67`	`67`	`}`
`68`	`68`	`});`
`69`	`69`	`} else {`