diff --git a/electron/main.cjs b/electron/main.cjs index d486d37..9d0abd9 100644 --- a/electron/main.cjs +++ b/electron/main.cjs @@ -17,13 +17,11 @@ let reconcilePromise = null; const MAIN_FILE = path.join(__dirname, '..', 'views', 'index.html'); const BACKEND_RUNNER_ARG = '--backend-runner'; -const SERVICE_RUNNER_ARG = '--service-runner'; const RECONCILE_INTERVAL_MS = 5000; const APP_TITLE = '打印电脑服务'; const ICON_ICO_PATH = path.join(__dirname, 'assets', 'printserver.ico'); const ICON_PNG_PATH = path.join(__dirname, 'assets', 'printserver-icon-256.png'); const TRAY_ICON_FALLBACK_DATA_URL = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAV0lEQVR4AWP4TwAw/P//PwMDA8P///8ZGRkYGBgY/v//z8DAwMDA8J8B4v///5kYGRkZGBj+////PwMDw38Ghv9kZGQYGBj+////PwPDfwYGhv8MDAwA0rQYV5vWJ2EAAAAASUVORK5CYII='; -const BACKGROUND_SERVICE_OPTIONS = { allowElevation: false }; function createTrayImage() { const icon = nativeImage.createFromPath(ICON_PNG_PATH); @@ -51,7 +49,7 @@ function hasArg(flag) { } function isHeadlessRunner() { - return hasArg(BACKEND_RUNNER_ARG) || hasArg(SERVICE_RUNNER_ARG); + return hasArg(BACKEND_RUNNER_ARG); } async function loadWorkspaceModule(relativePath) { @@ -59,12 +57,6 @@ async function loadWorkspaceModule(relativePath) { return import(pathToFileURL(filePath).href); } -function delay(ms) { - return new Promise((resolve) => { - setTimeout(resolve, ms); - }); -} - function isPortReachable(port) { return new Promise((resolve) => { const socket = net.createConnection({ host: '127.0.0.1', port }); @@ -106,6 +98,43 @@ async function isBackendReady() { // ─── 打包模式:WS 桥接(连接子进程的本地 WS 服务) ─── let _bridgeConnectPromise = null; +let _bridgeHeartbeat = null; // { pingTimer, pongTimer } + +function stopBridgeHeartbeat() { + if (!_bridgeHeartbeat) return; + if (_bridgeHeartbeat.pingTimer) clearInterval(_bridgeHeartbeat.pingTimer); + if (_bridgeHeartbeat.pongTimer) clearTimeout(_bridgeHeartbeat.pongTimer); + _bridgeHeartbeat = null; +} + +// 心跳:探测半开连接(休眠/唤醒后 TCP 已断但 readyState 仍为 1),超时则主动断开让周期循环重连 +function startBridgeHeartbeat(ws) { + stopBridgeHeartbeat(); + const state = { pingTimer: null, pongTimer: null }; + state.pingTimer = setInterval(function () { + if (ws.readyState !== 1) return; + try { ws.ping(); } catch (e) { return; } + state.pongTimer = setTimeout(function () { + console.error('[Bridge] 心跳无响应,主动断开重建连接'); + try { ws.terminate(); } catch (e) { /* ignore */ } + }, 10000); + }, 15000); + ws.on('pong', function () { + if (state.pongTimer) { clearTimeout(state.pongTimer); state.pongTimer = null; } + }); + _bridgeHeartbeat = state; +} + +// 响应超时后销毁当前桥接(可能半开),强制后续调用重建连接 +function invalidateBackendBridge() { + stopBridgeHeartbeat(); + if (backendWS) { + try { backendWS.terminate(); } catch (e) { /* ignore */ } + } + backendWS = null; + _bridgeConnectPromise = null; +} + async function ensureBackendBridge() { if (!app.isPackaged || backendApp) return; if (backendWS && backendWS.readyState === 1) return; @@ -143,12 +172,13 @@ async function ensureBackendBridge() { } } catch (e) { /* ignore */ } }); - ws.on('close', function () { backendWS = null; _bridgeConnectPromise = null; }); - ws.on('error', function () { backendWS = null; _bridgeConnectPromise = null; }); + ws.on('close', function () { stopBridgeHeartbeat(); backendWS = null; _bridgeConnectPromise = null; }); + ws.on('error', function () { stopBridgeHeartbeat(); backendWS = null; _bridgeConnectPromise = null; }); + startBridgeHeartbeat(ws); resolve(); }); ws.on('error', function (err) { if (!connected) { _bridgeConnectPromise = null; reject(err); } }); - setTimeout(function () { if (!connected) { _bridgeConnectPromise = null; reject(new Error('Bridge timeout')); } }, 5000); + setTimeout(function () { if (!connected) { _bridgeConnectPromise = null; reject(new Error('Bridge timeout')); } }, 15000); }); })(); @@ -184,7 +214,7 @@ async function handleServiceCall(method, data, allowRetry) { if (settled) return; try { var resp = JSON.parse(raw.toString()); - if (resp.method === method || resp._msgId === mid) { + if (resp._msgId === mid || resp._callId === mid) { settled = true; if (_ws && _ws.removeListener) _ws.removeListener('message', handler); resolve(resp); @@ -197,8 +227,10 @@ async function handleServiceCall(method, data, allowRetry) { if (settled) return; settled = true; if (_ws && _ws.removeListener) _ws.removeListener('message', handler); + console.error('[Bridge] 响应超时:', method); + invalidateBackendBridge(); resolve({ success: false, method: method, message: 'Bridge timeout' }); - }, 10000); + }, 30000); }); } return { success: false, method, message: 'WSClient not ready' }; @@ -233,7 +265,7 @@ async function handleServiceCall(method, data, allowRetry) { if (settled) return; try { var resp = JSON.parse(raw.toString()); - if (resp.method === method || resp._msgId === mid) { + if (resp._msgId === mid || resp._callId === mid) { settled = true; if (_ws2 && _ws2.removeListener) _ws2.removeListener('message', handler); resolve(resp); @@ -246,8 +278,10 @@ async function handleServiceCall(method, data, allowRetry) { if (settled) return; settled = true; if (_ws2 && _ws2.removeListener) _ws2.removeListener('message', handler); + console.error('[Bridge] 响应超时:', method); + invalidateBackendBridge(); resolve({ success: false, method: method, message: 'Bridge timeout' }); - }, 10000); + }, 30000); }); } @@ -652,10 +686,8 @@ function cleanupEventForwarding() { console.log('[Main] 事件转发已清理'); } -async function getWindowsServiceHelper() { - return loadWorkspaceModule('utils/windowsService.js'); -} - +// 注意:本函数必须保持同步(内部无 await),否则 spawn 收到的 args 会变成 Promise 对象, +// 子进程 argv 变成 "[object Promise]",isHeadlessRunner 判定失败,因单实例锁被壳持有而秒退。 function getManagedBackendArgs() { if (app.isPackaged) { return [BACKEND_RUNNER_ARG]; @@ -670,24 +702,28 @@ function startManagedBackend() { } backendProcess = spawn(process.execPath, getManagedBackendArgs(), { - stdio: 'ignore', + stdio: ['ignore', 'pipe', 'pipe'], windowsHide: true }); - backendProcess.once('exit', () => { - backendProcess = null; - }); -} - -async function stopManagedBackend() { - if (!backendProcess) { - return; + // 诊断:后端子进程输出落盘,便于排查拉起失败(stdio ignore 会丢弃崩溃信息) + try { + const fs = require('fs'); + const logPath = path.join('C:\\ProgramData\\printServer', 'backend-runner.log'); + const out = fs.createWriteStream(logPath, { flags: 'a' }); + out.write('\n===== backend spawn ' + new Date().toISOString() + ' args=' + JSON.stringify(getManagedBackendArgs()) + ' =====\n'); + backendProcess.stdout.pipe(out); + backendProcess.stderr.pipe(out); + backendProcess.once('exit', (code, sig) => { + try { + out.write('[exit] code=' + code + ' signal=' + sig + ' at=' + new Date().toISOString() + '\n'); + out.end(); + } catch (e) { /* ignore */ } + backendProcess = null; + }); + } catch (e) { + console.error('[Backend] 诊断日志初始化失败:', e && e.message); } - - const child = backendProcess; - backendProcess = null; - child.kill(); - await delay(800); } async function ensureDesiredBackendState() { @@ -696,49 +732,8 @@ async function ensureDesiredBackendState() { return; } - const config = await readRuntimeConfig(); - let backendReady = await isBackendReady(); - const serviceHelper = await getWindowsServiceHelper(); - - if (config.isService) { - try { - const status = await serviceHelper.ensureServiceInstalled(BACKGROUND_SERVICE_OPTIONS); - - // 仅在系统服务已接管时才停止本地后端,避免服务未运行时出现周期性停启抖动。 - if (status.running) { - if (backendProcess) { - await stopManagedBackend(); - backendReady = await isBackendReady(); - } - return; - } - - if (!backendReady) { - await serviceHelper.startService(BACKGROUND_SERVICE_OPTIONS); - const startedStatus = await serviceHelper.getServiceStatus(BACKGROUND_SERVICE_OPTIONS); - if (startedStatus.running && backendProcess) { - await stopManagedBackend(); - backendReady = await isBackendReady(); - } - } - - // 服务未运行但本地后端可用时,保持本地后端运行,避免 UI 持续断开重连。 - return; - } catch (error) { - console.error('[Runtime] 系统服务启动失败,回退到本地后端:', error); - } - } else { - try { - const status = await serviceHelper.getServiceStatus(BACKGROUND_SERVICE_OPTIONS); - if (status.installed) { - await serviceHelper.uninstallService(BACKGROUND_SERVICE_OPTIONS); - backendReady = await isBackendReady(); - } - } catch (error) { - console.error('[Runtime] 清理系统服务失败:', error); - } - } - + // 打包态:桌面壳直接托管本地后端子进程(系统服务功能已移除) + const backendReady = await isBackendReady(); if (!backendReady && !backendProcess) { startManagedBackend(); }