From fff6a2f46bc5bce8fb40c74ca5f3befb97553a34 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Mon, 24 Aug 2026 02:20:39 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=A1=8C=E9=9D=A2?= =?UTF-8?q?=E5=A3=B3=E7=9B=B4=E6=8E=A5=E6=89=98=E7=AE=A1=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E5=AD=90=E8=BF=9B=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +- build.ps1 | 4 +- daemon/printserver.exe | Bin 59392 -> 0 bytes daemon/printserver.exe.config | 6 - daemon/printserver.xml | 12 -- services/setting.js | 116 +++++--------- utils/windowsService.js | 289 ---------------------------------- views/index_new.html | 21 +-- 8 files changed, 43 insertions(+), 410 deletions(-) delete mode 100644 daemon/printserver.exe delete mode 100644 daemon/printserver.exe.config delete mode 100644 daemon/printserver.xml delete mode 100644 utils/windowsService.js diff --git a/README.md b/README.md index 7327366..f06916e 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,6 @@ printServer 是一个面向 Windows 的本地打印服务应用。 - 业务服务,如打印机、设置、绑定 - views/ - 页面模板,目前主要是 index.html -- daemon/ - - 守护或服务相关配置文件 - 临时/ - 临时分析文档、测试脚本、临时日志的统一目录,可在任务结束后整体清理 @@ -65,8 +63,7 @@ npm run dev - WebSocket 服务按 method 路由到 services/ 下对应实例方法 示例: -- setting.register -> services/setting.js -- setting.unregister -> services/setting.js +- setting.info -> services/setting.js - printer.getWindowsPrinters -> services/printer.js ## 当前打包方向 diff --git a/build.ps1 b/build.ps1 index 35193e2..44bffdd 100644 --- a/build.ps1 +++ b/build.ps1 @@ -209,10 +209,8 @@ function Invoke-SignFile([string]$TargetPath, [string]$Label) { function Sign-AppArtifacts { $appExePath = Join-Path $root 'dist\win-unpacked\printServer.exe' - $serviceWrapperPath = Join-Path $root 'dist\win-unpacked\resources\daemon\printserver.exe' Invoke-SignFile -TargetPath $appExePath -Label 'app executable' - Invoke-SignFile -TargetPath $serviceWrapperPath -Label 'service wrapper' } function Sign-InstallerArtifacts { @@ -354,7 +352,7 @@ function Ensure-PackagedResources() { Copy-Item -Path $iconSourcePath -Destination $iconTargetPath -Force } - foreach ($dirName in @('daemon', 'frpc')) { + foreach ($dirName in @('frpc')) { $sourcePath = Join-Path $root $dirName $targetPath = Join-Path $resourcesDir $dirName diff --git a/daemon/printserver.exe b/daemon/printserver.exe deleted file mode 100644 index 507707a9c0ae81a296840ac0ded007b122a2f156..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59392 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 diff --git a/daemon/printserver.exe.config b/daemon/printserver.exe.config deleted file mode 100644 index 48f571c..0000000 --- a/daemon/printserver.exe.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/daemon/printserver.xml b/daemon/printserver.xml deleted file mode 100644 index d878566..0000000 --- a/daemon/printserver.xml +++ /dev/null @@ -1,12 +0,0 @@ - - printserver.exe - PrintServer - printServer backend service - D:\printServer\node_modules\electron\dist\electron.exe - D:\printServer - --service-runner - rotate - Automatic - 30sec - D:\printServer - diff --git a/services/setting.js b/services/setting.js index f5d5734..bd13d81 100644 --- a/services/setting.js +++ b/services/setting.js @@ -1,13 +1,9 @@ import service from '../core/BaseService.js'; import configUtil from '../utils/config.js'; -import { startService, uninstallService } from '../utils/windowsService.js'; - -function isServiceRunnerProcess() { - return process.argv.includes('--service-runner'); -} +import { isElectronRuntime } from '../utils/runtime.js'; function isManagedBackendRunnerProcess() { - return process.argv.includes('--backend-runner') || process.argv.includes('--service-runner'); + return process.argv.includes('--backend-runner'); } function scheduleCurrentProcessExit() { @@ -26,8 +22,6 @@ class SettingService extends service { super(); this.info = this.info.bind(this); this.unbind = this.unbind.bind(this); - this.register = this.register.bind(this); - this.unregister = this.unregister.bind(this); this.updatePorts = this.updatePorts.bind(this); this.restartBackend = this.restartBackend.bind(this); this.setToken = this.setToken.bind(this); @@ -43,7 +37,6 @@ class SettingService extends service { return { isBind: !!config.token, name: config.name || '', - isService: !!config.isService, wsPort: Number(config.wsPort) || 17301, recording: { isRecording: !!hik.isRecording, @@ -81,6 +74,7 @@ class SettingService extends service { const { app } = this; const targetWsPort = Number(data.wsPort) || Number(app.config?.wsPort) || 17301; + // 托管后端子进程(打包态):退出后由桌面壳 reconcile 循环重新拉起 if (isManagedBackendRunnerProcess()) { scheduleCurrentProcessExit(); return { @@ -91,6 +85,42 @@ class SettingService extends service { }; } + // Electron 主进程内嵌后端(开发模式):无法自我重启,重启整个桌面应用 + if (isElectronRuntime()) { + if (targetWsPort !== Number(app.config?.wsPort)) { + app.config.wsPort = targetWsPort; + configUtil.write(app.config); + } + try { + const electron = await import('electron'); + const electronApp = electron.app || electron.default?.app; + if (!electronApp || typeof electronApp.relaunch !== 'function') { + throw new Error('electron app 对象不可用'); + } + // 给 WS 响应留出时间,再重启整个应用 + setTimeout(() => { + try { + electronApp.relaunch(); + electronApp.exit(0); + } catch (error) { + console.error('[SettingService] 应用重启失败:', error); + } + }, 500); + return { + ok: true, + restarting: true, + wsPort: targetWsPort, + message: '应用正在重启,请稍候' + }; + } catch (error) { + return { + ok: false, + restarting: false, + message: `应用重启失败:${error.message}` + }; + } + } + if (!app || typeof app.restartBackendRuntime !== 'function') { return { ok: false, @@ -134,74 +164,8 @@ class SettingService extends service { return { ok: true, message: '解绑成功' }; } + // WebSocket 注册服务,切换为“系统服务管理后端”的状态(已弃用,系统服务功能已移除) - // WebSocket 注册服务,切换为“系统服务管理后端”的状态 - async register() { - const { config } = this; - const previousIsService = !!config.isService; - - try { - await startService(); - } catch (error) { - config.isService = previousIsService; - configUtil.write(config); - this.app.isService = previousIsService; - return { - ok: false, - message: `系统服务注册失败:${error.message}`, - isService: previousIsService - }; - } - - config.isService = true; - configUtil.write(config); - this.app.isService = true; - - if (!isServiceRunnerProcess()) { - scheduleCurrentProcessExit(); - } - - return { - ok: true, - message: isServiceRunnerProcess() - ? '服务模式已启用' - : '服务模式已启用,当前前台后端将退出,由系统服务接管', - isService: true - }; - } - - // WebSocket 注销服务,切回“桌面壳直接拉起后端”的状态 - async unregister() { - const { config } = this; - const previousIsService = !!config.isService; - - if (!isServiceRunnerProcess()) { - try { - await uninstallService(); - } catch (error) { - config.isService = previousIsService; - configUtil.write(config); - this.app.isService = previousIsService; - return { - ok: false, - message: `系统服务注销失败:${error.message}`, - isService: previousIsService - }; - } - } - - config.isService = false; - configUtil.write(config); - this.app.isService = false; - - return { - ok: true, - message: isServiceRunnerProcess() - ? '服务模式已关闭,桌面壳会切回本地后端启动并清理系统服务' - : '服务已注销,后端将恢复为桌面壳直接启动', - isService: false - }; - } async setToken(data) { const { config } = this; config.token = data.token; diff --git a/utils/windowsService.js b/utils/windowsService.js deleted file mode 100644 index 7422d80..0000000 --- a/utils/windowsService.js +++ /dev/null @@ -1,289 +0,0 @@ -import fs from 'fs'; -import path from 'path'; -import { execFile } from 'child_process'; -import { promisify } from 'util'; -import { getProjectRoot, getResourcePath, isElectronRuntime, isPackagedElectron } from './runtime.js'; - -const execFileAsync = promisify(execFile); -const SERVICE_NAME = 'PrintServer'; -const SERVICE_ID = 'printserver.exe'; - -function assertWindows() { - if (process.platform !== 'win32') { - throw new Error('Windows 服务能力仅支持 Windows 环境'); - } -} - -function escapeXml(value) { - return String(value) - .replace(/&/g, '&') - .replace(//g, '>') - .replace(/"/g, '"') - .replace(/'/g, '''); -} - -function getServiceWrapperPath() { - return getResourcePath('daemon', SERVICE_ID); -} - -function getServiceXmlPath() { - return getResourcePath('daemon', 'printserver.xml'); -} - -function getServiceWorkingDirectory() { - if (isPackagedElectron()) { - return path.dirname(process.execPath); - } - - return getProjectRoot(); -} - -function getServiceCommandDefinition() { - if (isElectronRuntime()) { - return { - executable: process.execPath, - arguments: isPackagedElectron() ? ['--service-runner'] : [getProjectRoot(), '--service-runner'], - workingDirectory: getServiceWorkingDirectory() - }; - } - - return { - executable: process.execPath, - arguments: [path.join(getProjectRoot(), 'index.js')], - workingDirectory: getProjectRoot() - }; -} - -function buildServiceXml() { - const command = getServiceCommandDefinition(); - const argumentLines = command.arguments - .map((argument) => ` ${escapeXml(argument)}`) - .join('\n'); - - return [ - '', - ` ${SERVICE_ID}`, - ` ${SERVICE_NAME}`, - ' printServer backend service', - ` ${escapeXml(command.executable)}`, - argumentLines, - ' rotate', - ' Automatic', - ' 30sec', - ` ${escapeXml(command.workingDirectory)}`, - '', - '' - ].join('\n'); -} - -export function ensureServiceDefinition() { - assertWindows(); - - const wrapperPath = getServiceWrapperPath(); - const xmlPath = getServiceXmlPath(); - - if (!fs.existsSync(wrapperPath)) { - throw new Error(`服务包装器不存在: ${wrapperPath}`); - } - - const expectedXml = buildServiceXml(); - const currentXml = fs.existsSync(xmlPath) ? fs.readFileSync(xmlPath, 'utf8') : ''; - if (currentXml !== expectedXml) { - fs.writeFileSync(xmlPath, expectedXml, 'utf8'); - } - - return { - name: SERVICE_NAME, - id: SERVICE_ID, - wrapperPath, - xmlPath, - workingDirectory: getServiceWorkingDirectory() - }; -} - -function isAccessDeniedErrorMessage(message) { - if (!message) { - return false; - } - - return /AccessDenied|拒绝访问|\b0x5\b|\berror\s*5\b/i.test(String(message)); -} - -function isServiceAlreadyExistsErrorMessage(message) { - if (!message) { - return false; - } - - return /already exists|已存在|Service with id\s*'?.+?'?\s*already exists/i.test(String(message)); -} - -function isServiceAlreadyRunningErrorMessage(message) { - if (!message) { - return false; - } - - return /already started|already running|已启动|正在运行/i.test(String(message)); -} - -async function runWrapperCommandElevated(command, metadata) { - const escapedWrapperPath = metadata.wrapperPath.replace(/'/g, "''"); - const escapedCommand = String(command).replace(/'/g, "''"); - const escapedWorkingDirectory = path.dirname(metadata.wrapperPath).replace(/'/g, "''"); - const psCommand = [ - "$proc = Start-Process", - `-FilePath '${escapedWrapperPath}'`, - `-ArgumentList '${escapedCommand}'`, - `-WorkingDirectory '${escapedWorkingDirectory}'`, - '-Verb RunAs', - '-WindowStyle Hidden', - '-PassThru', - '-Wait;', - 'exit $proc.ExitCode' - ].join(' '); - - try { - await execFileAsync('powershell.exe', ['-NoProfile', '-Command', psCommand], { - windowsHide: true - }); - } catch (error) { - const stdout = (error.stdout || '').trim(); - const stderr = (error.stderr || '').trim(); - const details = [stdout, stderr, error.message].filter(Boolean).join(' | '); - throw new Error(`提权执行服务命令 ${command} 失败: ${details}`); - } - - return { - stdout: '', - stderr: '' - }; -} - -async function runWrapperCommand(command, options = {}) { - const { - allowElevation = true - } = options; - const metadata = ensureServiceDefinition(); - - try { - const result = await execFileAsync(metadata.wrapperPath, [command], { - cwd: path.dirname(metadata.wrapperPath), - windowsHide: true - }); - - return { - stdout: (result.stdout || '').trim(), - stderr: (result.stderr || '').trim() - }; - } catch (error) { - const stdout = (error.stdout || '').trim(); - const stderr = (error.stderr || '').trim(); - const details = [stdout, stderr, error.message].filter(Boolean).join(' | '); - - if (allowElevation && command !== 'status' && isAccessDeniedErrorMessage(details)) { - try { - return await runWrapperCommandElevated(command, metadata); - } catch (elevatedError) { - throw new Error(`执行服务命令 ${command} 失败: ${details} | ${elevatedError.message}`); - } - } - - throw new Error(`执行服务命令 ${command} 失败: ${details}`); - } -} - -function parseServiceStatus(rawStatus) { - const normalized = (rawStatus || '').trim(); - - if (!normalized || normalized === 'NonExistent') { - return { - installed: false, - running: false, - rawStatus: normalized || 'NonExistent' - }; - } - - return { - installed: true, - running: /started|running|active/i.test(normalized), - rawStatus: normalized - }; -} - -export async function getServiceStatus(options = {}) { - const { stdout } = await runWrapperCommand('status', options); - return parseServiceStatus(stdout); -} - -export async function ensureServiceInstalled(options = {}) { - let status = null; - try { - status = await getServiceStatus(options); - } catch (error) { - status = null; - } - - if (status && status.installed) { - return status; - } - - try { - await runWrapperCommand('install', options); - } catch (error) { - if (!isServiceAlreadyExistsErrorMessage(error.message)) { - throw error; - } - } - - try { - return await getServiceStatus(options); - } catch (error) { - // 某些机器上 status 读取异常,但 install 已提示“已存在”。此时按已安装处理。 - return { - installed: true, - running: false, - rawStatus: 'Existing' - }; - } -} - -export async function startService(options = {}) { - const status = await ensureServiceInstalled(options); - if (status.running) { - return status; - } - - try { - await runWrapperCommand('start', options); - } catch (error) { - if (!isServiceAlreadyRunningErrorMessage(error.message)) { - throw error; - } - } - - return getServiceStatus(options); -} - -export async function stopService(options = {}) { - const status = await getServiceStatus(options); - if (!status.installed || !status.running) { - return status; - } - - await runWrapperCommand('stop', options); - return getServiceStatus(options); -} - -export async function uninstallService(options = {}) { - const status = await getServiceStatus(options); - if (!status.installed) { - return status; - } - - if (status.running) { - await runWrapperCommand('stop', options); - } - - await runWrapperCommand('uninstall', options); - return getServiceStatus(options); -} \ No newline at end of file diff --git a/views/index_new.html b/views/index_new.html index 7849cce..dd85b1f 100644 --- a/views/index_new.html +++ b/views/index_new.html @@ -227,10 +227,6 @@ 本地服务: {{ wsStatus[wsClientStatus].title }} -
- 服务注册: - {{ isServices ? '已注册' : '未注册' }} -
服务器连接: {{ wsStatus[wsServerStatus].title }} @@ -350,8 +346,7 @@ new Vue({ 'disconnected': { title: '未连接', color: 'red' }, 'connected': { title: '已连接', color: 'green' }, 'error': { title: '连接错误', color: 'red' }, - }, - isServices: false + } }, methods: { loadComponents() { @@ -387,20 +382,6 @@ new Vue({ } }); }, - register() { - wsSendWithCallback('setting.register', {}, (data) => { - if (data.success) { - this.isServices = data.result || ''; - } - }); - }, - unregister() { - wsSendWithCallback('setting.unregister', {}, (data) => { - if (data.success) { - this.isServices = data.result || ''; - } - }); - }, isBind() { wsSendWithCallback('setting.info', {}, (data) => { if (data.success) {