@caoruhua/open-claude-remote 1.0.0 → 1.0.5

package/dist/backend/src/skills/skill-command-merger.js

@@ -3,80 +3,68 @@ import { isSkillCommand } from './skill-commands.js';
  * 智能合并 Skill Commands
  *
  * 合并策略：
- * 1. 保留所有非 Skill commands（系统默认 + 用户自定义）
- * 2. 对于 Skill commands：
- *    - 新增 Skill → 添加到列表
- *    - 删除 Skill → 从列表移除
- *    - 保留的 Skill → 保留用户的 enabled、autoSend、desc 修改
+ * 1. 保留用户设置的命令顺序（这是最重要的）
+ * 2. 对于已存在的 Skill commands：保留 enabled、autoSend 设置，更新 desc
+ * 3. 对于新增的 Skill commands：添加到列表末尾
+ * 4. 对于已删除的 Skill commands：从列表中移除
  *
- * @param existingCommands 现有命令列表（可能包含用户的修改）
+ * @param existingCommands 现有命令列表（可能包含用户的修改和自定义顺序）
  * @param newSkillCommands 新扫描出的 Skill Commands
  * @returns 合并结果
  */
 export function mergeSkillCommands(existingCommands, newSkillCommands) {
-    // 1. 分离现有命令：非 Skill commands 和 Skill commands
-    const nonSkillCommands = [];
-    const existingSkillCommands = new Map();
-    // 构建新 skill label 集合，用于 orphan 检测
-    const newSkillLabels = new Set(newSkillCommands.map((c) => c.label));
-    for (const cmd of existingCommands) {
-        if (isSkillCommand(cmd)) {
-            existingSkillCommands.set(cmd.label, cmd);
-        }
-        else if (newSkillLabels.has(cmd.label)) {
-            // Orphan: 丢失 fromSkill 标记但与新 skill 同名 → 回收为 skill command
-            existingSkillCommands.set(cmd.label, cmd);
-        }
-        else {
-            nonSkillCommands.push(cmd);
-        }
-    }
-    // 2. 构建新 Skill 命令映射
+    // 1. 构建新 Skill 映射和标签集合
     const newSkillMap = new Map();
+    const newSkillLabels = new Set();
     for (const cmd of newSkillCommands) {
         newSkillMap.set(cmd.label, cmd);
+        newSkillLabels.add(cmd.label);
     }
-    // 3. 合并 Skill commands
-    const mergedSkillCommands = [];
-    let added = 0;
-    let removed = 0;
+    // 2. 遍历现有命令，保留用户设置的顺序
+    const finalCommands = [];
+    const processedLabels = new Set();
     let preserved = 0;
-    // 处理新 Skill
-    for (const [label, newCmd] of newSkillMap) {
-        const existingCmd = existingSkillCommands.get(label);
-        if (existingCmd) {
-            // Skill 存在，保留用户的交互设置，desc 始终从 Skill 源更新
-            mergedSkillCommands.push({
-                ...newCmd,
-                // 保留用户的 enabled 设置
-                enabled: existingCmd.enabled,
-                // 保留用户的 autoSend 设置
-                autoSend: existingCmd.autoSend ?? newCmd.autoSend,
-            });
-            preserved++;
+    let removed = 0;
+    for (const cmd of existingCommands) {
+        const isExistingSkill = isSkillCommand(cmd);
+        const isOrphanSkill = !isExistingSkill && newSkillLabels.has(cmd.label);
+        if (isExistingSkill || isOrphanSkill) {
+            // 这是一个 Skill command（或 orphan）
+            const newSkill = newSkillMap.get(cmd.label);
+            if (newSkill) {
+                // Skill 仍然存在，保留用户设置，更新 desc
+                finalCommands.push({
+                    ...newSkill,
+                    enabled: cmd.enabled,
+                    autoSend: cmd.autoSend ?? newSkill.autoSend,
+                });
+                processedLabels.add(cmd.label);
+                preserved++;
+            }
+            else {
+                // Skill 已被删除，跳过（移除）
+                removed++;
+            }
         }
         else {
-            // 新 Skill，直接添加
-            mergedSkillCommands.push(newCmd);
-            added++;
+            // 这是一个 non-Skill command（系统默认或用户自定义），直接保留
+            finalCommands.push(cmd);
         }
     }
-    // 统计移除的 Skill
-    for (const [label] of existingSkillCommands) {
-        if (!newSkillMap.has(label)) {
-            removed++;
+    // 3. 添加新增的 Skill commands 到末尾
+    let added = 0;
+    for (const [label, newCmd] of newSkillMap) {
+        if (!processedLabels.has(label)) {
+            finalCommands.push(newCmd);
+            added++;
         }
     }
-    // 4. 组合最终结果：非 Skill commands + 合并后的 Skill commands
-    // 按 label 排序 Skill commands
-    mergedSkillCommands.sort((a, b) => a.label.localeCompare(b.label));
-    const finalCommands = [...nonSkillCommands, ...mergedSkillCommands];
     return {
         commands: finalCommands,
         added,
         removed,
         preserved,
-        total: mergedSkillCommands.length,
+        total: newSkillCommands.length,
     };
 }
 //# sourceMappingURL=skill-command-merger.js.map

package/dist/backend/src/skills/skill-command-merger.js.map

@@ -1 +1 @@
-{"version":3,"file":"skill-command-merger.js","sourceRoot":"","sources":["../../../../backend/src/skills/skill-command-merger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAkBrD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,kBAAkB,CAChC,gBAAuC,EACvC,gBAAuC;IAEvC,8CAA8C;IAC9C,MAAM,gBAAgB,GAA0B,EAAE,CAAC;IACnD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAA+B,CAAC;IAErE,kCAAkC;IAClC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAErE,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnC,IAAI,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACzC,0DAA0D;YAC1D,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,oBAAoB;IACpB,MAAM,WAAW,GAAG,IAAI,GAAG,EAA+B,CAAC;IAC3D,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,uBAAuB;IACvB,MAAM,mBAAmB,GAA0B,EAAE,CAAC;IACtD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,YAAY;IACZ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;QAC1C,MAAM,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAErD,IAAI,WAAW,EAAE,CAAC;YAChB,wCAAwC;YACxC,mBAAmB,CAAC,IAAI,CAAC;gBACvB,GAAG,MAAM;gBACT,mBAAmB;gBACnB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,oBAAoB;gBACpB,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;aAClD,CAAC,CAAC;YACH,SAAS,EAAE,CAAC;QACd,CAAC;aAAM,CAAC;YACN,eAAe;YACf,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,KAAK,EAAE,CAAC;QACV,CAAC;IACH,CAAC;IAED,cAAc;IACd,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,qBAAqB,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED,mDAAmD;IACnD,4BAA4B;IAC5B,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAEnE,MAAM,aAAa,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,mBAAmB,CAAC,CAAC;IAEpE,OAAO;QACL,QAAQ,EAAE,aAAa;QACvB,KAAK;QACL,OAAO;QACP,SAAS;QACT,KAAK,EAAE,mBAAmB,CAAC,MAAM;KAClC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"skill-command-merger.js","sourceRoot":"","sources":["../../../../backend/src/skills/skill-command-merger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAkBrD;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,kBAAkB,CAChC,gBAAuC,EACvC,gBAAuC;IAEvC,uBAAuB;IACvB,MAAM,WAAW,GAAG,IAAI,GAAG,EAA+B,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAChC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,sBAAsB;IACtB,MAAM,aAAa,GAA0B,EAAE,CAAC;IAChD,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAC1C,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnC,MAAM,eAAe,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,aAAa,GAAG,CAAC,eAAe,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAExE,IAAI,eAAe,IAAI,aAAa,EAAE,CAAC;YACrC,+BAA+B;YAC/B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC5C,IAAI,QAAQ,EAAE,CAAC;gBACb,4BAA4B;gBAC5B,aAAa,CAAC,IAAI,CAAC;oBACjB,GAAG,QAAQ;oBACX,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ;iBAC5C,CAAC,CAAC;gBACH,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC/B,SAAS,EAAE,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,oBAAoB;gBACpB,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,0CAA0C;YAC1C,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,8BAA8B;IAC9B,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAChC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC3B,KAAK,EAAE,CAAC;QACV,CAAC;IACH,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,aAAa;QACvB,KAAK;QACL,OAAO;QACP,SAAS;QACT,KAAK,EAAE,gBAAgB,CAAC,MAAM;KAC/B,CAAC;AACJ,CAAC"}

package/dist/backend/src/utils/ip-monitor.d.ts

@@ -1,7 +1,21 @@
-import { type NetworkInterface } from './network.js';
-export type IpChangeCallback = (newIp: string, oldIp: string) => void;
+import { type NetworkInterface, type PreferredInterface } from './network.js';
+/**
+ * IP 变化回调，包含网卡信息。
+ */
+export interface IpChangeEvent {
+    newIp: string;
+    oldIp: string;
+    interfaceName: string;
+}
+/**
+ * 网卡切换事件。
+ */
+export interface InterfaceSwitchEvent {
+    newInterface: PreferredInterface;
+    previousInterface: PreferredInterface;
+}
+export type IpChangeCallback = (event: IpChangeEvent) => void;
 export type NetworkChangeCallback = (interfaces: NetworkInterface[], preferredIp: string) => void;
-export type GetIpFunction = () => string | null;
 /**
  * IP 变化监控器。
  *
@@ -10,43 +24,74 @@ export type GetIpFunction = () => string | null;
  * - 连续 stabilityThreshold 次检测到相同新 IP 才触发回调
  * - 避免短暂网络波动导致误报
  *
- * 增强功能：同时监控所有网络接口的变化
+ * 绑定特定网卡监控：
+ * - 启动时记录当前首选网卡
+ * - 只监控该网卡的 IP 变化
+ * - 当前网卡断开时自动切换到备用网卡
+ * - 高优先级网卡恢复时（如 VPN）自动切回
  */
 export declare class IpMonitor {
     private readonly onChange;
     private readonly intervalMs;
     private readonly stabilityThreshold;
-    private readonly getIp;
     private readonly onNetworkChange?;
+    private readonly onInterfaceSwitch?;
     private intervalId;
     private pendingIp;
     private stabilityCount;
     private _currentIp;
+    private _currentInterfaceName;
+    private _currentInterfaceIsVpn;
+    private _currentInterfaceIsPrivate;
     private _currentInterfaces;
     private pendingInterfaces;
     private interfaceStabilityCount;
-    constructor(onChange: IpChangeCallback, intervalMs?: number, stabilityThreshold?: number, getIp?: GetIpFunction, onNetworkChange?: NetworkChangeCallback | undefined);
+    private disconnectedCount;
+    private readonly disconnectThreshold;
+    private _disconnectHandled;
+    constructor(onChange: IpChangeCallback, intervalMs?: number, stabilityThreshold?: number, onNetworkChange?: NetworkChangeCallback | undefined, onInterfaceSwitch?: ((event: InterfaceSwitchEvent) => void) | undefined);
     /**
      * 启动 IP 监控。
-     * @param initialIp 初始 IP 地址
+     * @param initialInterface 初始网卡信息（名称和 IP）
      */
-    start(initialIp: string): void;
+    start(initialInterface: PreferredInterface): void;
     /**
      * 停止 IP 监控。
      */
     stop(): void;
     /**
      * 检测 IP 变化。
+     * 只监控当前绑定的网卡，当前网卡断开时尝试切换。
      */
     private check;
+    /**
+     * 处理当前网卡断开的情况：切换到其他可用网卡。
+     * 不直接触发 onChange，让 check() 通过稳定性阈值处理 IP 变化通知。
+     */
+    private handleInterfaceDisconnect;
+    /**
+     * 切换监控目标到新网卡。
+     * 不直接触发 onChange — 让 check() 通过稳定性阈值处理 IP 变化。
+     */
+    private switchInterface;
     /**
      * 检测网络接口列表变化。
+     * 同时检查是否有更高优先级的网卡恢复（如 VPN 重连）。
      */
     private checkInterfaces;
+    /**
+     * 检查是否有更高优先级的网卡可用（VPN 恢复场景）。
+     * 仅在优先级更高时切换，避免在同级别间反复切换。
+     */
+    private checkPreferredInterface;
     /**
      * 获取当前 IP。
      */
     get currentIp(): string;
+    /**
+     * 获取当前监控的网卡名称。
+     */
+    get currentInterfaceName(): string;
     /**
      * 获取当前所有网络接口。
      */

package/dist/backend/src/utils/ip-monitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ip-monitor.d.ts","sourceRoot":"","sources":["../../../../backend/src/utils/ip-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6D,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhH,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;AACtE,MAAM,MAAM,qBAAqB,GAAG,CAAC,UAAU,EAAE,gBAAgB,EAAE,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;AAClG,MAAM,MAAM,aAAa,GAAG,MAAM,MAAM,GAAG,IAAI,CAAC;AAmBhD;;;;;;;;;GASG;AACH,qBAAa,SAAS;IAUlB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IAbnC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,iBAAiB,CAAmC;IAC5D,OAAO,CAAC,uBAAuB,CAAK;gBAGjB,QAAQ,EAAE,gBAAgB,EAC1B,UAAU,SAAQ,EAClB,kBAAkB,SAAI,EACtB,KAAK,GAAE,aAA4B,EACnC,eAAe,CAAC,EAAE,qBAAqB,YAAA;IAG1D;;;OAGG;IACH,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAsB9B;;OAEG;IACH,IAAI,IAAI,IAAI;IAWZ;;OAEG;IACH,OAAO,CAAC,KAAK;IAgDb;;OAEG;IACH,OAAO,CAAC,eAAe;IAiDvB;;OAEG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,gBAAgB,EAAE,CAE1C;CACF"}
+{"version":3,"file":"ip-monitor.d.ts","sourceRoot":"","sources":["../../../../backend/src/utils/ip-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACxB,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,kBAAkB,CAAC;IACjC,iBAAiB,EAAE,kBAAkB,CAAC;CACvC;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;AAC9D,MAAM,MAAM,qBAAqB,GAAG,CAAC,UAAU,EAAE,gBAAgB,EAAE,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;AAYlG;;;;;;;;;;;;;GAaG;AACH,qBAAa,SAAS;IAgBlB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAnBrC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,qBAAqB,CAAc;IAC3C,OAAO,CAAC,sBAAsB,CAAkB;IAChD,OAAO,CAAC,0BAA0B,CAAkB;IACpD,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,iBAAiB,CAAmC;IAC5D,OAAO,CAAC,uBAAuB,CAAK;IACpC,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAK;IACzC,OAAO,CAAC,kBAAkB,CAAS;gBAGhB,QAAQ,EAAE,gBAAgB,EAC1B,UAAU,SAAQ,EAClB,kBAAkB,SAAI,EACtB,eAAe,CAAC,EAAE,qBAAqB,YAAA,EACvC,iBAAiB,CAAC,GAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,aAAA;IAG5E;;;OAGG;IACH,KAAK,CAAC,gBAAgB,EAAE,kBAAkB,GAAG,IAAI;IAoCjD;;OAEG;IACH,IAAI,IAAI,IAAI;IAaZ;;;OAGG;IACH,OAAO,CAAC,KAAK;IAmFb;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAmBjC;;;OAGG;IACH,OAAO,CAAC,eAAe;IA0BvB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAyDvB;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAmB/B;;OAEG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED;;OAEG;IACH,IAAI,oBAAoB,IAAI,MAAM,CAEjC;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,gBAAgB,EAAE,CAE1C;CACF"}

package/dist/backend/src/utils/ip-monitor.js

@@ -1,11 +1,5 @@
-import { detectLanIp, detectNonLoopbackIp, getAllNetworkInterfaces } from './network.js';
+import { getAllNetworkInterfaces, getInterfaceIp, detectSecondaryInterface, detectPreferredInterface, } from './network.js';
 import { logger } from '../logger/logger.js';
-/**
- * 默认的 IP 检测函数：优先使用 LAN IP，其次使用非回环 IP
- */
-function defaultGetIp() {
-    return detectLanIp() ?? detectNonLoopbackIp();
-}
 /**
  * 序列化接口列表，用于比对变化
  */
@@ -23,37 +17,52 @@ function serializeInterfaces(interfaces) {
  * - 连续 stabilityThreshold 次检测到相同新 IP 才触发回调
  * - 避免短暂网络波动导致误报
  *
- * 增强功能：同时监控所有网络接口的变化
+ * 绑定特定网卡监控：
+ * - 启动时记录当前首选网卡
+ * - 只监控该网卡的 IP 变化
+ * - 当前网卡断开时自动切换到备用网卡
+ * - 高优先级网卡恢复时（如 VPN）自动切回
  */
 export class IpMonitor {
     onChange;
     intervalMs;
     stabilityThreshold;
-    getIp;
     onNetworkChange;
+    onInterfaceSwitch;
     intervalId = null;
     pendingIp = null;
     stabilityCount = 0;
     _currentIp = '';
+    _currentInterfaceName = '';
+    _currentInterfaceIsVpn = false;
+    _currentInterfaceIsPrivate = false;
     _currentInterfaces = [];
     pendingInterfaces = null;
     interfaceStabilityCount = 0;
-    constructor(onChange, intervalMs = 30000, stabilityThreshold = 2, getIp = defaultGetIp, onNetworkChange) {
+    disconnectedCount = 0;
+    disconnectThreshold = 3; // 连续 3 次检测不到认为断开
+    _disconnectHandled = false;
+    constructor(onChange, intervalMs = 30000, stabilityThreshold = 2, onNetworkChange, onInterfaceSwitch) {
         this.onChange = onChange;
         this.intervalMs = intervalMs;
         this.stabilityThreshold = stabilityThreshold;
-        this.getIp = getIp;
         this.onNetworkChange = onNetworkChange;
+        this.onInterfaceSwitch = onInterfaceSwitch;
     }
     /**
      * 启动 IP 监控。
-     * @param initialIp 初始 IP 地址
+     * @param initialInterface 初始网卡信息（名称和 IP）
      */
-    start(initialIp) {
+    start(initialInterface) {
         this.stop();
-        this._currentIp = initialIp;
+        this._currentIp = initialInterface.address;
+        this._currentInterfaceName = initialInterface.name;
+        this._currentInterfaceIsVpn = initialInterface.isVpn;
+        this._currentInterfaceIsPrivate = initialInterface.isPrivate;
         this.pendingIp = null;
         this.stabilityCount = 0;
+        this.disconnectedCount = 0;
+        this._disconnectHandled = false;
         this._currentInterfaces = getAllNetworkInterfaces();
         this.pendingInterfaces = null;
         this.interfaceStabilityCount = 0;
@@ -65,7 +74,13 @@ export class IpMonitor {
         if (this.intervalId.unref) {
             this.intervalId.unref();
         }
-        logger.info({ initialIp, interfaces: this._currentInterfaces.length, intervalMs: this.intervalMs }, 'IP monitor started');
+        logger.info({
+            ip: initialInterface.address,
+            interface: initialInterface.name,
+            isVpn: initialInterface.isVpn,
+            isPrivate: initialInterface.isPrivate,
+            intervalMs: this.intervalMs,
+        }, 'IP monitor started');
     }
     /**
      * 停止 IP 监控。
@@ -77,22 +92,46 @@ export class IpMonitor {
         }
         this.pendingIp = null;
         this.stabilityCount = 0;
+        this.disconnectedCount = 0;
+        this._disconnectHandled = false;
         this.pendingInterfaces = null;
         this.interfaceStabilityCount = 0;
     }
     /**
      * 检测 IP 变化。
+     * 只监控当前绑定的网卡，当前网卡断开时尝试切换。
      */
     check() {
-        const newIp = this.getIp();
-        // 网络断开时不处理
+        // 只检查当前绑定的网卡
+        const newIp = getInterfaceIp(this._currentInterfaceName);
         if (!newIp) {
+            // 当前网卡可能已断开，增加断开计数
+            this.disconnectedCount++;
+            logger.debug({
+                interface: this._currentInterfaceName,
+                disconnectCount: this.disconnectedCount,
+                threshold: this.disconnectThreshold,
+            }, 'Current interface IP not detected, counting disconnect');
+            // 达到断开阈值且未处理过，尝试切换到其他网卡
+            if (this.disconnectedCount >= this.disconnectThreshold && !this._disconnectHandled) {
+                this._disconnectHandled = true;
+                this.handleInterfaceDisconnect();
+            }
             return;
         }
+        // 网卡恢复，重置断开计数
+        if (this.disconnectedCount > 0) {
+            logger.debug({ interface: this._currentInterfaceName, ip: newIp }, 'Interface recovered');
+            this.disconnectedCount = 0;
+            this._disconnectHandled = false;
+        }
         // IP 未变化，重置待确认状态
         if (newIp === this._currentIp) {
             if (this.pendingIp !== null) {
-                logger.debug('IP stabilized to original, resetting monitor state');
+                logger.debug({
+                    ip: newIp,
+                    interface: this._currentInterfaceName,
+                }, 'IP stabilized to original, resetting monitor state');
             }
             this.pendingIp = null;
             this.stabilityCount = 0;
@@ -104,6 +143,7 @@ export class IpMonitor {
             this.stabilityCount++;
             logger.debug({
                 pendingIp: this.pendingIp,
+                interface: this._currentInterfaceName,
                 stabilityCount: this.stabilityCount,
                 threshold: this.stabilityThreshold,
             }, 'IP change detected, counting stability');
@@ -114,6 +154,7 @@ export class IpMonitor {
             this.stabilityCount = 1;
             logger.debug({
                 newIp,
+                interface: this._currentInterfaceName,
             }, 'New IP detected, waiting for stability');
         }
         // 达到稳定性阈值，触发回调
@@ -122,17 +163,57 @@ export class IpMonitor {
             this._currentIp = newIp;
             this.pendingIp = null;
             this.stabilityCount = 0;
-            logger.info({ oldIp, newIp }, 'IP change confirmed, triggering callback');
-            this.onChange(newIp, oldIp);
+            logger.info({ oldIp, newIp, interface: this._currentInterfaceName }, 'IP change confirmed, triggering callback');
+            this.onChange({
+                newIp,
+                oldIp,
+                interfaceName: this._currentInterfaceName,
+            });
+        }
+    }
+    /**
+     * 处理当前网卡断开的情况：切换到其他可用网卡。
+     * 不直接触发 onChange，让 check() 通过稳定性阈值处理 IP 变化通知。
+     */
+    handleInterfaceDisconnect() {
+        logger.warn({ interface: this._currentInterfaceName, previousIp: this._currentIp }, 'Current interface disconnected, searching for alternative');
+        const alternative = detectSecondaryInterface(this._currentInterfaceName);
+        if (alternative) {
+            this.switchInterface(alternative);
+        }
+        else {
+            logger.warn({ interface: this._currentInterfaceName }, 'No alternative network interfaces available, waiting for recovery');
+            // _disconnectHandled = true 阻止重复触发，等 checkInterfaces 检测到新接口后重置
+        }
+    }
+    /**
+     * 切换监控目标到新网卡。
+     * 不直接触发 onChange — 让 check() 通过稳定性阈值处理 IP 变化。
+     */
+    switchInterface(newInterface) {
+        const previousInterface = {
+            name: this._currentInterfaceName,
+            address: this._currentIp,
+            isVpn: this._currentInterfaceIsVpn,
+            isPrivate: this._currentInterfaceIsPrivate,
+        };
+        this._currentInterfaceName = newInterface.name;
+        this._currentInterfaceIsVpn = newInterface.isVpn;
+        this._currentInterfaceIsPrivate = newInterface.isPrivate;
+        this.disconnectedCount = 0;
+        this._disconnectHandled = false;
+        this.pendingIp = null;
+        this.stabilityCount = 0;
+        logger.info({ oldInterface: previousInterface.name, newInterface: newInterface.name, newIp: newInterface.address }, 'Switched monitoring to new interface');
+        if (this.onInterfaceSwitch) {
+            this.onInterfaceSwitch({ newInterface, previousInterface });
         }
     }
     /**
      * 检测网络接口列表变化。
+     * 同时检查是否有更高优先级的网卡恢复（如 VPN 重连）。
      */
     checkInterfaces() {
-        // 如果没有网络变化回调，跳过此检查
-        if (!this.onNetworkChange)
-            return;
         const newInterfaces = getAllNetworkInterfaces();
         const currentSerialized = serializeInterfaces(this._currentInterfaces);
         const newSerialized = serializeInterfaces(newInterfaces);
@@ -169,16 +250,47 @@ export class IpMonitor {
             this.interfaceStabilityCount = 0;
             logger.info({
                 interfaces: newInterfaces.map(i => `${i.name}:${i.address}`),
-            }, 'Network interface change confirmed, triggering callback');
-            this.onNetworkChange(newInterfaces, this._currentIp);
+            }, 'Network interface change confirmed');
+            // 检查是否有更高优先级的网卡恢复（如 VPN 重连）
+            this.checkPreferredInterface();
+            // 重置断开处理标记，新接口可能提供替代方案
+            if (this._disconnectHandled) {
+                this._disconnectHandled = false;
+            }
+            // 通知外部
+            if (this.onNetworkChange) {
+                this.onNetworkChange(newInterfaces, this._currentIp);
+            }
         }
     }
+    /**
+     * 检查是否有更高优先级的网卡可用（VPN 恢复场景）。
+     * 仅在优先级更高时切换，避免在同级别间反复切换。
+     */
+    checkPreferredInterface() {
+        const preferred = detectPreferredInterface();
+        if (!preferred || preferred.name === this._currentInterfaceName)
+            return;
+        // 仅当新首选网卡优先级更高时才切换
+        const shouldSwitch = (preferred.isVpn && !this._currentInterfaceIsVpn) ||
+            (preferred.isPrivate && !this._currentInterfaceIsPrivate && !this._currentInterfaceIsVpn);
+        if (!shouldSwitch)
+            return;
+        logger.info({ currentInterface: this._currentInterfaceName, preferredInterface: preferred.name }, 'Higher-priority interface detected, switching');
+        this.switchInterface(preferred);
+    }
     /**
      * 获取当前 IP。
      */
     get currentIp() {
         return this._currentIp;
     }
+    /**
+     * 获取当前监控的网卡名称。
+     */
+    get currentInterfaceName() {
+        return this._currentInterfaceName;
+    }
     /**
      * 获取当前所有网络接口。
      */

package/dist/backend/src/utils/ip-monitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ip-monitor.js","sourceRoot":"","sources":["../../../../backend/src/utils/ip-monitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ip-monitor.js","sourceRoot":"","sources":["../../../../backend/src/utils/ip-monitor.ts"],"names":[],"mappings":"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"}

package/dist/backend/src/utils/network.d.ts

@@ -58,4 +58,29 @@ export declare function detectAllLocalIps(): string[];
  * Useful for environments with non-RFC1918 internal networks (e.g., corporate networks).
  */
 export declare function detectNonLoopbackIp(): string | null;
+/**
+ * Result of detecting the preferred network interface.
+ */
+export interface PreferredInterface {
+    name: string;
+    address: string;
+    isVpn: boolean;
+    isPrivate: boolean;
+}
+/**
+ * Detect the preferred network interface for monitoring.
+ * Priority: VPN > Private LAN > Public
+ * Returns null if no suitable interface found.
+ */
+export declare function detectPreferredInterface(): PreferredInterface | null;
+/**
+ * Detect a secondary interface when the primary one is disconnected.
+ * Excludes the given interface name from consideration.
+ */
+export declare function detectSecondaryInterface(excludeInterfaceName: string): PreferredInterface | null;
+/**
+ * Get the IP address of a specific network interface.
+ * Returns null if interface not found or has no IPv4 address.
+ */
+export declare function getInterfaceIp(interfaceName: string): string | null;
 //# sourceMappingURL=network.d.ts.map

package/dist/backend/src/utils/network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../../backend/src/utils/network.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAiBD;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEpD;AAsBD;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAS/D;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CASpD;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,GAAE,MAAM,EAAO,GAAG,OAAO,CAc3F;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,gBAAgB,EAAE,CAmC5D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAWlD;AAED;;;GAGG;AACH,wBAAgB,WAAW,IAAI,MAAM,GAAG,IAAI,CAY3C;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,EAAE,CAW5C;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAYnD"}
+{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../../backend/src/utils/network.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAiBD;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEpD;AAsBD;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAS/D;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CASpD;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,GAAE,MAAM,EAAO,GAAG,OAAO,CAc3F;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,gBAAgB,EAAE,CAmC5D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAWlD;AAED;;;GAGG;AACH,wBAAgB,WAAW,IAAI,MAAM,GAAG,IAAI,CAY3C;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,EAAE,CAW5C;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAYnD;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,kBAAkB,GAAG,IAAI,CAsBpE;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,oBAAoB,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAwBhG;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAenE"}

package/dist/backend/src/utils/network.js

@@ -193,4 +193,63 @@ export function detectNonLoopbackIp() {
     logger.warn('No non-loopback IP detected');
     return null;
 }
+/**
+ * Detect the preferred network interface for monitoring.
+ * Priority: VPN > Private LAN > Public
+ * Returns null if no suitable interface found.
+ */
+export function detectPreferredInterface() {
+    const interfaces = getAllNetworkInterfaces();
+    if (interfaces.length === 0) {
+        logger.warn('No network interfaces detected');
+        return null;
+    }
+    // getAllNetworkInterfaces already returns interfaces sorted by preference
+    const preferred = interfaces[0];
+    logger.info({ name: preferred.name, ip: preferred.address, isVpn: preferred.isVpn, isPrivate: preferred.isPrivate }, 'Detected preferred network interface');
+    return {
+        name: preferred.name,
+        address: preferred.address,
+        isVpn: preferred.isVpn,
+        isPrivate: preferred.isPrivate,
+    };
+}
+/**
+ * Detect a secondary interface when the primary one is disconnected.
+ * Excludes the given interface name from consideration.
+ */
+export function detectSecondaryInterface(excludeInterfaceName) {
+    const interfaces = getAllNetworkInterfaces();
+    // Filter out the excluded interface
+    const available = interfaces.filter(i => i.name !== excludeInterfaceName);
+    if (available.length === 0) {
+        logger.warn({ excludedInterface: excludeInterfaceName }, 'No secondary network interfaces available');
+        return null;
+    }
+    const selected = available[0];
+    logger.info({ name: selected.name, ip: selected.address, excludedInterface: excludeInterfaceName }, 'Switched to secondary network interface');
+    return {
+        name: selected.name,
+        address: selected.address,
+        isVpn: selected.isVpn,
+        isPrivate: selected.isPrivate,
+    };
+}
+/**
+ * Get the IP address of a specific network interface.
+ * Returns null if interface not found or has no IPv4 address.
+ */
+export function getInterfaceIp(interfaceName) {
+    const nets = networkInterfaces();
+    const interfaceList = nets[interfaceName];
+    if (!interfaceList) {
+        return null;
+    }
+    for (const net of interfaceList) {
+        if (net.family === 'IPv4' && !net.internal) {
+            return net.address;
+        }
+    }
+    return null;
+}
 //# sourceMappingURL=network.js.map