From 9ebe3d0dc44ceeb8d6c6c7421730d158b1e4f2d2 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Tue, 25 Aug 2026 15:00:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(frpc):=20=E9=9D=9E=E5=BD=95=E5=88=B6?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E7=A9=BF=E9=80=8F=EF=BC=8C=E4=BB=85=E5=BD=95=E5=88=B6=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=8C=89=E9=85=8D=E7=BD=AE=E6=8B=89=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- services/frpc.js | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 545d2ef..1f4005b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "printserver", - "version": "1.0.33", + "version": "1.0.34", "main": "electron/main.cjs", "scripts": { "start": "node index.js", diff --git a/services/frpc.js b/services/frpc.js index c98fa5f..097ade1 100644 --- a/services/frpc.js +++ b/services/frpc.js @@ -47,21 +47,25 @@ class FrpcService extends service { } /** - * 应用启动时自动拉起(如果 config.frpc.enabled 为 true,或录制模式下自动启用) + * 应用启动时自动拉起(仅录制模式:enabled 或配置了 serverAddr 才启用; + * 非录制服务器不自动穿透,即使历史配置残留 enabled=true) */ _autoStart() { const cfg = this.config.frpc || {}; - // 录制模式 + 有 serverAddr 配置 → 自动启用(无论 enabled 字段) - const shouldAutoStart = cfg.enabled || (isRecordingMode(this.config) && cfg.serverAddr); + const recording = isRecordingMode(this.config); + const shouldAutoStart = recording && (!!cfg.enabled || !!cfg.serverAddr); if (shouldAutoStart) { _logFile('[Frpc] 自动启动 frpc (enabled=%s, recording=%s)', - !!cfg.enabled, isRecordingMode(this.config)); + !!cfg.enabled, recording); if (!cfg.enabled) { // 补写 enabled 标记,避免后续 updateConfig 判定混乱 cfg.enabled = true; this.config.frpc = cfg; } this._startFrpc(); + } else { + _logFile('[Frpc] 跳过自动启动 (enabled=%s, recording=%s)', + !!cfg.enabled, recording); } }