Add per-process disk I/O read and write speed to process management (#1179)

* Update dartssh2

* Add process disk IO read/write rates

* Add issuers of #1175 and #1178 to participants list

* Fix globbing in process script and extract state helpers

Author: GT-610

lib/data/model/app/scripts/script_builders.dart

@@ -111,7 +111,10 @@ switch (\$args[0]) {
       disabledCmdTypes: disabledCmdTypes ?? [],
     ),
     ShellFunc.process =>
-      'Get-Process | Select-Object ProcessName, Id, CPU, WorkingSet | ConvertTo-Json',
+      r'''
+Get-Process | Select-Object ProcessName, Id, CPU, WorkingSet,
+    @{Name='IOReadBytes';Expression={$_.IOReadBytes}},
+    @{Name='IOWriteBytes';Expression={$_.IOWriteBytes}} | ConvertTo-Json''',
     ShellFunc.shutdown => 'Stop-Computer -Force',
     ShellFunc.reboot => 'Restart-Computer -Force',
     ShellFunc.suspend =>
@@ -253,7 +256,22 @@ if [ "\$macSign" = "" ] && [ "\$bsdSign" = "" ]; then
 \tif [ "\$isBusybox" != "" ]; then
 \t\tps w
 \telse
-\t\tps -aux
+\t\tprintf 'PID USER %%CPU %%MEM VSZ RSS TTY STAT START TIME READ_BYTES WRITE_BYTES COMMAND\\n'
+\t\tps -axo pid=,user=,%cpu=,%mem=,vsz=,rss=,tty=,stat=,start=,time=,args= | while IFS= read -r line; do
+\t\t\tset -f
+\t\t\tset -- \$line
+\t\t\tset +f
+\t\t\tpid=\$1; user=\$2; cpu=\$3; mem=\$4; vsz=\$5; rss=\$6; tty=\$7; stat=\$8; start=\$9; time=\${10}
+\t\t\tshift 10
+\t\t\tcmd=\$*
+\t\t\tread_bytes='-'
+\t\t\twrite_bytes='-'
+\t\t\tif [ -r "/proc/\$pid/io" ]; then
+\t\t\t\tread_bytes=\$(awk '/^read_bytes:/ {print \$2}' "/proc/\$pid/io")
+\t\t\t\twrite_bytes=\$(awk '/^write_bytes:/ {print \$2}' "/proc/\$pid/io")
+\t\t\tfi
+\t\t\tprintf '%s %s %s %s %s %s %s %s %s %s %s %s %s\\n' "\$pid" "\$user" "\$cpu" "\$mem" "\$vsz" "\$rss" "\$tty" "\$stat" "\$start" "\$time" "\$read_bytes" "\$write_bytes" "\$cmd"
+\t\tdone
 \tfi
 else
 \tps -ax

lib/data/model/server/proc.dart

@@ -1,4 +1,4 @@
-import 'package:fl_lib/fl_lib.dart';
+import 'dart:convert';
 
 import 'package:server_box/data/res/misc.dart';
 
@@ -13,6 +13,8 @@ class _ProcValIdxMap {
   final int? stat;
   final int? start;
   final int? time;
+  final int? readBytes;
+  final int? writeBytes;
   final int command;
 
   const _ProcValIdxMap({
@@ -26,6 +28,8 @@ class _ProcValIdxMap {
     this.stat,
     this.start,
     this.time,
+    this.readBytes,
+    this.writeBytes,
     required this.command,
   });
 }
@@ -42,6 +46,10 @@ class Proc {
   final String? stat;
   final String? start;
   final String? time;
+  final int? readBytes;
+  final int? writeBytes;
+  final double? readSpeed;
+  final double? writeSpeed;
   final String command;
 
   const Proc({
@@ -55,11 +63,28 @@ class Proc {
     this.stat,
     this.start,
     this.time,
+    this.readBytes,
+    this.writeBytes,
+    this.readSpeed,
+    this.writeSpeed,
     required this.command,
   });
 
-  factory Proc._parse(String raw, _ProcValIdxMap map) {
+  factory Proc._parse(
+    String raw,
+    _ProcValIdxMap map, {
+    Proc? previous,
+    double? elapsedSeconds,
+  }) {
     final parts = raw.split(RegExp(r'\s+'));
+    final readBytes = _parseNullableInt(parts, map.readBytes);
+    final writeBytes = _parseNullableInt(parts, map.writeBytes);
+    final (readSpeed, writeSpeed) = _calculateSpeeds(
+      readBytes: readBytes,
+      writeBytes: writeBytes,
+      previous: previous,
+      elapsedSeconds: elapsedSeconds,
+    );
     return Proc(
       user: map.user == null ? null : parts[map.user!],
       pid: int.parse(parts[map.pid]),
@@ -71,10 +96,47 @@ class Proc {
       stat: map.stat == null ? null : parts[map.stat!],
       start: map.start == null ? null : parts[map.start!],
       time: map.time == null ? null : parts[map.time!],
+      readBytes: readBytes,
+      writeBytes: writeBytes,
+      readSpeed: readSpeed,
+      writeSpeed: writeSpeed,
       command: parts.sublist(map.command).join(' '),
     );
   }
 
+  factory Proc._parseWindowsJson(
+    Map<String, dynamic> raw, {
+    Proc? previous,
+    double? elapsedSeconds,
+  }) {
+    final readBytes = _parseDynamicInt(
+      raw['IOReadBytes'] ?? raw['ReadTransferCount'],
+    );
+    final writeBytes = _parseDynamicInt(
+      raw['IOWriteBytes'] ?? raw['WriteTransferCount'],
+    );
+    final (readSpeed, writeSpeed) = _calculateSpeeds(
+      readBytes: readBytes,
+      writeBytes: writeBytes,
+      previous: previous,
+      elapsedSeconds: elapsedSeconds,
+    );
+    final name = raw['ProcessName'] ?? raw['Name'];
+    final command = raw['CommandLine'] ?? raw['Path'] ?? name ?? '';
+    return Proc(
+      pid: _parseDynamicInt(raw['Id'] ?? raw['ProcessId'])!,
+      cpu: _parseDynamicDouble(raw['CPU']),
+      rss: _parseDynamicInt(
+        raw['WorkingSet'] ?? raw['WorkingSetSize'],
+      )?.toString(),
+      readBytes: readBytes,
+      writeBytes: writeBytes,
+      readSpeed: readSpeed,
+      writeSpeed: writeSpeed,
+      command: command.toString(),
+    );
+  }
+
   Map toJson() {
     return {
       'user': user,
@@ -87,6 +149,10 @@ class Proc {
       'stat': stat,
       'start': start,
       'time': time,
+      'readBytes': readBytes,
+      'writeBytes': writeBytes,
+      'readSpeed': readSpeed,
+      'writeSpeed': writeSpeed,
       'command': command,
     };
   }
@@ -106,12 +172,41 @@ class Proc {
 class PsResult {
   final List<Proc> procs;
   final String? error;
+  final int sampledAtMillis;
+
+  const PsResult({required this.procs, this.error, this.sampledAtMillis = 0});
 
-  const PsResult({required this.procs, this.error});
+  factory PsResult.parse(
+    String raw, {
+    ProcSortMode sort = ProcSortMode.cpu,
+    PsResult? previous,
+    int? sampledAtMillis,
+  }) {
+    final currentSampledAtMillis =
+        sampledAtMillis ?? DateTime.now().millisecondsSinceEpoch;
+    final previousByPid = {
+      for (final proc in previous?.procs ?? const <Proc>[]) proc.pid: proc,
+    };
+    final elapsedSeconds = previous == null || previous.sampledAtMillis <= 0
+        ? null
+        : (currentSampledAtMillis - previous.sampledAtMillis) / 1000.0;
+    final jsonResult = _parseWindowsJsonResult(
+      raw,
+      previousByPid: previousByPid,
+      elapsedSeconds: elapsedSeconds,
+      sampledAtMillis: currentSampledAtMillis,
+      sort: sort,
+    );
+    if (jsonResult != null) return jsonResult;
 
-  factory PsResult.parse(String raw, {ProcSortMode sort = ProcSortMode.cpu}) {
-    final lines = raw.split('\n').map((e) => e.trim()).toList();
-    if (lines.isEmpty) return const PsResult(procs: [], error: null);
+    final lines = raw
+        .split('\n')
+        .map((e) => e.trim())
+        .where((e) => e.isNotEmpty)
+        .toList();
+    if (lines.isEmpty) {
+      return PsResult(procs: const [], sampledAtMillis: currentSampledAtMillis);
+    }
 
     final header = lines[0];
     final parts = header.split(RegExp(r'\s+'));
@@ -127,6 +222,8 @@ class PsResult {
       stat: parts.indexOfOrNull('STAT'),
       start: parts.indexOfOrNull('START'),
       time: parts.indexOfOrNull('TIME'),
+      readBytes: parts.indexOfOrNull('READ_BYTES'),
+      writeBytes: parts.indexOfOrNull('WRITE_BYTES'),
       command: parts.indexOfOrNull('COMMAND') ?? parts.indexOfOrNull('CMD')!,
     );
 
@@ -136,19 +233,83 @@ class PsResult {
       final line = lines[i];
       if (line.isEmpty) continue;
       try {
-        procs.add(Proc._parse(line, map));
-      } catch (e, trace) {
+        final pid = _parsePid(line, map.pid);
+        procs.add(
+          Proc._parse(
+            line,
+            map,
+            previous: previousByPid[pid],
+            elapsedSeconds: elapsedSeconds,
+          ),
+        );
+      } catch (e) {
         errs.add('$line: $e');
-        Loggers.app.warning('Process failed', e, trace);
       }
     }
 
+    _sort(procs, sort);
+    return PsResult(
+      procs: procs,
+      error: errs.isEmpty ? null : errs.join('\n'),
+      sampledAtMillis: currentSampledAtMillis,
+    );
+  }
+
+  static PsResult? _parseWindowsJsonResult(
+    String raw, {
+    required Map<int, Proc> previousByPid,
+    required double? elapsedSeconds,
+    required int sampledAtMillis,
+    required ProcSortMode sort,
+  }) {
+    final trimmed = raw.trim();
+    if (!trimmed.startsWith('{') && !trimmed.startsWith('[')) return null;
+    try {
+      final decoded = json.decode(trimmed);
+      final items = decoded is List ? decoded : [decoded];
+      final procs = <Proc>[];
+      final errs = <String>[];
+      for (final item in items) {
+        if (item is! Map) continue;
+        try {
+          final map = Map<String, dynamic>.from(item);
+          final pid = _parseDynamicInt(map['Id'] ?? map['ProcessId']);
+          if (pid == null) continue;
+          procs.add(
+            Proc._parseWindowsJson(
+              map,
+              previous: previousByPid[pid],
+              elapsedSeconds: elapsedSeconds,
+            ),
+          );
+        } catch (e) {
+          errs.add('$item: $e');
+        }
+      }
+      _sort(procs, sort);
+      return PsResult(
+        procs: procs,
+        error: errs.isEmpty ? null : errs.join('\n'),
+        sampledAtMillis: sampledAtMillis,
+      );
+    } catch (_) {
+      return null;
+    }
+  }
+
+  static void _sort(List<Proc> procs, ProcSortMode sort) {
     switch (sort) {
       case ProcSortMode.cpu:
-        procs.sort((a, b) => b.cpu?.compareTo(a.cpu ?? 0) ?? 0);
+        procs.sort((a, b) => _compareNullableDesc(a.cpu, b.cpu));
         break;
       case ProcSortMode.mem:
-        procs.sort((a, b) => b.mem?.compareTo(a.mem ?? 0) ?? 0);
+        procs.sort((a, b) => _compareNullableDesc(a.mem, b.mem));
+        break;
+      case ProcSortMode.read:
+        procs.sort((a, b) => _compareNullableDesc(a.readSpeed, b.readSpeed));
+        break;
+      case ProcSortMode.write:
+        procs.sort((a, b) => _compareNullableDesc(a.writeSpeed, b.writeSpeed));
         break;
       case ProcSortMode.pid:
         procs.sort((a, b) => a.pid.compareTo(b.pid));
@@ -160,15 +321,71 @@ class PsResult {
         procs.sort((a, b) => a.binary.compareTo(b.binary));
         break;
     }
-    return PsResult(procs: procs, error: errs.isEmpty ? null : errs.join('\n'));
   }
 }
 
-enum ProcSortMode { cpu, mem, pid, user, name }
+enum ProcSortMode { cpu, mem, read, write, pid, user, name }
 
 extension _StrIndex on List<String> {
   int? indexOfOrNull(String val) {
     final idx = indexOf(val);
     return idx == -1 ? null : idx;
   }
 }
+
+int _parsePid(String raw, int pidIndex) {
+  final parts = raw.split(RegExp(r'\s+'));
+  return int.parse(parts[pidIndex]);
+}
+
+int? _parseNullableInt(List<String> parts, int? idx) {
+  if (idx == null || idx >= parts.length) return null;
+  return _parseDynamicInt(parts[idx]);
+}
+
+int? _parseDynamicInt(Object? val) {
+  if (val == null) return null;
+  if (val is int) return val;
+  if (val is num) return val.toInt();
+  final str = val.toString();
+  if (str.isEmpty || str == '-') return null;
+  return int.tryParse(str);
+}
+
+double? _parseDynamicDouble(Object? val) {
+  if (val == null) return null;
+  if (val is double) return val;
+  if (val is num) return val.toDouble();
+  final str = val.toString();
+  if (str.isEmpty || str == '-') return null;
+  return double.tryParse(str);
+}
+
+(double?, double?) _calculateSpeeds({
+  required int? readBytes,
+  required int? writeBytes,
+  required Proc? previous,
+  required double? elapsedSeconds,
+}) {
+  if (previous == null || elapsedSeconds == null || elapsedSeconds <= 0) {
+    return (null, null);
+  }
+  return (
+    _calculateSpeed(readBytes, previous.readBytes, elapsedSeconds),
+    _calculateSpeed(writeBytes, previous.writeBytes, elapsedSeconds),
+  );
+}
+
+double? _calculateSpeed(int? current, int? previous, double elapsedSeconds) {
+  if (current == null || previous == null) return null;
+  final diff = current - previous;
+  if (diff < 0) return null;
+  return diff / elapsedSeconds;
+}
+
+int _compareNullableDesc(num? a, num? b) {
+  if (a == null && b == null) return 0;
+  if (a == null) return 1;
+  if (b == null) return -1;
+  return b.compareTo(a);
+}

lib/data/res/github_id.dart

@@ -175,6 +175,8 @@ abstract final class GithubIds {
     'kuilei0926',
     'ci-sourcerer',
     'misaki258',
+    'Muska-Ami',
+    'wu4339'
   };
 }