fix(frpc): 非录制模式不自动启动穿透,仅录制模式按配置拉起

This commit is contained in:
liufumingren 2026-08-25 15:00:03 +08:00
parent f17d8386a5
commit 9ebe3d0dc4
2 changed files with 9 additions and 5 deletions

View File

@ -1,6 +1,6 @@
{
"name": "printserver",
"version": "1.0.33",
"version": "1.0.34",
"main": "electron/main.cjs",
"scripts": {
"start": "node index.js",

View File

@ -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);
}
}