Experimental: API v2.2 (unfinished)

Author: Muska-Ami

Diff for: RELEASE_CHANGELOG.md

@@ -18,9 +18,9 @@
 
 ## 版本信息
 
-- nyalcf_gui: 0.2.4
-- nyalcf_cli: 0.0.3
-- nyalcf_env: 1.0.2
-- nyalcf_core,nyalcf_inject: 1.2.6
+- nyalcf_gui: 1.0.0
+- nyalcf_cli: 1.0.0
+- nyalcf_env: 2.0.0
+- nyalcf_core,nyalcf_inject: 2.0.0
 
 <!-- Some change log here -->

Diff for: nyalcf_cli/lib/commands/config.dart

@@ -3,10 +3,10 @@ import 'package:nyalcf_core/storages/configurations/launcher_configuration_stora
 import 'package:nyalcf_core/utils/logger.dart';
 
 // Project imports:
-import 'package:nyalcf/templates/command_implement.dart';
+import 'package:nyalcf/templates/command.dart';
 import 'package:nyalcf/utils/state.dart';
 
-class Config implements CommandImplement {
+class Config implements Command {
   final _lcs = LauncherConfigurationStorage();
 
   @override

Diff for: nyalcf_cli/lib/commands/download.dart

@@ -3,17 +3,16 @@ import 'dart:io';
 
 // Package imports:
 import 'package:dio/dio.dart';
-import 'package:nyalcf_core/network/dio/frpc/download_frpc.dart';
 import 'package:nyalcf_core/utils/cpu_arch.dart';
 import 'package:nyalcf_core/utils/frpc/arch.dart';
 import 'package:nyalcf_core/utils/frpc/archive.dart';
 import 'package:nyalcf_core/utils/logger.dart';
 
 // Project imports:
-import 'package:nyalcf/templates/command_implement.dart';
+import 'package:nyalcf/templates/command.dart';
 import 'package:nyalcf/utils/state.dart';
 
-class Download implements CommandImplement {
+class Download implements Command {
   List<Map<String, String>> arch = [];
   late String platform;
 
@@ -68,7 +67,7 @@ class Download implements CommandImplement {
             arch: _selectedArch,
             platform: platform,
             version: '0.51.3-6',
-            releaseName: 'LoCyanFrp-0.51.3-6 #2024100301',
+            name: 'LoCyanFrp-0.51.3-6 #2024100301',
             progressCallback: callback,
             cancelToken: _cancelToken,
             useMirror: false,

Diff for: nyalcf_cli/lib/commands/login.dart

@@ -1,15 +1,13 @@
 // Package imports:
-import 'package:nyalcf_core/models/response/response.dart';
 import 'package:nyalcf_core/models/user_info_model.dart';
-import 'package:nyalcf_core/network/dio/auth/auth.dart';
 import 'package:nyalcf_core/storages/stores/user_info_storage.dart';
 import 'package:nyalcf_core/utils/logger.dart';
 
 // Project imports:
-import 'package:nyalcf/templates/command_implement.dart';
+import 'package:nyalcf/templates/command.dart';
 import 'package:nyalcf/utils/text_encrypt.dart';
 
-class Login implements CommandImplement {
+class Login implements Command {
   @override
   Future<void> main(List<String> args) async {
     if (args.length == 2) {
@@ -19,7 +17,7 @@ class Login implements CommandImplement {
         final UserInfoModel userInfo = res.userInfo;
         Logger.info('Login successfully.');
         Logger.info('Info:');
-        Logger.info('- name: ${userInfo.user}');
+        Logger.info('- name: ${userInfo.username}');
         Logger.info('- email: ${userInfo.email}');
         Logger.info('- login token: ${TextEncrypt.obscure(userInfo.token)}');
         Logger.info('- frp token: ${TextEncrypt.obscure(userInfo.frpToken)}');

Diff for: nyalcf_cli/lib/commands/logout.dart

@@ -5,13 +5,13 @@ import 'package:nyalcf_core/storages/stores/user_info_storage.dart';
 import 'package:nyalcf_core/utils/logger.dart';
 
 // Project imports:
-import 'package:nyalcf/templates/command_implement.dart';
+import 'package:nyalcf/templates/command.dart';
 
-class Logout implements CommandImplement {
+class Logout implements Command {
   @override
   Future<void> main(List<String> args) async {
     final userInfo = await UserInfoStorage.read();
-    final res = await UserInfoStorage.sigo(userInfo?.user, userInfo?.token);
+    final res = await UserInfoStorage.logout(userInfo?.username, userInfo?.token);
 
     if (res) {
       Logger.info('Session data removed.');

Diff for: nyalcf_cli/lib/commands/start.dart

@@ -7,11 +7,11 @@ import 'package:nyalcf_core/storages/stores/frpc_storage.dart';
 import 'package:nyalcf_core/utils/logger.dart';
 
 // Project imports:
-import 'package:nyalcf/templates/command_implement.dart';
+import 'package:nyalcf/templates/command.dart';
 import 'package:nyalcf/utils/frpc/process_manager.dart';
 import 'package:nyalcf/utils/state.dart';
 
-class Start implements CommandImplement {
+class Start implements Command {
   static final _fcs = FrpcConfigurationStorage();
 
   @override

Diff for: nyalcf_cli/lib/templates/command_implement.dart renamed to nyalcf_cli/lib/templates/command.dart

@@ -1,4 +1,4 @@
-abstract class CommandImplement {
+abstract class Command {
   /// 入口函数
   void main(List<String> args);
 }

Diff for: nyalcf_cli/pubspec.lock

@@ -142,6 +142,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
+  http_methods:
+    dependency: transitive
+    description:
+      name: http_methods
+      sha256: "6bccce8f1ec7b5d701e7921dca35e202d425b57e317ba1a37f2638590e29e566"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
   http_multi_server:
     dependency: transitive
     description:
@@ -252,21 +260,21 @@ packages:
       path: "../nyalcf_core"
       relative: true
     source: path
-    version: "1.2.6"
+    version: "2.0.0"
   nyalcf_env:
     dependency: "direct main"
     description:
       path: "../nyalcf_env"
       relative: true
     source: path
-    version: "1.0.2"
+    version: "2.0.0"
   nyalcf_inject:
     dependency: "direct main"
     description:
       path: "../nyalcf_inject"
       relative: true
     source: path
-    version: "1.2.6"
+    version: "2.0.0"
   package_config:
     dependency: transitive
     description:
@@ -315,6 +323,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.2"
+  shelf_router:
+    dependency: transitive
+    description:
+      name: shelf_router
+      sha256: f5e5d492440a7fb165fe1e2e1a623f31f734d3370900070b2b1e0d0428d59864
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.4"
   shelf_static:
     dependency: transitive
     description:

Diff for: nyalcf_cli/pubspec.yaml

@@ -1,6 +1,6 @@
 name: nyalcf
 description: "[CLI]The next generation of LoCyanFrp launcher."
-version: 0.0.3+3
+version: 0.1.0+1
 homepage: https://nyalcf.1l1.icu
 publish_to: none
 # repository: https://github.com/my_org/my_repo

Diff for: nyalcf_core/lib/models/api_base_model.dart

@@ -0,0 +1,11 @@
+abstract class ApiBaseModel {
+  ApiBaseModel({
+    required this.endpoint,
+    required this.params,
+    this.validateStatus = const [200],
+  });
+
+  final String endpoint;
+  final Map<String, dynamic> params;
+  List<int> validateStatus;
+}

Diff for: nyalcf_core/lib/models/frpc_version_model.dart

@@ -1,12 +1,12 @@
 /// Frpc版本模型
-/// [releaseName] Release 名称
+/// [name] Release 名称
 /// [tagName] Release Tag
 class FrpcVersionModel {
   FrpcVersionModel({
-    required this.releaseName,
+    required this.name,
     required this.tagName,
   });
 
-  final String releaseName;
+  final String name;
   final String tagName;
 }

Diff for: nyalcf_core/lib/models/proxy_info_model.dart

@@ -1,50 +1,48 @@
 /// 隧道信息模型
-/// [proxyName] 隧道名
+/// [name] 隧道名
 /// [useCompression] 是否使用压缩
 /// [localIP] 本地 IP
 /// [node] 节点 ID
 /// [localPort] 本地端口
 /// [remotePort] 远程端口
 /// [domain] 绑定域名
 /// [icp] 备案状态
-/// [sk]
+/// [secretKey]
 /// [id] 隧道 ID
 /// [proxyType] 隧道类型
 /// [useEncryption] 是否使用加密
 /// [status] 隧道状态
 class ProxyInfoModel {
   ProxyInfoModel({
-    required this.proxyName,
-    required this.useCompression,
-    required this.localIP,
+    required this.id,
+    required this.name,
     required this.node,
+    required this.proxyType,
+    required this.localIP,
     required this.localPort,
     required this.remotePort,
     required this.domain,
-    required this.icp,
-    required this.sk,
-    required this.id,
-    required this.proxyType,
+    required this.secretKey,
+    required this.useCompression,
     required this.useEncryption,
     required this.status,
   });
 
-  final String proxyName;
+  final String name;
   final bool useCompression;
   final String localIP;
   final int node;
   final int localPort;
   final int remotePort;
   final String? domain;
-  final String? icp;
-  final String? sk;
+  final String? secretKey;
   final int id;
   final String proxyType;
   final bool useEncryption;
   final String? status;
 
   @override
   String toString() {
-    return '$proxyType:$proxyName:$id';
+    return '$proxyType:$name:$id';
   }
 }