From da67b1546524c18685bbf7407f5ab0a965816c8d Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 6 Jun 2026 03:46:02 +0800 Subject: [PATCH] 1 --- config.json | 4 +- core/main.js | 23 +- daemon/printserver.xml | 5 +- electron/main.cjs | 331 +++++++++++++++++++++-- electron/preload.cjs | 48 ++++ package.json | 3 +- services/bind.js | 13 +- services/setting.js | 10 +- views/index.html | 596 +++++++++++++++++++---------------------- 9 files changed, 660 insertions(+), 373 deletions(-) create mode 100644 electron/preload.cjs diff --git a/config.json b/config.json index 41c3034..0b7949e 100644 --- a/config.json +++ b/config.json @@ -10,7 +10,7 @@ "reconnectInterval": 3000 }, "refreshTokenExpireTime": 0, - "tokenExpireTime": 1780469814666, - "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3YXJlaG91c2UiOiIxMDAwMDAiLCJjb21wdXRlcklkIjoiMjgiLCJpYXQiOjE3ODA0NjYyMTQsImV4cCI6MTc4MDQ2OTgxNH0.kR9RugjGPeSLijWn4Enq93Hf2Pn63DToxS6C82ElzxE", + "tokenExpireTime": 1780684406126, + "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3YXJlaG91c2UiOiIxMDAwMDAiLCJjb21wdXRlcklkIjoiMjgiLCJpYXQiOjE3ODA2ODA4MDYsImV4cCI6MTc4MDY4NDQwNn0.O3Kzn4dVqkzSY8YT6nN_RpulznGPq4_LY6SY6o30cGk", "refreshToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3YXJlaG91c2UiOiIxMDAwMDAiLCJjb21wdXRlcklkIjoiMjgiLCJpYXQiOjE3Nzg2MTAwNDMsImV4cCI6NDkzNDM3MDA0M30.JkOtPdc6VA5IDxy6E6Pqk5nffmE5VagoXtXYr7cNLZc" } \ No newline at end of file diff --git a/core/main.js b/core/main.js index fc8f7e9..106db13 100644 --- a/core/main.js +++ b/core/main.js @@ -41,6 +41,7 @@ class Main extends EventEmitter { reconnectInterval: this.config.remoteWs.reconnectInterval || 3000 }, this); this.wsServer = new WSServer(this.config.wsPort, this); + console.log('[Main] 本地 WS 服务已启动,端口:', this.config.wsPort); this._initWmiPrinterMonitor(); this.app.on('printerWmiStatusChange', (data) => { //console.log('打印机状态变化事件触发,数据:', data); @@ -112,35 +113,15 @@ class Main extends EventEmitter { await this._loadServices(); } - restartLocalWsServer(newPort) { - const port = Number(newPort); - if (!Number.isInteger(port) || port < 1 || port > 65535) { - throw new Error('wsPort 无效'); - } - - if (this.wsServer) { - this.wsServer.close(); - } - - this.config.wsPort = port; - this.wsServer = new WSServer(port, this); - return { - wsPort: port - }; - } - async restartBackendRuntime(options = {}) { const wsPort = Number(options.wsPort) || Number(this.config.wsPort) || 3001; - if (!Number.isInteger(wsPort) || wsPort < 1 || wsPort > 65535) { - throw new Error('wsPort 无效'); - } // 托管后端进程由桌面壳监管,当前进程不直接执行本地热重启。 if (hasProcessArg('--backend-runner') || hasProcessArg('--service-runner')) { return { wsPort }; } - this.restartLocalWsServer(wsPort); + this.config.wsPort = wsPort; if (this.wsClient) { this.wsClient.close(); diff --git a/daemon/printserver.xml b/daemon/printserver.xml index 229e25f..d878566 100644 --- a/daemon/printserver.xml +++ b/daemon/printserver.xml @@ -2,8 +2,9 @@ printserver.exe PrintServer printServer backend service - C:\Program Files\nodejs\node.exe - D:\printServer\index.js + D:\printServer\node_modules\electron\dist\electron.exe + D:\printServer + --service-runner rotate Automatic 30sec diff --git a/electron/main.cjs b/electron/main.cjs index 2f432eb..b2607f7 100644 --- a/electron/main.cjs +++ b/electron/main.cjs @@ -1,4 +1,4 @@ -const { app, BrowserWindow, Menu, Tray, nativeImage } = require('electron'); +const { app, BrowserWindow, Menu, Tray, nativeImage, ipcMain } = require('electron'); const path = require('path'); const net = require('net'); const { spawn } = require('child_process'); @@ -9,6 +9,9 @@ let tray = null; let isQuitting = false; let serverStarted = false; let backendProcess = null; +let backendApp = null; // 开发模式:后端 Main 实例 +let backendWS = null; // 打包模式:后端 WS 桥接 +let backendWSCleanup = []; // 事件取消函数列表 let reconcileTimer = null; let reconcilePromise = null; @@ -38,7 +41,9 @@ async function startLocalServer() { serverStarted = true; const entryFile = path.join(__dirname, '..', 'index.js'); - await import(pathToFileURL(entryFile).href); + const indexModule = await import(pathToFileURL(entryFile).href); + backendApp = indexModule.default; // 获取 Main 单例 + console.log('[Main] 后端已加载,services:', Object.keys(backendApp.services || {})); } function hasArg(flag) { @@ -83,12 +88,50 @@ function isPortReachable(port) { } async function isBackendReady() { - const [httpReady, wsReady] = await Promise.all([ - isPortReachable(3000), - isPortReachable(3001) - ]); + return isPortReachable(3001); +} - return httpReady && wsReady; +// ─── 打包模式:WS 桥接(连接子进程的本地 WS 服务) ─── +let _bridgeConnectPromise = null; +async function ensureBackendBridge() { + if (!app.isPackaged || backendApp) return; + if (backendWS && backendWS.readyState === 1) return; + if (_bridgeConnectPromise) return _bridgeConnectPromise; + + _bridgeConnectPromise = (async function () { + var config = await readRuntimeConfig(); + var wsPort = config.wsPort || 3001; + var mod = await import('ws'); + var WebSocketImpl = mod.default || mod.WebSocket || require('ws'); + + return new Promise(function (resolve, reject) { + var ws = new WebSocketImpl('ws://127.0.0.1:' + wsPort); + var connected = false; + ws.on('open', function () { + connected = true; + backendWS = ws; + console.log('[Bridge] 已连接后端 WS, port:', wsPort); + ws.on('message', function (msg) { + try { + var data = JSON.parse(msg.toString()); + if (mainWindow && !mainWindow.isDestroyed()) { + mainWindow.webContents.send('service:event', data); + } + } catch (e) { /* ignore */ } + }); + ws.on('close', function () { backendWS = null; _bridgeConnectPromise = null; }); + ws.on('error', function () { backendWS = null; _bridgeConnectPromise = null; }); + resolve(); + }); + ws.on('error', function (err) { if (!connected) { _bridgeConnectPromise = null; reject(err); } }); + setTimeout(function () { if (!connected) { _bridgeConnectPromise = null; reject(new Error('Bridge timeout')); } }, 5000); + }); + })(); + + try { await _bridgeConnectPromise; } catch (e) { + console.error('[Bridge] 连接失败:', e.message); + _bridgeConnectPromise = null; + } } async function readRuntimeConfig() { @@ -96,6 +139,256 @@ async function readRuntimeConfig() { return configUtil.read(); } +// ────────── IPC 处理 ────────── + +/** + * 调用后端服务方法(开发模式直接调用,打包模式通过内部 WS 桥接) + */ +async function handleServiceCall(method, data, allowRetry) { + // 特殊方法:获取远端 WSClient 当前状态 + if (method === 'wsClient.getStatus') { + if (backendApp && backendApp.wsClient) { + return { success: true, method, result: { status: backendApp.wsClient.status, url: backendApp.wsClient.url } }; + } + // 打包模式:通过桥接获取 + if (backendWS && backendWS.readyState === 1) { + var _ws = backendWS; + return new Promise(function (resolve) { + var mid = method + '_' + Date.now() + '_' + Math.random().toString(36).slice(2); + var settled = false; + var handler = function (raw) { + if (settled) return; + try { + var resp = JSON.parse(raw.toString()); + if (resp.method === method || resp._msgId === mid) { + settled = true; + if (_ws && _ws.removeListener) _ws.removeListener('message', handler); + resolve(resp); + } + } catch (e) {} + }; + _ws.on('message', handler); + _ws.send(JSON.stringify({ method: method, data: data, _msgId: mid })); + setTimeout(function () { + if (settled) return; + settled = true; + if (_ws && _ws.removeListener) _ws.removeListener('message', handler); + resolve({ success: false, method: method, message: 'Bridge timeout' }); + }, 10000); + }); + } + return { success: false, method, message: 'WSClient not ready' }; + } + + // 开发模式:进程内直接调用 + if (backendApp && backendApp.services) { + var methodPath = method.split('.'); + var fn = backendApp.services; + for (var i = 0; i < methodPath.length; i++) { + fn = fn[methodPath[i]]; + if (!fn) break; + } + if (typeof fn === 'function') { + try { + var result = await fn(data); + return { success: true, method: method, result: result }; + } catch (err) { + return { success: false, method: method, message: err.message }; + } + } + return { success: false, method: method, message: '服务方法未找到: ' + method }; + } + + // 打包模式:通过 WS 桥接转发到子进程 + if (backendWS && backendWS.readyState === 1) { + var _ws2 = backendWS; + return new Promise(function (resolve) { + var mid = method + '_' + Date.now() + '_' + Math.random().toString(36).slice(2); + var settled = false; + var handler = function (raw) { + if (settled) return; + try { + var resp = JSON.parse(raw.toString()); + if (resp.method === method || resp._msgId === mid) { + settled = true; + if (_ws2 && _ws2.removeListener) _ws2.removeListener('message', handler); + resolve(resp); + } + } catch (e) {} + }; + _ws2.on('message', handler); + _ws2.send(JSON.stringify({ method: method, data: data, _msgId: mid })); + setTimeout(function () { + if (settled) return; + settled = true; + if (_ws2 && _ws2.removeListener) _ws2.removeListener('message', handler); + resolve({ success: false, method: method, message: 'Bridge timeout' }); + }, 10000); + }); + } + + // 打包模式:桥接未就绪,尝试重新建立连接(仅重试一次,防止无限递归) + if (allowRetry !== false && app.isPackaged && !backendApp) { + await ensureBackendBridge(); + if (backendWS && backendWS.readyState === 1) { + return handleServiceCall(method, data, false); + } + } + + return { success: false, method: method, message: '后端尚未就绪' }; +} + +ipcMain.handle('service:call', async (_event, method, data) => { + return handleServiceCall(method, data, true); +}); + +/** 获取后端连接状态 */ +ipcMain.handle('service:getBackendStatus', () => { + if (backendApp) return 'connected'; + if (backendWS && backendWS.readyState === 1) return 'connected'; + return 'connecting'; +}); + +/** + * 注册后端事件 → 渲染进程转发(替代 WSServer.onConnection / _bindAppEvents) + */ +function setupEventForwarding() { + if (!backendApp) return; + cleanupEventForwarding(); + + const forward = (eventMethod) => (data) => { + if (mainWindow && !mainWindow.isDestroyed()) { + mainWindow.webContents.send('service:event', { + success: true, + method: eventMethod, + result: data + }); + } + }; + + // 与 WSServer._bindAppEvents 相同的事件集 + backendApp.on('printerComponentStatusChange', forward('printerComponent.statusChange')); + + // wsClient 状态变化改用防抖转发,避免短暂断开/重连导致 UI 闪烁 + let wsStatusDebounceTimer = null; + const forwardWsStatus = (data) => { + if (wsStatusDebounceTimer) { + clearTimeout(wsStatusDebounceTimer); + wsStatusDebounceTimer = null; + } + // connected 立即转发;disconnected/error 延迟 2 秒确认 + const delayMs = data.status === 'connected' ? 0 : 2000; + wsStatusDebounceTimer = setTimeout(() => { + wsStatusDebounceTimer = null; + if (mainWindow && !mainWindow.isDestroyed()) { + mainWindow.webContents.send('service:event', { + success: true, + method: 'wsClient.statusChange', + result: data + }); + } + }, delayMs); + }; + backendApp.on('wsClientStatusChange', forwardWsStatus); + + // 推送当前 WSClient 状态(弥补监听注册前已连接的时序缺口) + if (backendApp.wsClient?.status) { + forwardWsStatus({ status: backendApp.wsClient.status, url: backendApp.wsClient.url }); + } + + backendApp.on('printerList', forward('printer.getWindowsPrinters')); + + const generateCodeHandler = (code) => { + console.log('[IPC] generateCode 事件转发, randomCode:', code?.randomCode); + if (mainWindow && !mainWindow.isDestroyed()) { + mainWindow.webContents.send('service:event', { + success: true, + method: 'bind.generateCode', + result: code.randomCode + }); + console.log('[IPC] service:event 已发送 -> bind.generateCode'); + } else { + console.log('[IPC] mainWindow 不可用, 无法转发'); + } + // 码过期前 5 秒自动刷新 + if (code.createdAt && code.expiresIn) { + var refreshAt = code.createdAt + code.expiresIn * 1000 - 5000; + var delay = Math.max(0, refreshAt - Date.now()); + if (backendApp._codeRefreshTimer) clearTimeout(backendApp._codeRefreshTimer); + var remaining = Math.round(delay / 1000); + console.log('[IPC] 绑定码刷新定时器已设置, ' + remaining + ' 秒后触发'); + backendApp._codeRefreshTimer = setTimeout(function () { + console.log('[IPC] 绑定码刷新定时器触发'); + console.log('[IPC] hasToken:', !!backendApp.config?.token, 'wsClientStatus:', backendApp.wsClient?.status); + if (!backendApp.config?.token && backendApp.wsClient?.status === 'connected') { + console.log('[IPC] 请求新绑定码'); + backendApp.wsClient.send({ method: 'bind.generateCode', data: {} }); + } else { + console.log('[IPC] 跳过刷新: token=' + !!backendApp.config?.token + ' ws=' + backendApp.wsClient?.status); + } + }, delay); + } + }; + backendApp.on('generateCode', generateCodeHandler); + + backendApp.on('updateDownloadProgress', forward('update.downloadProgress')); + + // ─── 主动请求绑定码(替代 WSServer.onConnection),仅首次未绑定时请求一次 ─── + let bindCodeRequested = false; + const requestBindCode = () => { + if (bindCodeRequested || backendApp.config?.token) return; + bindCodeRequested = true; + + if (backendApp.randomCode && + backendApp.randomCode.createdAt + backendApp.randomCode.expiresIn * 1000 > Date.now() && + backendApp.randomCode.randomCode) { + backendApp.emit('generateCode', backendApp.randomCode); + } else if (backendApp.wsClient?.status === 'connected') { + backendApp.randomCode = null; + backendApp.wsClient.send({ method: 'bind.generateCode', data: {} }); + } + }; + + // 监听 WSClient 连接事件,连接后尝试请求绑定码 + const wsStatusHandler = (data) => { + if (data.status === 'connected') { + requestBindCode(); + } + }; + backendApp.on('wsClientStatusChange', wsStatusHandler); + + // 如果 WSClient 已连接,立即尝试 + if (backendApp.wsClient?.status === 'connected') { + requestBindCode(); + } + + backendWSCleanup = [ + () => backendApp.off('printerComponentStatusChange'), + () => { + if (wsStatusDebounceTimer) { clearTimeout(wsStatusDebounceTimer); wsStatusDebounceTimer = null; } + backendApp.off('wsClientStatusChange', forwardWsStatus); + }, + () => backendApp.off('printerList'), + () => backendApp.off('generateCode', generateCodeHandler), + () => backendApp.off('updateDownloadProgress'), + () => backendApp.off('wsClientStatusChange', wsStatusHandler) + ]; + + console.log('[Main] 事件转发已注册'); +} + +function cleanupEventForwarding() { + for (const cleanup of backendWSCleanup) { + try { cleanup(); } catch (_) { /* ignore */ } + } + backendWSCleanup = []; + if (backendApp && backendApp._codeRefreshTimer) { + clearTimeout(backendApp._codeRefreshTimer); + backendApp._codeRefreshTimer = null; + } + console.log('[Main] 事件转发已清理'); +} + async function getWindowsServiceHelper() { return loadWorkspaceModule('utils/windowsService.js'); } @@ -209,6 +502,10 @@ function startReconcileLoop() { reconcileBackendState().catch((error) => { console.error('[Runtime] 状态同步失败:', error); }); + // 同时确保 WS 桥接保持连接 + ensureBackendBridge().catch((error) => { + console.error('[Bridge] 周期重连失败:', error && error.message); + }); }, RECONCILE_INTERVAL_MS); } @@ -239,18 +536,9 @@ function loadMainPage() { return; } - readRuntimeConfig() - .then((config) => { - const wsPort = Number(config?.wsPort) || 3001; - return mainWindow.loadFile(MAIN_FILE, { - query: { - wsPort: String(wsPort) - } - }); - }) - .catch(() => { - setTimeout(loadMainPage, 1000); - }); + mainWindow.loadFile(MAIN_FILE).catch(() => { + setTimeout(loadMainPage, 1000); + }); } function createMainWindow() { @@ -265,7 +553,8 @@ function createMainWindow() { icon: ICON_ICO_PATH, webPreferences: { contextIsolation: true, - nodeIntegration: false + nodeIntegration: false, + preload: path.join(__dirname, 'preload.cjs') } }); @@ -321,6 +610,8 @@ async function bootstrap() { await reconcileBackendState(); startReconcileLoop(); + await ensureBackendBridge(); // 打包模式:建立与后端子进程的 WS 桥接 + setupEventForwarding(); createMainWindow(); createTray(); } diff --git a/electron/preload.cjs b/electron/preload.cjs new file mode 100644 index 0000000..219fe93 --- /dev/null +++ b/electron/preload.cjs @@ -0,0 +1,48 @@ +const { contextBridge, ipcRenderer } = require('electron'); + +/** + * 预加载脚本 — 通过 contextBridge 暴露安全的 IPC API 到渲染进程。 + * 渲染进程通过 window.printServerAPI 调用,不再直接连接 WebSocket。 + */ +contextBridge.exposeInMainWorld('printServerAPI', { + /** + * 调用后端服务方法(替代 wsSendWithCallback) + * @param {string} method 服务方法路径,如 'printer.getWindowsPrinters' + * @param {any} data 请求参数 + * @returns {Promise<{success: boolean, method: string, result: any}>} + */ + callService: (method, data) => + ipcRenderer.invoke('service:call', method, data), + + /** + * 监听服务端推送事件(替代 wsOn) + * @param {string} method 事件名 + * @param {Function} callback 接收 {success, method, result} + * @returns {Function} 取消订阅函数 + */ + onEvent: (method, callback) => { + const handler = (_event, payload) => { + if (payload.method === method) callback(payload); + }; + ipcRenderer.on('service:event', handler); + return () => ipcRenderer.removeListener('service:event', handler); + }, + + /** + * 获取后端连接状态 + * @returns {Promise} 'connected' | 'disconnected' + */ + getBackendStatus: () => + ipcRenderer.invoke('service:getBackendStatus'), + + /** + * 监听后端连接状态变化(替代 setWsClientStatus 回调) + * @param {Function} callback + * @returns {Function} 取消订阅函数 + */ + onBackendStatusChange: (callback) => { + const handler = (_event, status) => callback(status); + ipcRenderer.on('backend:status', handler); + return () => ipcRenderer.removeListener('backend:status', handler); + } +}); diff --git a/package.json b/package.json index c008f14..aaa38a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "printserver", - "version": "1.0.10", + "version": "1.0.14", "main": "electron/main.cjs", "scripts": { "start": "node index.js", @@ -44,6 +44,7 @@ "views/**/*", "index.js", "package.json", + "!electron/assets/icon-gray.svg", "!config.json", "!临时/**/*", "!开发日志/**/*", diff --git a/services/bind.js b/services/bind.js index 3be0cd5..a546065 100644 --- a/services/bind.js +++ b/services/bind.js @@ -8,14 +8,23 @@ const configPath = path.join(__dirname, '../config.json'); class BindService extends service { constructor() { super(); - this.generateCode = this.generateCode.bind(this); // 确保上下文绑定 - this.tokenInfo = this.tokenInfo.bind(this); // 确保上下文绑定 + this.generateCode = this.generateCode.bind(this); + this.tokenInfo = this.tokenInfo.bind(this); + this.getCurrentCode = this.getCurrentCode.bind(this); } generateCode(data) { const {app} = this; this.app.randomCode = data; this.app.emit('generateCode', data); } + // 获取当前缓存的随机码(渲染进程挂载后调用,弥补 IPC 事件可能早于监听注册的时序问题) + getCurrentCode() { + const { app } = this; + if (app.randomCode && app.randomCode.createdAt + app.randomCode.expiresIn * 1000 > Date.now()) { + return app.randomCode.randomCode; + } + return null; + } tokenInfo(data) { const {app} = this; app.config.token = data.jwtToken; diff --git a/services/setting.js b/services/setting.js index 9d668a2..ed49d94 100644 --- a/services/setting.js +++ b/services/setting.js @@ -107,10 +107,14 @@ class SettingService extends service { } // 解绑(WebSocket/HTTP 通用,无 ctx 依赖) unbind() { - const { config } = this; + const { config, app } = this; config.token = ''; configUtil.write(config); - this.app.isBind = false; + app.isBind = false; + // 解绑后主动请求新绑定码 + if (app.wsClient?.status === 'connected') { + app.wsClient.send({ method: 'bind.generateCode', data: {} }); + } return { ok: true, message: '解绑成功' }; } @@ -194,7 +198,7 @@ class SettingService extends service { } async setInfo(data) { const { config, app } = this; - config.name = data.name; + config.name = data.computerInfo?.name || data.name || ''; console.log("设置打印台信息", data); app.info = data; configUtil.write(config); diff --git a/views/index.html b/views/index.html index af13f9c..ca76f9a 100644 --- a/views/index.html +++ b/views/index.html @@ -74,6 +74,7 @@ margin: 0; width: 100%; height: 100%; + overflow: hidden; } body { @@ -81,11 +82,15 @@ color: var(--text); background: linear-gradient(150deg, #f8fbff 0%, var(--bg) 72%); padding: 12px; + display: flex; + flex-direction: column; + box-sizing: border-box; } #app { width: 100%; - height: calc(100vh - 24px); + flex: 1; + min-height: 0; background: var(--panel); border: 1px solid var(--line); border-radius: 12px; @@ -537,7 +542,7 @@
- +
@@ -586,17 +591,7 @@
-
-

端口设置

-
- - - -
-
保存后会自动重启后端,并让页面重新连接到新的 WS 端口。
-
{{ saveMessage }}
- -
+

应用更新

当前版本:{{ updateState.currentVersion || '-' }} @@ -627,12 +622,7 @@ 本地服务:{{ wsStatus[wsClientStatus].title }}
-
- - 服务注册: - {{ isServices ? '已注册' : '未注册' }} - -
+
服务器连接:{{ wsStatus[wsServerStatus].title }} @@ -641,10 +631,11 @@ 打印服务绑定:{{ isBind ? '已绑定' : '未绑定' }}
- - + +
+