aws-runtime-bridge 1.9.66 → 1.9.71

package/README.md

@@ -37,12 +37,26 @@ npm install -g .
       "serverUrl": "http://127.0.0.1:8080",
       "instanceName": "至强主机",
       "userKey": "aws_live_crh_g0GGrg5IntODg1sFwnas7qf4yGrcwoisDWPBtd8",
-      "registerIp": "127.0.0.1"
+      "registerAddr": "127.0.0.1"
     }
   ]
 }
 ```
 
+### `registerAddr` 字段说明
+
+`registerAddr` 用于告知调度中心如何回连本机 Bridge，支持三种写法：
+
+| 写法 | 示例 | 解析结果 | 适用场景 |
+| --- | --- | --- | --- |
+| 完整 URL（含协议） | `https://bridge.example.com` | 原样使用 | Bridge 在反代后面或启用 TLS |
+| `host:port` | `127.0.0.1:18081` | 自动补 `http://` 前缀 | http 直连 + 自定义端口 |
+| 纯 `host` | `10.0.0.8` | 自动补 `http://` 前缀和 `AWS_RUNTIME_BRIDGE_PORT`（默认 18081） | http 直连 + 默认端口 |
+
+> **TLS / 反代场景**：当 Bridge 部署在 Nginx/Caddy/Cloudflare 后面走 https 时，必须用完整 URL 形式（如 `https://bridge.example.com`），此时环境变量 `AWS_RUNTIME_BRIDGE_PORT` 不再生效。
+
+> **向后兼容**：旧字段 `registerIp`（仅接受纯 IP）仍可读取，但已废弃，推荐迁移到 `registerAddr`。配置引导会在重新配置时自动将 `registerIp` 迁移为 `registerAddr` 并剥离老字段。
+
 如需在交互式终端中也强制跳过引导，可设置 `AWS_BRIDGE_SKIP_SETUP=true`；此时仍会生成随机 `connectionKey`。
 
 ```bash
@@ -90,6 +104,8 @@ sudo awsb service uninstall
 | --- | --- | --- |
 | `AWS_RUNTIME_BRIDGE_PORT` | Bridge HTTP 端口 | `18081` |
 | `AWS_RUNTIME_SCHEDULER_BASE_URL` | aws-mcp-server 地址；显式配置优先级最高，未配置且只有一个 `autoRegisterTargets[].serverUrl` 时自动使用该地址 | 单目标自动注册地址；否则 `http://localhost:8080` |
+| `AWS_REGISTER_ADDR` | Bridge 对外注册地址，覆盖配置文件中的 `registerAddr`；支持 `host:port` / 纯 `host` / 完整 URL（`http(s)://...`） | 未设置时读取配置文件 |
+| `AWS_REGISTER_IP` | 已废弃，仅做向后兼容；等同 `registerAddr` 但只接受纯 IP，端口由 `AWS_RUNTIME_BRIDGE_PORT` 决定 | 未设置时读取配置文件 |
 | `AWS_RUNTIME_HOME_DIR` | Bridge 管理配置与状态的主目录 | 当前用户 Home |
 | `AWS_RUNTIME_CORS_ORIGINS` | 允许访问 bridge 的来源，逗号分隔 | 本地开发地址 |
 

package/dist/config.d.ts

@@ -7,11 +7,15 @@
 export declare const port: number;
 /** 默认调度器基础 URL */
 export declare const DEFAULT_SCHEDULER_BASE_URL = "http://localhost:8080";
-export type SchedulerBaseUrlSource = "request" | "env" | "single-auto-register-target" | "default" | "ambiguous-auto-register-targets";
+export type SchedulerBaseUrlSource = "request" | "instance-id-match" | "env" | "single-auto-register-target" | "default" | "ambiguous-auto-register-targets";
 export interface SchedulerBaseUrlResolution {
     url: string;
     source: SchedulerBaseUrlSource;
     ambiguousTargetUrls: string[];
+    /** 匹配到的 target 的 instanceId（若有），用于 /ping 响应回传给 server */
+    instanceId?: string;
+    /** 匹配到的 target 的 instanceName（若有），用于 /ping 响应回传给 server */
+    instanceName?: string;
 }
 /**
  * 解析调度中心基础 URL。
@@ -20,9 +24,10 @@ export interface SchedulerBaseUrlResolution {
 export declare function resolveSchedulerBaseUrl(): SchedulerBaseUrlResolution;
 /**
  * 解析调度中心基础 URL。
- * 主流程：服务端请求携带的 scheduler 地址优先；再读显式环境变量；最后回退到单个自动注册目标或默认值。
+ * 主流程：服务端请求携带的 scheduler 地址优先；再按 instanceId/instanceName 在 config.json 中匹配 target；
+ * 再读显式环境变量；最后回退到单个自动注册目标或默认值。
  */
-export declare function resolveSchedulerBaseUrlFrom(requestSchedulerBaseUrl: unknown): SchedulerBaseUrlResolution;
+export declare function resolveSchedulerBaseUrlFrom(requestSchedulerBaseUrl: unknown, instanceId?: unknown, instanceName?: unknown): SchedulerBaseUrlResolution;
 /** 调度器基础 URL（兼容旧导入；请求处理应优先调用 resolveSchedulerBaseUrl 获取最新值） */
 export declare const schedulerBaseUrl: string;
 /** Node 环境 */

package/dist/config.d.ts.map

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

package/dist/config.js

@@ -46,32 +46,47 @@ function getAutoRegisterConfigFilePath() {
     const testHomeDir = String(process.env.AWS_TEST_HOME || "").trim();
     return path.join(testHomeDir || homedir(), ".aws-bridge", "config.json");
 }
-function readAutoRegisterTargetUrls() {
+/** 读取 config.json 中的自动注册目标完整信息（含 instanceId / instanceName） */
+function readAutoRegisterTargets() {
     const configPath = getAutoRegisterConfigFilePath();
     try {
         if (!fs.existsSync(configPath)) {
             return [];
         }
         const parsed = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+        const normalizeTarget = (source) => {
+            const serverUrl = normalizeSchedulerHttpBaseUrl(source.serverUrl) ||
+                normalizeSchedulerHttpBaseUrl(source.schedulerBaseUrl);
+            return {
+                serverUrl,
+                instanceId: normalizeOptionalString(source.instanceId),
+                instanceName: normalizeOptionalString(source.instanceName),
+            };
+        };
         const rawTargets = Array.isArray(parsed.autoRegisterTargets)
             ? parsed.autoRegisterTargets
             : [];
-        const targetUrls = rawTargets
+        const targets = rawTargets
             .filter((item) => Boolean(item && typeof item === "object" && !Array.isArray(item)))
-            .map((target) => normalizeSchedulerHttpBaseUrl(target.serverUrl) ||
-            normalizeSchedulerHttpBaseUrl(target.schedulerBaseUrl))
-            .filter((url) => Boolean(url));
-        if (targetUrls.length > 0) {
-            return Array.from(new Set(targetUrls));
+            .map(normalizeTarget)
+            .filter((target) => Boolean(target.serverUrl));
+        if (targets.length > 0) {
+            return targets;
         }
-        const topLevelUrl = normalizeSchedulerHttpBaseUrl(parsed.serverUrl) ||
-            normalizeSchedulerHttpBaseUrl(parsed.schedulerBaseUrl);
-        return topLevelUrl ? [topLevelUrl] : [];
+        const topLevel = normalizeTarget(parsed);
+        return topLevel.serverUrl ? [topLevel] : [];
     }
     catch {
         return [];
     }
 }
+function readAutoRegisterTargetUrls() {
+    const targets = readAutoRegisterTargets();
+    const urls = targets
+        .map((target) => target.serverUrl)
+        .filter((url) => Boolean(url));
+    return Array.from(new Set(urls));
+}
 /**
  * 解析调度中心基础 URL。
  * 主流程：显式环境变量优先；未配置时，单个自动注册目标可作为宿主机部署的零额外配置回退；多目标不静默取第一个。
@@ -81,9 +96,10 @@ export function resolveSchedulerBaseUrl() {
 }
 /**
  * 解析调度中心基础 URL。
- * 主流程：服务端请求携带的 scheduler 地址优先；再读显式环境变量；最后回退到单个自动注册目标或默认值。
+ * 主流程：服务端请求携带的 scheduler 地址优先；再按 instanceId/instanceName 在 config.json 中匹配 target；
+ * 再读显式环境变量；最后回退到单个自动注册目标或默认值。
  */
-export function resolveSchedulerBaseUrlFrom(requestSchedulerBaseUrl) {
+export function resolveSchedulerBaseUrlFrom(requestSchedulerBaseUrl, instanceId, instanceName) {
     const normalizedRequestSchedulerBaseUrl = normalizeSchedulerHttpBaseUrl(requestSchedulerBaseUrl);
     if (normalizedRequestSchedulerBaseUrl) {
         return {
@@ -92,6 +108,34 @@ export function resolveSchedulerBaseUrlFrom(requestSchedulerBaseUrl) {
             ambiguousTargetUrls: [],
         };
     }
+    // 按 instanceId / instanceName 在 config.json autoRegisterTargets 中匹配 target
+    const trimmedInstanceId = typeof instanceId === "string" ? instanceId.trim() : "";
+    const trimmedInstanceName = typeof instanceName === "string" ? instanceName.trim() : "";
+    if (trimmedInstanceId || trimmedInstanceName) {
+        const targets = readAutoRegisterTargets();
+        // 优先按 instanceId 精确匹配
+        let matched;
+        if (trimmedInstanceId) {
+            matched = targets.find((target) => target.instanceId === trimmedInstanceId);
+        }
+        // 回退到按 instanceName 匹配（支持单独传 instanceName 的场景）
+        if (!matched && trimmedInstanceName) {
+            matched = targets.find((target) => target.instanceName === trimmedInstanceName);
+        }
+        // 兼容旧逻辑：instanceId 入参也曾用作 instanceName 匹配
+        if (!matched && trimmedInstanceId && !trimmedInstanceName) {
+            matched = targets.find((target) => target.instanceName === trimmedInstanceId);
+        }
+        if (matched?.serverUrl) {
+            return {
+                url: matched.serverUrl,
+                source: "instance-id-match",
+                ambiguousTargetUrls: [],
+                instanceId: matched.instanceId,
+                instanceName: matched.instanceName,
+            };
+        }
+    }
     const envSchedulerBaseUrl = normalizeSchedulerHttpBaseUrl(process.env.AWS_RUNTIME_SCHEDULER_BASE_URL);
     if (envSchedulerBaseUrl) {
         return {

package/dist/index.js

@@ -37,7 +37,8 @@ import { startOrphanMonitor, stopOrphanMonitor, } from "./services/orphan-monito
 import { getAgentProcessManager } from "./services/agent-process-manager.js";
 import { adapterRegistry } from "./adapter/index.js";
 import { logger } from "./utils/logger.js";
-import { autoRegister, unregister, bridgeRestartCleanup, } from "./services/auto-register.js";
+import { autoRegister, unregister, bridgeRestartCleanup, cancelBackgroundRegisterRetries, } from "./services/auto-register.js";
+import { stopTunnelClient } from "./services/tunnel-client.js";
 import { ensureAwsClientAgentMcpReleased } from "./services/aws-client-agent-mcp.js";
 import { ensureAcodePackageReleased } from "./services/acode-package.js";
 import { ensureStartupConfig } from "./services/startup-config-wizard.js";
@@ -68,13 +69,13 @@ async function performAutoRegister() {
             // 检查注册状态
             const { loadConfig } = await import("./services/auto-register.js");
             const config = loadConfig();
-            // 判断是否有配置（配置文件存在或环境变量设置了必填项）
-            const hasConfig = config.tenantId && config.userKey;
+            // 判断是否有配置（userKey 为必填项；tenantId 可自动推导，不参与判断）
+            const hasConfig = Boolean(config.userKey);
             if (hasConfig && config.enabled) {
-                // 有配置但注册失败，服务启动失败
-                logger.error("[runtime-bridge] 自动注册已启用但注册失败，服务启动失败");
-                logger.error("[runtime-bridge] 请检查调度中心是否可达、配置是否正确");
-                process.exitCode = 1;
+                // 有配置但暂时注册失败（如 server 尚未启动）：
+                // autoRegisterSingle 已调度后台持续重试，连上后自动完成注册与隧道建立，
+                // bridge 继续正常提供本地服务
+                logger.warn("[runtime-bridge] 自动注册暂时失败，将在后台持续重试直到与调度中心建立连接");
             }
             else {
                 // 没有配置，正常启动服务
@@ -465,6 +466,12 @@ async function gracefulShutdown(signal, server, preserveSessions = false) {
         else {
             logger.info("[runtime-bridge] ★ 保留模式跳过实例注销，避免调度中心将 Agent 标记为 stopped");
         }
+        // 6.5 停止后台注册重试 + 关闭隧道客户端（若运行中）
+        cancelBackgroundRegisterRetries();
+        if (shutdownPlan.stopTunnelClient) {
+            logger.info("[runtime-bridge] 正在关闭隧道客户端...");
+            stopTunnelClient();
+        }
         // 7. ★★★ 修复：根据 preserveSessions 决定是否清空持久化状态
         // - preserveSessions=true (aws-mcp-server 触发): 保留会话状态，aws-mcp-server 重启后可恢复
         // - preserveSessions=false (bridge 自己关闭): 清空所有会话，agent 应被清理

package/dist/routes/file-browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-browser.d.ts","sourceRoot":"","sources":["../../src/routes/file-browser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,MAAM,MAAM,QAAQ,CAAC;AA2B5B,eAAO,MAAM,iBAAiB,4CAAW,CAAC;AAE1C,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAUhD,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,mBAAmB;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,eAAe,EAAE,CAAC;CAC1B;AAMD,UAAU,iBAAkB,SAAQ,eAAe;IACjD,QAAQ,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,qBAAsB,SAAQ,mBAAmB;IACzD,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,IAAI,EAAE,iBAAiB,EAAE,CAAC;CAC3B;AAED,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAiBD,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,MAAM,CAAC,WAAW,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAUvI;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAgBzF;AAyFD;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,WAAW,SAAK,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAkB5F;AAoCD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,EAAE,CAuBpE;AA6BD,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,OAAO,CAWhH"}
+{"version":3,"file":"file-browser.d.ts","sourceRoot":"","sources":["../../src/routes/file-browser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,MAAM,MAAM,QAAQ,CAAC;AA2B5B,eAAO,MAAM,iBAAiB,4CAAW,CAAC;AAE1C,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAUhD,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,mBAAmB;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,eAAe,EAAE,CAAC;CAC1B;AAMD,UAAU,iBAAkB,SAAQ,eAAe;IACjD,QAAQ,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,qBAAsB,SAAQ,mBAAmB;IACzD,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,IAAI,EAAE,iBAAiB,EAAE,CAAC;CAC3B;AAED,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAiBD,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,MAAM,CAAC,WAAW,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAUvI;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAgBzF;AAwFD;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,WAAW,SAAK,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAkB5F;AAoCD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,EAAE,CAuBpE;AA6BD,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,OAAO,CAWhH"}

package/dist/routes/file-browser.js

@@ -84,21 +84,18 @@ async function listHostDirectories(requestPath = '') {
     const isWindows = platform === 'win32';
     if (!requestPath || requestPath === '') {
         if (isWindows) {
-            const drives = [];
-            for (let i = 67; i <= 90; i++) { // C to Z
-                const drive = String.fromCharCode(i) + ':\\';
+            // 并行检测所有盘符（C-Z），避免串行 access 累加延迟
+            const driveLetters = Array.from({ length: 24 }, (_, i) => String.fromCharCode(67 + i) + ':\\');
+            const driveChecks = await Promise.all(driveLetters.map(async (drive) => {
                 try {
                     await fs.access(drive);
-                    drives.push({
-                        name: drive,
-                        path: drive,
-                        isDirectory: true
-                    });
+                    return { name: drive, path: drive, isDirectory: true };
                 }
                 catch {
-                    // Drive not accessible, skip
+                    return null;
                 }
-            }
+            }));
+            const drives = driveChecks.filter((d) => d !== null);
             return {
                 isWindows: true,
                 currentPath: '',

package/dist/routes/instance.js

@@ -339,7 +339,7 @@ instanceRouter.get("/connection-check", (req, res) => {
     res.status(result.status).json(result.body);
 });
 instanceRouter.get("/ping", validateToken, async (req, res) => {
-    const schedulerBaseUrlResolution = resolveSchedulerBaseUrlFrom(req.header("X-Scheduler-Base-Url"));
+    const schedulerBaseUrlResolution = resolveSchedulerBaseUrlFrom(req.header("X-Scheduler-Base-Url"), req.header("X-Bridge-Instance-Id"), req.header("X-Bridge-Instance-Name"));
     if (schedulerBaseUrlResolution.source === "ambiguous-auto-register-targets") {
         res
             .status(400)
@@ -348,7 +348,7 @@ instanceRouter.get("/ping", validateToken, async (req, res) => {
     }
     const schedulerBaseUrl = schedulerBaseUrlResolution.url;
     try {
-        const runtimeAccessToken = getRuntimeAccessToken(undefined, schedulerBaseUrl);
+        const runtimeAccessToken = getRuntimeAccessToken(schedulerBaseUrl);
         if (!runtimeAccessToken) {
             res.status(401).json({ ok: false, error: "runtime_access_token_required" });
             return;
@@ -361,6 +361,9 @@ instanceRouter.get("/ping", validateToken, async (req, res) => {
             schedulerReachable: schedulerPing.schedulerReachable,
             tokenRefreshed: schedulerPing.tokenRefreshed,
             schedulerBaseUrl,
+            // 回传匹配到的 instanceId/instanceName，让 server 知道 bridge 实际绑定的是哪个
+            instanceId: schedulerBaseUrlResolution.instanceId,
+            instanceName: schedulerBaseUrlResolution.instanceName,
         });
     }
     catch (error) {
@@ -663,7 +666,7 @@ instanceRouter.post("/prepare-restart", validateToken, async (req, res) => {
  */
 instanceRouter.post("/update-bridge", validateTokenOrPanelSession, async (req, res) => {
     const command = resolveNpmExecutable();
-    const args = ["install", "-g", "aws-runtime-bridge@latest"];
+    const args = ["install", "-g", "aws-runtime-bridge@latest", "--omit=optional"];
     const requestedByUserId = normalizeOptionalText(req.body?.requestedByUserId);
     try {
         if (!requestedByUserId) {

package/dist/services/auto-register.d.ts

@@ -23,16 +23,36 @@ interface AutoRegisterConfig {
     connectionKey?: string;
     /** 实例名称（默认使用主机名） */
     instanceName?: string;
+    /** 实例 ID（可选，预声明时发送给 server 作为实例标识；注册成功后自动回填） */
+    instanceId?: string;
     /** 项目名称 */
     projectName?: string;
     /** 角色名称 */
     roleName?: string;
     /** 工作空间路径 */
     workspacePath?: string;
-    /** 注册 IP（优先用于生成 runtimeBridgeBaseUrl） */
+    /**
+     * 注册地址（推荐）
+     * - 支持 `host:port`、纯 `host`（自动补 AWS_RUNTIME_BRIDGE_PORT）、完整 URL（`http://...` / `https://...`，原样使用）
+     * - 优先级高于 registerIp / virtualIp
+     */
+    registerAddr?: string;
+    /**
+     * 注册 IP（已废弃，仅做向后兼容回退）
+     * - 仅接受纯 IP/host，端口由 AWS_RUNTIME_BRIDGE_PORT 决定
+     * - 推荐迁移到 registerAddr
+     */
     registerIp?: string;
     /** 虚拟 IP（EasyTier，兼容旧配置） */
     virtualIp?: string;
+    /**
+     * 是否启用隧道模式（三态）：
+     * - true：显式启用隧道模式，bridge 经 WebSocket 反向连出到 server，
+     *   server 经 /tunnel/{instanceId}/ 虚拟路径反向调用 bridge。
+     * - false：显式禁用隧道模式，即使未填 registerAddr 也走直连（用于 loopback 场景）。
+     * - undefined（默认）：未填 registerAddr/registerIp/virtualIp 时自动判定为隧道模式（向后兼容）。
+     */
+    tunnel?: boolean;
     /** 是否优先选择与 serverUrl 同局域网的本机 IP */
     preferSameLanIp?: boolean;
     /** 注册重试次数 */
@@ -41,6 +61,8 @@ interface AutoRegisterConfig {
     retryInterval?: number;
 }
 export declare function getConfiguredConnectionKeys(): string[];
+/** 停止所有后台注册重试（优雅关闭/测试清理用） */
+export declare function cancelBackgroundRegisterRetries(): void;
 /**
  * 配置文件路径
  */
@@ -54,6 +76,8 @@ export declare function getAutoRegisterConfigFilePath(): string;
  */
 export declare function loadConfig(): AutoRegisterConfig;
 export declare function loadConfigs(): AutoRegisterConfig[];
+export declare function isTunnelConfig(config?: AutoRegisterConfig): boolean;
+export declare function loadPrimaryLifecycleConfig(): AutoRegisterConfig;
 /**
  * 自动注册主函数
  *

package/dist/services/auto-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-register.d.ts","sourceRoot":"","sources":["../../src/services/auto-register.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAmDH;;GAEG;AACH,UAAU,kBAAkB;IAC1B,eAAe;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,oBAAoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oCAAoC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yCAAyC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAuBD,wBAAgB,2BAA2B,IAAI,MAAM,EAAE,CAEtD;AAiED;;GAEG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,CAGtD;AAyJD;;;;;;GAMG;AACH,wBAAgB,UAAU,IAAI,kBAAkB,CA2C/C;AAED,wBAAgB,WAAW,IAAI,kBAAkB,EAAE,CA0ClD;AA2PD;;;;;;;;;;GAUG;AACH,wBAAsB,YAAY,CAChC,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACzC,OAAO,CAAC,OAAO,CAAC,CAalB;AAyHD;;GAEG;AACH,wBAAsB,gCAAgC,IAAI,OAAO,CAAC;IAChE,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CAoED;AAED,wBAAsB,yCAAyC,CAC7D,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC;IACT,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA0ED;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAgCnD;AAED;;GAEG;AACH,wBAAgB,oBAAoB;gBAh6BtB,OAAO;iBACN,MAAM;mBACJ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;kBACvB,IAAI;YACV,MAAM;EA85Bf;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,GAAG,SAAS,CAElD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA0ED"}
+{"version":3,"file":"auto-register.d.ts","sourceRoot":"","sources":["../../src/services/auto-register.ts"],"names":[],"mappings":"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"}