new: custom cmds (#313)

lib/core/extension/order.dart

@@ -1,10 +1,9 @@
 import 'package:toolbox/core/extension/listx.dart';
 import 'package:toolbox/core/persistant_store.dart';
 
-typedef Order<T> = List<T>;
+typedef _OnMove<T> = void Function(List<T>);
-typedef _OnMove<T> = void Function(Order<T>);
 
-extension OrderX<T> on Order<T> {
+extension OrderX<T> on List<T> {
   void move(
     int oldIndex,
     int newIndex, {
@@ -33,9 +32,12 @@ extension OrderX<T> on Order<T> {
   }
 
   void moveByItem(
-    List<T> items,
     int o,
     int n, {
+    /// The list after filtering.
+    ///
+    /// It's used to find the index of the item.
+    List<T>? filtered,
     StorePropertyBase<List<T>>? property,
     _OnMove<T>? onMove,
   }) {
@@ -43,9 +45,9 @@ extension OrderX<T> on Order<T> {
     if (o < n) {
       n -= 1;
     }
-    final index = indexOf(items[o]);
+    final index = indexOf((filtered ?? this)[o]);
     if (index == -1) return;
-    var newIndex = indexOf(items[n]);
+    var newIndex = indexOf((filtered ?? this)[n]);
     if (newIndex == -1) return;
     if (o < n) {
       newIndex += 1;
@@ -85,7 +87,7 @@ extension OrderX<T> on Order<T> {
 
   /// Dart uses memory address to compare objects by default.
   /// This method compares the values of the objects.
-  bool equals(Order<T> other) {
+  bool equals(List<T> other) {
     if (length != other.length) return false;
     for (var i = 0; i < length; i++) {
       if (this[i] != other[i]) return false;

lib/core/extension/stringx.dart

@@ -30,3 +30,7 @@ extension StringX on String {
     return this;
   }
 }
+
+extension StringXX on String? {
+  String? get selfIfNotNullEmpty => this?.isEmpty == true ? null : this;
+} 

lib/data/model/app/server_detail_card.dart

@@ -15,6 +15,7 @@ enum ServerDetailCards implements VersionRelated {
   temp,
   battery,
   pve(sinceBuild: 818),
+  custom(sinceBuild: 825),
   ;
 
   @override
@@ -39,6 +40,7 @@ enum ServerDetailCards implements VersionRelated {
         temp => l10n.temperature,
         battery => l10n.battery,
         pve => 'PVE',
+        custom => l10n.cmd,
       };
 
   /// If:
@@ -48,9 +50,19 @@ enum ServerDetailCards implements VersionRelated {
     if (cur >= pve.sinceBuild!) {
       final prop = Stores.setting.detailCardOrder;
       final list = prop.fetch();
-      if (list.contains(pve.name)) return;
+      if (!list.contains(pve.name)) {
-      list.add(pve.name);
+        list.add(pve.name);
-      prop.put(list);
+        prop.put(list);
+      }
+    }
+
+    if (cur >= custom.sinceBuild!) {
+      final prop = Stores.setting.detailCardOrder;
+      final list = prop.fetch();
+      if (!list.contains(custom.name)) {
+        list.add(custom.name);
+        prop.put(list);
+      }
     }
   }
 }

lib/data/model/app/shell_func.dart

@@ -1,12 +1,6 @@
 import '../../res/build_data.dart';
 import '../server/system.dart';
 
-const seperator = 'SrvBoxSep';
-
-/// The suffix `\t` is for formatting
-const _cmdDivider = '\necho $seperator\n\t';
-const _homeVar = '\$HOME';
-
 enum ShellFunc {
   status,
   //docker,
@@ -16,6 +10,11 @@ enum ShellFunc {
   suspend,
   ;
 
+  static const _homeVar = '\$HOME';
+  static const seperator = 'SrvBoxSep';
+
+  /// The suffix `\t` is for formatting
+  static const cmdDivider = '\necho $seperator\n\t';
   static const _srvBoxDir = '.config/server_box';
   static const _scriptFile = 'mobile_v${BuildData.script}.sh';
 
@@ -82,9 +81,9 @@ chmod +x $_installShellPath
       case ShellFunc.status:
         return '''
 if [ "\$macSign" = "" ] && [ "\$bsdSign" = "" ]; then
-\t${_statusCmds.join(_cmdDivider)}
+\t${_statusCmds.join(cmdDivider)}
 else
-\t${_bsdStatusCmd.join(_cmdDivider)}
+\t${_bsdStatusCmd.join(cmdDivider)}
 fi''';
 //       case ShellFunc.docker:
 //         return '''
@@ -130,7 +129,7 @@ fi''';
     }
   }
 
-  static final String allScript = () {
+  static String allScript(Map<String, String>? customCmds) {
     final sb = StringBuffer();
     sb.write('''
 #!/bin/sh
@@ -151,9 +150,18 @@ userId=\$(id -u)
 ''');
     // Write each func
     for (final func in values) {
+      final customCmdsStr = () {
+        if (func == ShellFunc.status &&
+            customCmds != null &&
+            customCmds.isNotEmpty) {
+          return '$cmdDivider\n\t${customCmds.values.join(cmdDivider)}';
+        }
+        return '';
+      }();
       sb.write('''
 ${func.name}() {
 ${func._cmd.split('\n').map((e) => '\t$e').join('\n')}
+$customCmdsStr
 }
 
 ''');
@@ -174,7 +182,7 @@ ${func._cmd.split('\n').map((e) => '\t$e').join('\n')}
     ;;
 esac''');
     return sb.toString();
-  }();
+  }
 }
 
 extension EnumX on Enum {

lib/data/model/server/custom.dart

@@ -4,40 +4,49 @@ part 'custom.g.dart';
 
 @HiveType(typeId: 7)
 final class ServerCustom {
-  @HiveField(0)
+  // @HiveField(0)
-  final String? temperature;
+  // final String? temperature;
   @HiveField(1)
   final String? pveAddr;
-  @HiveField(2)
+  @HiveField(2, defaultValue: false)
-  final bool? pveIgnoreCert;
+  final bool pveIgnoreCert;
+
+  /// {"title": "cmd"}
+  @HiveField(3)
+  final Map<String, String>? cmds;
 
   const ServerCustom({
-    this.temperature,
+    //this.temperature,
     this.pveAddr,
-    this.pveIgnoreCert,
+    this.pveIgnoreCert = false,
+    this.cmds,
   });
 
   static ServerCustom fromJson(Map<String, dynamic> json) {
-    final temperature = json["temperature"] as String?;
+    //final temperature = json["temperature"] as String?;
     final pveAddr = json["pveAddr"] as String?;
-    final pveIgnoreCert = json["pveIgnoreCert"] as bool?;
+    final pveIgnoreCert = json["pveIgnoreCert"] as bool;
+    final cmds = json["cmds"] as Map<String, dynamic>?;
     return ServerCustom(
-      temperature: temperature,
+      //temperature: temperature,
       pveAddr: pveAddr,
       pveIgnoreCert: pveIgnoreCert,
+      cmds: cmds?.cast<String, String>(),
     );
   }
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-    if (temperature != null) {
+    // if (temperature != null) {
-      json["temperature"] = temperature;
+    //   json["temperature"] = temperature;
-    }
+    // }
     if (pveAddr != null) {
       json["pveAddr"] = pveAddr;
     }
-    if (pveIgnoreCert != null) {
+    json["pveIgnoreCert"] = pveIgnoreCert;
-      json["pveIgnoreCert"] = pveIgnoreCert;
+
+    if (cmds != null) {
+      json["cmds"] = cmds;
     }
     return json;
   }

lib/data/model/server/custom.g.dart

@@ -17,9 +17,9 @@ class ServerCustomAdapter extends TypeAdapter<ServerCustom> {
       for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
     };
     return ServerCustom(
-      temperature: fields[0] as String?,
       pveAddr: fields[1] as String?,
-      pveIgnoreCert: fields[2] as bool?,
+      pveIgnoreCert: fields[2] == null ? false : fields[2] as bool,
+      cmds: (fields[3] as Map?)?.cast<String, String>(),
     );
   }
 
@@ -27,12 +27,12 @@ class ServerCustomAdapter extends TypeAdapter<ServerCustom> {
   void write(BinaryWriter writer, ServerCustom obj) {
     writer
       ..writeByte(3)
-      ..writeByte(0)
-      ..write(obj.temperature)
       ..writeByte(1)
       ..write(obj.pveAddr)
       ..writeByte(2)
-      ..write(obj.pveIgnoreCert);
+      ..write(obj.pveIgnoreCert)
+      ..writeByte(3)
+      ..write(obj.cmds);
   }
 
   @override

lib/data/model/server/pve.dart

@@ -414,11 +414,11 @@ final class PveRes {
   static Future<PveRes> parse((List list, PveRes? old) val) async {
     final (list, old) = val;
     final items = list.map((e) => PveResIface.fromJson(e)).toList();
-    final Order<PveQemu> qemus = [];
+    final List<PveQemu> qemus = [];
-    final Order<PveLxc> lxcs = [];
+    final List<PveLxc> lxcs = [];
-    final Order<PveNode> nodes = [];
+    final List<PveNode> nodes = [];
-    final Order<PveStorage> storages = [];
+    final List<PveStorage> storages = [];
-    final Order<PveSdn> sdns = [];
+    final List<PveSdn> sdns = [];
     for (final item in items) {
       switch (item.type) {
         case PveResType.lxc:

lib/data/model/server/server.dart

@@ -1,4 +1,5 @@
 import 'package:dartssh2/dartssh2.dart';
+import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/data/model/app/shell_func.dart';
 import 'package:toolbox/data/model/server/battery.dart';
 import 'package:toolbox/data/model/server/conn.dart';
@@ -14,6 +15,8 @@ import 'package:toolbox/data/model/server/temp.dart';
 
 import '../app/tag_pickable.dart';
 
+part 'server.ext.dart';
+
 class Server implements TagPickable {
   ServerPrivateInfo spi;
   ServerStatus status;
@@ -58,6 +61,7 @@ class ServerStatus {
   final Map<StatusCmdType, String> more = {};
   final List<SensorItem> sensors = [];
   DiskUsage? diskUsage;
+  final Map<String, String> customCmds = {};
 
   ServerStatus({
     required this.cpu,

lib/data/model/server/server.ext.dart

@@ -0,0 +1,39 @@
+part of 'server.dart';
+
+extension ServerX on Server {
+  String get topRightStr {
+    switch (state) {
+      case ServerState.disconnected:
+        return l10n.disconnected;
+      case ServerState.finished:
+        final cmdTemp = status.customCmds['temperature'];
+        final temp = status.temps.first;
+        final sensorTemp = SensorItem.findPreferTempVal(status.sensors);
+        final temperatureVal = () {
+          if (temp != null) {
+            return temp;
+          }
+          if (sensorTemp != null) {
+            return sensorTemp;
+          }
+          return null;
+        }();
+        final tempVal = temperatureVal != null
+            ? '${temperatureVal.toStringAsFixed(1)}°C'
+            : null;
+        final upTime = status.more[StatusCmdType.uptime];
+        final items = [tempVal ?? cmdTemp, upTime];
+        final str = items.where((e) => e != null && e.isNotEmpty).join(' | ');
+        if (str.isEmpty) return l10n.noResult;
+        return str;
+      case ServerState.loading:
+        return l10n.serverTabLoading;
+      case ServerState.connected:
+        return l10n.connected;
+      case ServerState.connecting:
+        return l10n.serverTabConnecting;
+      case ServerState.failed:
+        return status.err ?? l10n.serverTabFailed;
+    }
+  }
+}

lib/data/model/server/server_private_info.dart

@@ -122,7 +122,8 @@ class ServerPrivateInfo {
         pwd != old.pwd ||
         keyId != old.keyId ||
         alterUrl != old.alterUrl ||
-        jumpId != old.jumpId;
+        jumpId != old.jumpId || 
+        custom?.cmds != old.custom?.cmds;
   }
 
   _IpPort fromStringUrl() {

lib/data/model/server/server_status_update_req.dart

@@ -16,11 +16,13 @@ class ServerStatusUpdateReq {
   final ServerStatus ss;
   final List<String> segments;
   final SystemType system;
+  final Map<String, String> customCmds;
 
   const ServerStatusUpdateReq({
     required this.system,
     required this.ss,
     required this.segments,
+    required this.customCmds,
   });
 }
 
@@ -155,6 +157,16 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
     Loggers.parse.warning(e, s);
   }
 
+  try {
+    for (int idx = 0; idx < req.customCmds.length; idx++) {
+      final key = req.customCmds.keys.elementAt(idx);
+      final value = req.segments[idx + req.system.segmentsLen];
+      req.ss.customCmds[key] = value;
+    }
+  } catch (e, s) {
+    Loggers.parse.warning(e, s);
+  }
+
   return req.ss;
 }
 

lib/data/provider/container.dart

@@ -99,7 +99,7 @@ class ContainerProvider extends ChangeNotifier {
     }
 
     // Check result segments count
-    final segments = raw.split(seperator);
+    final segments = raw.split(ShellFunc.seperator);
     if (segments.length != ContainerCmdType.values.length) {
       error = ContainerErr(
         type: ContainerErrType.segmentsNotMatch,
@@ -270,6 +270,6 @@ enum ContainerCmdType {
   }) {
     return ContainerCmdType.values
         .map((e) => e.exec(type, sudo: sudo, includeStats: includeStats))
-        .join(' && echo $seperator && ');
+        .join(' && echo ${ShellFunc.seperator} && ');
   }
 }

lib/data/provider/server.dart

@@ -28,8 +28,8 @@ import '../res/status.dart';
 class ServerProvider extends ChangeNotifier {
   final Map<String, Server> _servers = {};
   Iterable<Server> get servers => _servers.values;
-  final Order<String> _serverOrder = [];
+  final List<String> _serverOrder = [];
-  Order<String> get serverOrder => _serverOrder;
+  List<String> get serverOrder => _serverOrder;
   final _tags = ValueNotifier(<String>[]);
   ValueNotifier<List<String>> get tags => _tags;
 
@@ -302,11 +302,12 @@ class ServerProvider extends ChangeNotifier {
 
       // Write script to server
       // by ssh
+      final scriptRaw = ShellFunc.allScript(spi.custom?.cmds).uint8List;
       try {
         await s.client?.runForOutput(
           ShellFunc.installShellCmd,
           action: (session) async {
-            session.stdin.add(ShellFunc.allScript.uint8List);
+            session.stdin.add(scriptRaw);
             session.stdin.close();
           },
         );
@@ -322,7 +323,7 @@ class ServerProvider extends ChangeNotifier {
         final localPath = joinPath(await Paths.doc, 'install.sh');
         final file = File(localPath);
         try {
-          file.writeAsString(ShellFunc.allScript);
+          file.writeAsBytes(scriptRaw);
           final completer = Completer();
           final homePath = (await s.client?.run('echo \$HOME').string)?.trim();
           if (homePath == null || homePath.isEmpty) {
@@ -362,7 +363,7 @@ class ServerProvider extends ChangeNotifier {
 
     try {
       raw = await s.client?.run(ShellFunc.status.exec).string;
-      segments = raw?.split(seperator).map((e) => e.trim()).toList();
+      segments = raw?.split(ShellFunc.seperator).map((e) => e.trim()).toList();
       if (raw == null || raw.isEmpty || segments == null || segments.isEmpty) {
         if (Stores.setting.keepStatusWhenErr.fetch()) {
           // Keep previous server status when err occurs
@@ -384,10 +385,13 @@ class ServerProvider extends ChangeNotifier {
     }
 
     final systemType = SystemType.parse(segments[0]);
-    if (!systemType.isSegmentsLenMatch(segments.length)) {
+    final customCmdLen = spi.custom?.cmds?.length ?? 0;
+    if (!systemType.isSegmentsLenMatch(segments.length - customCmdLen)) {
       TryLimiter.inc(sid);
-      s.status.err =
+      final expected = systemType.segmentsLen;
-          'Segments not match: expect ${systemType.segmentsLen}, got ${segments.length}, raw:\n\n$raw';
+      final actual = segments.length;
+      final err = 'Segments: expect $expected, got $actual, raw:\n\n$raw';
+      s.status.err = err;
       _setServerState(s, ServerState.failed);
       return;
     }
@@ -398,6 +402,7 @@ class ServerProvider extends ChangeNotifier {
         ss: s.status,
         segments: segments,
         system: systemType,
+        customCmds: spi.custom?.cmds ?? {},
       );
       s.status = await Computer.shared.start(
         getStatus,

lib/data/provider/snippet.dart

@@ -7,8 +7,8 @@ import 'package:toolbox/data/res/store.dart';
 import '../../core/extension/order.dart';
 
 class SnippetProvider extends ChangeNotifier {
-  late Order<Snippet> _snippets;
+  late List<Snippet> _snippets;
-  Order<Snippet> get snippets => _snippets;
+  List<Snippet> get snippets => _snippets;
 
   final _tags = ValueNotifier(<String>[]);
   ValueNotifier<List<String>> get tags => _tags;

lib/data/store/setting.dart

@@ -240,7 +240,7 @@ class SettingStore extends PersistentStore {
 
   /// Ignore local network device (eg: br-xxx, ovs-system...)
   /// when building traffic view on server tab
-  late final ignoreLocalNet = property('ignoreLocalNetIface', true);
+  late final ignoreLocalNet = property('ignoreLocalNet', true);
 
   /// Remerber pwd in memory
   /// Used for [DialogX.showPwdDialog]

lib/l10n/app_de.arb

@@ -55,6 +55,8 @@
   "createFile": "Datei erstellen",
   "createFolder": "Ordner erstellen",
   "cursorType": "Cursor-Typ",
+  "customCmd": "Benutzerdefinierte Befehle",
+  "customCmdHint": "\"Befehlsname\": \"Befehl\"",
   "dark": "Dunkel",
   "day": "Tag",
   "debug": "Debug",

lib/l10n/app_en.arb

@@ -55,6 +55,8 @@
   "createFile": "Create file",
   "createFolder": "Create folder",
   "cursorType": "Cursor type",
+  "customCmd": "Custom commands",
+  "customCmdHint": "\"Command Name\": \"Command\"",
   "dark": "Dark",
   "day": "Day",
   "debug": "Debug",

lib/l10n/app_es.arb

@@ -55,6 +55,8 @@
   "createFile": "Crear archivo",
   "createFolder": "Crear carpeta",
   "cursorType": "Tipo de cursor",
+  "customCmd": "Comandos personalizados",
+  "customCmdHint": "\"Nombre del comando\": \"Comando\"",
   "dark": "Oscuro",
   "day": "Día",
   "debug": "Depurar",

lib/l10n/app_fr.arb

@@ -55,6 +55,8 @@
   "createFile": "Créer un fichier",
   "createFolder": "Créer un dossier",
   "cursorType": "Type de curseur",
+  "customCmd": "Commandes personnalisées",
+  "customCmdHint": "\"Nom de la commande\": \"Commande\"",
   "dark": "Sombre",
   "day": "Jour",
   "debug": "Déboguer",

lib/l10n/app_id.arb

@@ -55,6 +55,8 @@
   "createFile": "Buat file",
   "createFolder": "Membuat folder",
   "cursorType": "Jenis kursor",
+  "customCmd": "Perintah kustom",
+  "customCmdHint": "\"Nama Perintah\": \"Perintah\"",
   "dark": "Gelap",
   "day": "Hari",
   "debug": "Debug",

lib/l10n/app_ja.arb

@@ -55,6 +55,8 @@
   "createFile": "ファイルを作成",
   "createFolder": "フォルダーを作成",
   "cursorType": "カーソルタイプ",
+  "customCmd": "カスタムコマンド",
+  "customCmdHint": "\"コマンド名\": \"コマンド\"",
   "dark": "ダーク",
   "day": "日",
   "debug": "デバッグ",

lib/l10n/app_pt.arb

@@ -55,6 +55,8 @@
   "createFile": "Criar arquivo",
   "createFolder": "Criar pasta",
   "cursorType": "Tipo de cursor",
+  "customCmd": "Comandos personalizados",
+  "customCmdHint": "\"Nome do comando\": \"Comando\"",
   "dark": "Escuro",
   "day": "Dia",
   "debug": "Debugar",

lib/l10n/app_ru.arb

@@ -55,6 +55,8 @@
   "createFile": "создать файл",
   "createFolder": "создать папку",
   "cursorType": "Тип курсора",
+  "customCmd": "Пользовательские команды",
+  "customCmdHint": "\"Имя команды\": \"Команда\"",
   "dark": "темная",
   "day": "День",
   "debug": "отладка",

lib/l10n/app_zh.arb

@@ -55,6 +55,8 @@
   "createFile": "创建文件",
   "createFolder": "创建文件夹",
   "cursorType": "光标类型",
+  "customCmd": "自定义命令",
+  "customCmdHint": "\"命令名称\": \"命令\"",
   "dark": "暗",
   "day": "天",
   "debug": "调试",

lib/l10n/app_zh_tw.arb

@@ -55,6 +55,8 @@
   "createFile": "創建文件",
   "createFolder": "創建文件夾",
   "cursorType": "光標類型",
+  "customCmd": "自定義命令",
+  "customCmdHint": "\"命令名稱\": \"命令\"",
   "dark": "暗",
   "day": "日",
   "debug": "調試",

lib/view/page/server/detail.dart

@@ -4,7 +4,6 @@ import 'package:provider/provider.dart';
 import 'package:toolbox/core/extension/context/common.dart';
 import 'package:toolbox/core/extension/context/dialog.dart';
 import 'package:toolbox/core/extension/context/locale.dart';
-import 'package:toolbox/core/extension/order.dart';
 import 'package:toolbox/core/extension/status_cmd_type.dart';
 import 'package:toolbox/data/model/app/server_detail_card.dart';
 import 'package:toolbox/data/model/server/battery.dart';
@@ -17,6 +16,7 @@ import 'package:toolbox/data/model/server/server_private_info.dart';
 import 'package:toolbox/data/model/server/system.dart';
 import 'package:toolbox/data/res/store.dart';
 import 'package:toolbox/view/widget/expand_tile.dart';
+import 'package:toolbox/view/widget/kv_row.dart';
 import 'package:toolbox/view/widget/server_func_btns.dart';
 
 import '../../../core/extension/numx.dart';
@@ -53,11 +53,12 @@ class _ServerDetailPageState extends State<ServerDetailPage>
       _buildTemperature,
       _buildBatteries,
       _buildPve,
+      _buildCustom,
     ],
   );
 
   late MediaQueryData _media;
-  final Order<String> _cardsOrder = [];
+  final List<String> _cardsOrder = [];
 
   final _netSortType = ValueNotifier(_NetSortType.device);
   late final _collapse = Stores.setting.collapseUIDefault.fetch();
@@ -73,7 +74,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
   void initState() {
     super.initState();
     final order = Stores.setting.detailCardOrder.fetch();
-    order.removeWhere((element) => !_cardBuildMap.containsKey(element));
+    order.removeWhere((e) => !ServerDetailCards.names.contains(e));
     _cardsOrder.addAll(order);
   }
 
@@ -716,6 +717,23 @@ class _ServerDetailPageState extends State<ServerDetailPage>
     );
   }
 
+  Widget _buildCustom(ServerStatus ss) {
+    return CardX(
+      child: ExpandTile(
+        leading: const Icon(MingCute.command_line, size: 17),
+        title: Text(l10n.customCmd),
+        initiallyExpanded: _getInitExpand(ss.customCmds.length),
+        children: [
+          for (final cmd in ss.customCmds.entries)
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 17, vertical: 7),
+              child: KvRow(k: cmd.key, v: cmd.value),
+            ),
+        ],
+      ),
+    );
+  }
+
   Widget _buildAnimatedText(Key key, String text, TextStyle style) {
     return AnimatedSwitcher(
       duration: const Duration(milliseconds: 277),

lib/view/page/server/edit.dart

@@ -1,9 +1,12 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:toolbox/core/extension/context/common.dart';
 import 'package:toolbox/core/extension/context/dialog.dart';
 import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/core/extension/context/snackbar.dart';
+import 'package:toolbox/core/extension/stringx.dart';
 import 'package:toolbox/core/extension/widget.dart';
 import 'package:toolbox/data/model/app/shell_func.dart';
 import 'package:toolbox/data/model/server/custom.dart';
@@ -37,6 +40,7 @@ class _ServerEditPageState extends State<ServerEditPage> {
   final _usernameController = TextEditingController();
   final _passwordController = TextEditingController();
   final _pveAddrCtrl = TextEditingController();
+  final _customCmdCtrl = TextEditingController();
 
   final _nameFocus = FocusNode();
   final _ipFocus = FocusNode();
@@ -77,7 +81,19 @@ class _ServerEditPageState extends State<ServerEditPage> {
       _altUrlController.text = spi.alterUrl ?? '';
       _autoConnect.value = spi.autoConnect ?? true;
       _jumpServer.value = spi.jumpId;
-      _pveAddrCtrl.text = spi.custom?.pveAddr ?? '';
+
+      final custom = spi.custom;
+      if (custom != null) {
+        _pveAddrCtrl.text = custom.pveAddr ?? '';
+        _pveIgnoreCert.value = custom.pveIgnoreCert;
+        try {
+          // Add a null check here to prevent setting `null` to the controller
+          final encoded = json.encode(custom.cmds!);
+          if (encoded.isNotEmpty) {
+            _customCmdCtrl.text = encoded;
+          }
+        } catch (_) {}
+      }
     }
   }
 
@@ -243,6 +259,7 @@ class _ServerEditPageState extends State<ServerEditPage> {
       _buildAuth(),
       //_buildJumpServer(),
       _buildPVE(),
+      _buildCustomCmd(),
     ];
     return SingleChildScrollView(
       padding: const EdgeInsets.fromLTRB(17, 17, 17, 47),
@@ -364,6 +381,17 @@ class _ServerEditPageState extends State<ServerEditPage> {
     );
   }
 
+  Widget _buildCustomCmd() {
+    return Input(
+      controller: _customCmdCtrl,
+      type: TextInputType.text,
+      maxLines: 3,
+      label: l10n.customCmd,
+      icon: Icons.code,
+      hint: '{${l10n.customCmdHint}}',
+    );
+  }
+
   Widget _buildFAB() {
     return FloatingActionButton(
       heroTag: 'server',
@@ -463,8 +491,21 @@ class _ServerEditPageState extends State<ServerEditPage> {
     if (_portController.text.isEmpty) {
       _portController.text = '22';
     }
-    final pveAddr = _pveAddrCtrl.text.isEmpty ? null : _pveAddrCtrl.text;
+    final customCmds = () {
-    final custom = pveAddr == null ? null : ServerCustom(pveAddr: pveAddr);
+      if (_customCmdCtrl.text.isEmpty) return null;
+      try {
+        return json.decode(_customCmdCtrl.text).cast<String, String>();
+      } catch (e) {
+        context.showSnackBar(l10n.invalidJson);
+        return null;
+      }
+    }();
+    final pveAddr = _pveAddrCtrl.text.selfIfNotNullEmpty;
+    final custom = ServerCustom(
+      pveAddr: pveAddr,
+      pveIgnoreCert: _pveIgnoreCert.value,
+      cmds: customCmds,
+    );
 
     final spi = ServerPrivateInfo(
       name: _nameController.text.isEmpty

lib/view/page/server/tab.dart

@@ -11,7 +11,6 @@ import 'package:toolbox/core/extension/ssh_client.dart';
 import 'package:toolbox/core/utils/platform/base.dart';
 import 'package:toolbox/core/utils/share.dart';
 import 'package:toolbox/data/model/app/shell_func.dart';
-import 'package:toolbox/data/model/server/sensors.dart';
 import 'package:toolbox/data/model/server/try_limiter.dart';
 import 'package:toolbox/data/res/provider.dart';
 import 'package:toolbox/data/res/store.dart';
@@ -212,7 +211,7 @@ class _ServerPageState extends State<ServerPage>
   Widget _buildRealServerCard(Server srv) {
     final id = srv.spi.id;
     final cardStatus = _getCardNoti(id);
-    final title = _buildServerCardTitle(srv.status, srv.state, srv.spi);
+    final title = _buildServerCardTitle(srv);
 
     return ListenableBuilder(
       listenable: cardStatus,
@@ -331,17 +330,13 @@ class _ServerPageState extends State<ServerPage>
     ];
   }
 
-  Widget _buildServerCardTitle(
+  Widget _buildServerCardTitle(Server s) {
-    ServerStatus ss,
-    ServerState cs,
-    ServerPrivateInfo spi,
-  ) {
     Widget rightCorner = UIs.placeholder;
-    if (cs == ServerState.failed) {
+    if (s.state == ServerState.failed) {
       rightCorner = InkWell(
         onTap: () {
-          TryLimiter.reset(spi.id);
+          TryLimiter.reset(s.spi.id);
-          Pros.server.refresh(spi: spi);
+          Pros.server.refresh(spi: s.spi);
         },
         child: const Padding(
           padding: EdgeInsets.symmetric(horizontal: 7),
@@ -352,9 +347,9 @@ class _ServerPageState extends State<ServerPage>
           ),
         ),
       );
-    } else if (!(spi.autoConnect ?? true) && cs == ServerState.disconnected) {
+    } else if (!(s.spi.autoConnect ?? true) && s.state == ServerState.disconnected) {
       rightCorner = InkWell(
-        onTap: () => Pros.server.refresh(spi: spi),
+        onTap: () => Pros.server.refresh(spi: s.spi),
         child: const Padding(
           padding: EdgeInsets.symmetric(horizontal: 7),
           child: Icon(
@@ -365,7 +360,7 @@ class _ServerPageState extends State<ServerPage>
         ),
       );
     } else if (Stores.setting.serverTabUseOldUI.fetch()) {
-      rightCorner = ServerFuncBtnsTopRight(spi: spi);
+      rightCorner = ServerFuncBtnsTopRight(spi: s.spi);
     }
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 7),
@@ -375,7 +370,7 @@ class _ServerPageState extends State<ServerPage>
           ConstrainedBox(
             constraints: BoxConstraints(maxWidth: _media.size.width / 2.3),
             child: Text(
-              spi.name,
+              s.spi.name,
               style: UIs.text13Bold,
               maxLines: 1,
               overflow: TextOverflow.ellipsis,
@@ -387,26 +382,25 @@ class _ServerPageState extends State<ServerPage>
             color: Colors.grey,
           ),
           const Spacer(),
-          _buildTopRightText(ss, cs),
+          _buildTopRightText(s),
           rightCorner,
         ],
       ),
     );
   }
 
-  Widget _buildTopRightText(ServerStatus ss, ServerState cs) {
+  Widget _buildTopRightText(Server s) {
-    if (cs == ServerState.failed && ss.err != null) {
+    if (s.state == ServerState.failed && s.status.err != null) {
       return GestureDetector(
-        onTap: () => _showFailReason(ss),
+        onTap: () => _showFailReason(s.status),
         child: Text(
           l10n.viewErr,
           style: UIs.text13Grey,
         ),
       );
     }
-    final topRightStr = _getTopRightStr(ss, cs);
     return Text(
-      topRightStr,
+      s.topRightStr,
       style: UIs.text13Grey,
     );
   }
@@ -526,34 +520,6 @@ class _ServerPageState extends State<ServerPage>
           _tag == null || (pro.pick(id: e)?.spi.tags?.contains(_tag) ?? false))
       .toList();
 
-  String _getTopRightStr(ServerStatus ss, ServerState cs) {
-    switch (cs) {
-      case ServerState.disconnected:
-        return l10n.disconnected;
-      case ServerState.finished:
-        final temp = ss.temps.first;
-        final sensorTemp = SensorItem.findPreferTempVal(ss.sensors);
-        final tempStr = switch ((temp, sensorTemp)) {
-          (_, final double val) => '${val.toStringAsFixed(1)}°C',
-          (final double val, _) => '${val.toStringAsFixed(1)}°C',
-          _ => null,
-        };
-        final upTime = ss.more[StatusCmdType.uptime];
-        final items = [tempStr, upTime];
-        final str = items.where((e) => e != null && e.isNotEmpty).join(' | ');
-        if (str.isEmpty) return l10n.noResult;
-        return str;
-      case ServerState.loading:
-        return l10n.serverTabLoading;
-      case ServerState.connected:
-        return l10n.connected;
-      case ServerState.connecting:
-        return l10n.serverTabConnecting;
-      case ServerState.failed:
-        return ss.err ?? l10n.serverTabFailed;
-    }
-  }
-
   double? _calcCardHeight(ServerState cs, bool flip) {
     if (_textFactorDouble != 1.0) return null;
     if (cs != ServerState.finished) {

lib/view/page/setting/seq/srv_detail_seq.dart

@@ -3,7 +3,6 @@ import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/core/extension/context/snackbar.dart';
 import 'package:toolbox/core/utils/platform/base.dart';
 import 'package:toolbox/data/model/app/server_detail_card.dart';
-import 'package:toolbox/data/res/logger.dart';
 import 'package:toolbox/data/res/store.dart';
 
 import '../../../../core/extension/order.dart';
@@ -33,15 +32,7 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
   Widget _buildBody() {
     return ValueListenableBuilder(
       valueListenable: prop.listenable(),
-      builder: (_, vals, __) {
+      builder: (_, keys, __) {
-        final keys = () {
-          try {
-            return List<String>.from(vals);
-          } catch (e) {
-            Loggers.app.info('ServerDetailOrderPage: $e');
-            return ServerDetailCards.names;
-          }
-        }();
         final disabled =
             ServerDetailCards.names.where((e) => !keys.contains(e)).toList();
         final allKeys = [...keys, ...disabled];
@@ -64,7 +55,7 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
               context.showSnackBar(l10n.disabled);
               return;
             }
-            keys.moveByItem(keys, o, n, property: prop);
+            keys.moveByItem(o, n, property: prop);
           },
         );
       },

lib/view/page/setting/seq/srv_func_seq.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/core/extension/context/snackbar.dart';
 import 'package:toolbox/data/model/app/menu/server_func.dart';
-import 'package:toolbox/data/res/logger.dart';
 import 'package:toolbox/data/res/store.dart';
 import 'package:toolbox/data/res/ui.dart';
 
@@ -33,15 +32,7 @@ class _ServerDetailOrderPageState extends State<ServerFuncBtnsOrderPage> {
   Widget _buildBody() {
     return ValueListenableBuilder(
       valueListenable: prop.listenable(),
-      builder: (_, vals, __) {
+      builder: (_, keys, __) {
-        final keys = () {
-          try {
-            return List<int>.from(vals);
-          } catch (e) {
-            Loggers.app.info('ServerFuncBtnsOrderPage: $e');
-            return ServerFuncBtn.values.map((e) => e.index).toList();
-          }
-        }();
         final disabled = ServerFuncBtn.values
             .map((e) => e.index)
             .where((e) => !keys.contains(e))
@@ -74,7 +65,7 @@ class _ServerDetailOrderPageState extends State<ServerFuncBtnsOrderPage> {
               context.showSnackBar(l10n.disabled);
               return;
             }
-            keys.moveByItem(keys, o, n, property: prop);
+            keys.moveByItem(o, n, property: prop);
           },
         );
       },

lib/view/page/setting/seq/virt_key.dart

@@ -4,7 +4,6 @@ import 'package:toolbox/core/extension/context/snackbar.dart';
 import 'package:toolbox/core/extension/order.dart';
 import 'package:toolbox/core/utils/platform/base.dart';
 import 'package:toolbox/data/model/ssh/virtual_key.dart';
-import 'package:toolbox/data/res/logger.dart';
 import 'package:toolbox/data/res/store.dart';
 import 'package:toolbox/data/res/ui.dart';
 import 'package:toolbox/view/widget/cardx.dart';
@@ -34,15 +33,7 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
   Widget _buildBody() {
     return ValueListenableBuilder(
       valueListenable: prop.listenable(),
-      builder: (_, vals, __) {
+      builder: (_, keys, __) {
-        final keys = () {
-          try {
-            return List<int>.from(vals);
-          } catch (e) {
-            Loggers.app.info('SSHVirtKeySettingPage: $e');
-            return VirtKey.values.map((e) => e.index).toList();
-          }
-        }();
         final disabled = VirtKey.values
             .map((e) => e.index)
             .where((e) => !keys.contains(e))
@@ -70,7 +61,7 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
               context.showSnackBar(l10n.disabled);
               return;
             }
-            keys.moveByItem(keys, o, n, property: prop);
+            keys.moveByItem(o, n, property: prop);
           },
         );
       },

lib/view/page/snippet/list.dart

@@ -59,9 +59,9 @@ class _SnippetListPageState extends State<SnippetListPage> {
           itemCount: filtered.length,
           onReorder: (oldIdx, newIdx) => setState(() {
             provider.snippets.moveByItem(
-              filtered,
               oldIdx,
               newIdx,
+              filtered: filtered,
               onMove: (p0) {
                 Stores.setting.snippetOrder.put(p0.map((e) => e.name).toList());
               },