feat: Windows compatibility (#836)

* feat: win compatibility * fix * fix: uptime parse * opt.: linux uptime accuracy * fix: windows temperature fetching * opt. * opt.: powershell exec * refactor: address PR review feedback and improve code quality ### Major Improvements: - **Refactored Windows status parsing**: Broke down large `_getWindowsStatus` method into 13 smaller, focused helper methods for better maintainability and readability - **Extracted system detection logic**: Created dedicated `SystemDetector` helper class to separate OS detection concerns from ServerProvider - **Improved concurrency handling**: Implemented proper synchronization for server updates using Future-based locks to prevent race conditions ### Bug Fixes: - **Fixed CPU percentage parsing**: Removed incorrect '*100' multiplication in BSD CPU parsing (values were already percentages) - **Enhanced memory parsing**: Added validation and error handling to BSD memory fallback parsing with proper logging - **Improved uptime parsing**: Added support for multiple Windows date formats and robust error handling with validation - **Fixed division by zero**: Added safety checks in Swap.usedPercent getter ### Code Quality Enhancements: - **Added comprehensive documentation**: Documented Windows CPU counter limitations and approach - **Strengthened error handling**: Added detailed logging and validation throughout parsing methods - **Improved robustness**: Enhanced BSD CPU parsing with percentage validation and warnings - **Better separation of concerns**: Each parsing method now has single responsibility ### Files Changed: - `lib/data/helper/system_detector.dart` (new): System detection helper - `lib/data/model/server/cpu.dart`: Fixed percentage parsing and added validation - `lib/data/model/server/memory.dart`: Enhanced fallback parsing and division-by-zero protection - `lib/data/model/server/server_status_update_req.dart`: Refactored into 13 focused parsing methods - `lib/data/provider/server.dart`: Improved synchronization and extracted system detection 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * refactor: parse & shell fn struct --------- Co-authored-by: Claude <noreply@anthropic.com>
2025-08-08 16:56:36 +08:00
parent 46a12bc844
commit 3a615449e3
103 changed files with 9591 additions and 1906 deletions
--- a/lib/view/page/server/detail/misc.dart
+++ b/lib/view/page/server/detail/misc.dart
@@ -61,7 +61,7 @@ extension on _ServerDetailPageState {
      titleMaxLines: 1,
      child: Column(
        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,  
+        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          UIs.height13,
          Text('Memory: ${process.memory} ${process.memory > 1024 ? 'MB' : 'KB'}'),
--- a/lib/view/page/server/edit.dart
+++ b/lib/view/page/server/edit.dart
@@ -9,6 +9,7 @@ import 'package:server_box/core/route.dart';
 import 'package:server_box/data/model/server/custom.dart';
 import 'package:server_box/data/model/server/server.dart';
 import 'package:server_box/data/model/server/server_private_info.dart';
+import 'package:server_box/data/model/server/system.dart';
 import 'package:server_box/data/model/server/wol_cfg.dart';
 import 'package:server_box/data/provider/private_key.dart';
 import 'package:server_box/data/provider/server.dart';
@@ -59,6 +60,7 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
  final _env = <String, String>{}.vn;
  final _customCmds = <String, String>{}.vn;
  final _tags = <String>{}.vn;
+  final _systemType = ValueNotifier<SystemType?>(null);

  @override
  void dispose() {
@@ -91,6 +93,7 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
    _env.dispose();
    _customCmds.dispose();
    _tags.dispose();
+    _systemType.dispose();
  }

  @override
@@ -174,6 +177,7 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
        ),
      ),
      _buildAuth(),
+      _buildSystemType(),
      _buildJumpServer(),
      _buildMore(),
    ];
@@ -331,6 +335,26 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
    );
  }

+  Widget _buildSystemType() {
+    return _systemType.listenVal((val) {
+      return ListTile(
+        leading: Icon(MingCute.laptop_2_line),
+        title: Text(l10n.system),
+        trailing: PopupMenu<SystemType?>(
+          initialValue: val,
+          items: [
+            PopupMenuItem(value: null, child: Text(libL10n.auto)),
+            PopupMenuItem(value: SystemType.linux, child: Text('Linux')),
+            PopupMenuItem(value: SystemType.bsd, child: Text('BSD')),
+            PopupMenuItem(value: SystemType.windows, child: Text('Windows')),
+          ],
+          onSelected: (value) => _systemType.value = value,
+          child: Text(val?.name ?? libL10n.auto, style: TextStyle(color: val == null ? Colors.grey : null)),
+        ),
+      ).cardx;
+    });
+  }
+
  Widget _buildAltUrl() {
    return Input(
      controller: _altUrlController,
@@ -614,6 +638,7 @@ extension on _ServerEditPageState {
      wolCfg: wol,
      envs: _env.value.isEmpty ? null : _env.value,
      id: widget.args?.spi.id ?? ShortId.generate(),
+      customSystemType: _systemType.value,
    );

    if (this.spi == null) {
@@ -668,5 +693,7 @@ extension on _ServerEditPageState {

    _netDevCtrl.text = spi.custom?.netDev ?? '';
    _scriptDirCtrl.text = spi.custom?.scriptDir ?? '';
+
+    _systemType.value = spi.customSystemType;
  }
 }
--- a/lib/view/page/server/tab/card_stat.dart
+++ b/lib/view/page/server/tab/card_stat.dart
@@ -7,21 +7,9 @@ class _CardStatus {
  final bool? diskIO;
  final NetViewType? net;

-  const _CardStatus({
-    this.flip = false,
-    this.diskIO,
-    this.net,
-  });
+  const _CardStatus({this.flip = false, this.diskIO, this.net});

-  _CardStatus copyWith({
-    bool? flip,
-    bool? diskIO,
-    NetViewType? net,
-  }) {
-    return _CardStatus(
-      flip: flip ?? this.flip,
-      diskIO: diskIO ?? this.diskIO,
-      net: net ?? this.net,
-    );
+  _CardStatus copyWith({bool? flip, bool? diskIO, NetViewType? net}) {
+    return _CardStatus(flip: flip ?? this.flip, diskIO: diskIO ?? this.diskIO, net: net ?? this.net);
  }
 }
--- a/lib/view/page/server/tab/tab.dart
+++ b/lib/view/page/server/tab/tab.dart
@@ -319,8 +319,7 @@ class _ServerPageState extends State<ServerPage> with AutomaticKeepAliveClientMi
              ],
            ),
            UIs.height13,
-            if (Stores.setting.moveServerFuncs.fetch())
-              SizedBox(height: 27, child: ServerFuncBtns(spi: spi)),
+            if (Stores.setting.moveServerFuncs.fetch()) SizedBox(height: 27, child: ServerFuncBtns(spi: spi)),
          ],
        );
      },
--- a/lib/view/page/server/tab/top_bar.dart
+++ b/lib/view/page/server/tab/top_bar.dart
@@ -5,11 +5,7 @@ final class _TopBar extends StatelessWidget implements PreferredSizeWidget {
  final void Function(String) onTagChanged;
  final String initTag;

-  const _TopBar({
-    required this.initTag,
-    required this.onTagChanged,
-    required this.tags,
-  });
+  const _TopBar({required this.initTag, required this.onTagChanged, required this.tags});

  @override
  Widget build(BuildContext context) {
@@ -31,15 +27,9 @@ final class _TopBar extends StatelessWidget implements PreferredSizeWidget {
              padding: EdgeInsets.symmetric(horizontal: 7, vertical: 3),
              child: Row(
                children: [
-                  Text(
-                    BuildData.name,
-                    style: TextStyle(fontSize: 19),
-                  ),
+                  Text(BuildData.name, style: TextStyle(fontSize: 19)),
                  SizedBox(width: 5),
-                  Icon(
-                    Icons.settings,
-                    size: 17,
-                  ),
+                  Icon(Icons.settings, size: 17),
                ],
              ),
            ),
--- a/lib/view/page/server/tab/utils.dart
+++ b/lib/view/page/server/tab/utils.dart
@@ -49,7 +49,11 @@ extension _Operation on _ServerPageState {
          await context.showRoundDialog(title: libL10n.attention, child: Text(l10n.suspendTip));
          Stores.setting.showSuspendTip.put(false);
        }
-        srv.client?.execWithPwd(ShellFunc.suspend.exec(srv.spi.id), context: context, id: srv.id);
+        srv.client?.execWithPwd(
+          ShellFunc.suspend.exec(srv.spi.id, systemType: srv.status.system),
+          context: context,
+          id: srv.id,
+        );
      },
      typ: l10n.suspend,
      name: srv.spi.name,
@@ -58,7 +62,11 @@ extension _Operation on _ServerPageState {

  void _onTapShutdown(Server srv) {
    _askFor(
-      func: () => srv.client?.execWithPwd(ShellFunc.shutdown.exec(srv.spi.id), context: context, id: srv.id),
+      func: () => srv.client?.execWithPwd(
+        ShellFunc.shutdown.exec(srv.spi.id, systemType: srv.status.system),
+        context: context,
+        id: srv.id,
+      ),
      typ: l10n.shutdown,
      name: srv.spi.name,
    );
@@ -66,7 +74,11 @@ extension _Operation on _ServerPageState {

  void _onTapReboot(Server srv) {
    _askFor(
-      func: () => srv.client?.execWithPwd(ShellFunc.reboot.exec(srv.spi.id), context: context, id: srv.id),
+      func: () => srv.client?.execWithPwd(
+        ShellFunc.reboot.exec(srv.spi.id, systemType: srv.status.system),
+        context: context,
+        id: srv.id,
+      ),
      typ: l10n.reboot,
      name: srv.spi.name,
    );