@myassis/gateway 1.0.41 → 1.0.42

package/dist/services/ServiceManager.js

@@ -64,39 +64,148 @@ async function queryServiceWindows() {
         return { installed: false, running: false };
     }
 }
+// ─── 用户级进程管理 ─────────────────────────────────────────
+/**
+ * 获取 Gateway 可执行文件路径
+ */
+function getGatewayExePath() {
+    if (isPackagedExe()) {
+        return process.execPath;
+    }
+    const nodeExec = getNodeExec();
+    return nodeExec;
+}
+/**
+ * 检查 Gateway 进程是否在运行
+ */
+function isGatewayRunning() {
+    const pid = getStoredPid();
+    if (!pid)
+        return false;
+    try {
+        // Windows: kill signal 0 探测进程是否存在
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 从 PID 文件读取存储的 PID
+ */
+function getStoredPid() {
+    try {
+        if (!fs_1.default.existsSync(GATEWAY_PID_FILE))
+            return null;
+        const pid = parseInt(fs_1.default.readFileSync(GATEWAY_PID_FILE, 'utf8').trim(), 10);
+        return isNaN(pid) ? null : pid;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * 停止 Gateway 用户进程（优雅终止）
+ */
+async function stopGatewayProcess() {
+    const pid = getStoredPid();
+    if (!pid)
+        return;
+    try {
+        process.kill(pid, 'SIGTERM');
+        await new Promise(r => setTimeout(r, 2000));
+    }
+    catch { /* ignore */ }
+    // 强制终止（如果还没退出）
+    try {
+        process.kill(pid, 'SIGKILL');
+    }
+    catch { /* ignore */ }
+    try {
+        fs_1.default.unlinkSync(GATEWAY_PID_FILE);
+    }
+    catch { /* ignore */ }
+}
+/**
+ * 写入 Gateway 启动脚本（用户级，不弹出窗口）
+ */
+function writeGatewayLauncherScript(exePath, scriptPath, workDir) {
+    // 写入 BOM + UTF-8 内容
+    const content = [
+        "$ErrorActionPreference = 'Stop'",
+        "$exe = '" + exePath.replace(/\\/g, '\\\\') + "'",
+        "$workDir = '" + workDir.replace(/\\/g, '\\\\') + "'",
+        "$pidFile = '" + GATEWAY_PID_FILE.replace(/\\/g, '\\\\') + "'",
+        "$port = 19090",
+        "$svcPort = 19091",
+        "",
+        "# 防止重复启动（检查端口）",
+        "$listener = [System.Net.Sockets.TcpListener]::Start($port)",
+        "$listener.Stop()",
+        "",
+        "# 启动 Gateway 进程（后台、无窗口）",
+        "$psi = New-Object System.Diagnostics.ProcessStartInfo",
+        "$psi.FileName = $exe",
+        "$psi.WorkingDirectory = $workDir",
+        "$psi.Arguments = '--gateway --port ' + $port + ' --service-port ' + $svcPort",
+        "$psi.UseShellExecute = $false",
+        "$psi.RedirectStandardOutput = $true",
+        "$psi.RedirectStandardError = $true",
+        "$psi.CreateNoWindow = $true",
+        "$psi.Environment['NODE_ENV'] = 'production'",
+        "$proc = [System.Diagnostics.Process]::Start($psi)",
+        "if ($proc) {",
+        "  $proc.Id.ToString() | Out-File -FilePath $pidFile -Encoding UTF8",
+        "  $proc.WaitForExit()",
+        "}",
+    ].join('\r\n');
+    fs_1.default.writeFileSync(scriptPath, '\uFEFF' + content, 'utf8');
+}
+/**
+ * 检查 Run key 是否已注册
+ */
+function isRegisteredInRunKey() {
+    // 通过 PowerShell 读取 HKCU Run key
+    try {
+        const { execSync } = require('child_process');
+        const result = execSync(`powershell -NoProfile -Command "if (Test-Path 'HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Run') { (Get-ItemProperty 'HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Run').PSObject.Properties.Name -contains '${exports.SERVICE_NAME}' } else { $false }"`, { timeout: 5000, windowsHide: true });
+        return result.toString().trim() === 'True';
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 写入注册表 Run key（开机自启）
+ */
+async function registerRunKey(scriptPath) {
+    const regCmd = `powershell -NoProfile -Command "Set-ItemProperty -Path 'HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Run' -Name '${exports.SERVICE_NAME}' -Value '\"${scriptPath}\"' -Type String"`;
+    await execAsync(regCmd, { timeout: 10000, windowsHide: true });
+}
+/**
+ * 删除注册表 Run key
+ */
+async function unregisterRunKey() {
+    try {
+        const regCmd = `powershell -NoProfile -Command "Remove-ItemProperty -Path 'HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Run' -Name '${exports.SERVICE_NAME}' -ErrorAction SilentlyContinue"`;
+        await execAsync(regCmd, { timeout: 10000, windowsHide: true });
+    }
+    catch { /* ignore */ }
+}
+// ─── Windows 用户级实现 ─────────────────────────────────────
 async function installWindows() {
-    const isPkg = isPackagedExe();
-    const script = getServiceScript();
-    const exe = getNodeExec();
-    const workDir = isPkg ? path_1.default.dirname(exe) : path_1.default.dirname(script);
-    logger.info(`isPkg=${isPkg}, exe=${exe}, script=${script}, workDir=${workDir}`);
+    const exe = getGatewayExePath();
+    const workDir = path_1.default.dirname(exe);
+    logger.info(`installWindows: exe=${exe}, workDir=${workDir}`);
     const { installed } = await queryServiceWindows();
     if (installed)
         await uninstallWindows();
-    const nssmPath = getNssmPath();
-    const useNssm = !!nssmPath && fs_1.default.existsSync(nssmPath);
     try {
-        if (useNssm) {
-            if (isPkg) {
-                await execAsync(`"${nssmPath}" install ${exports.SERVICE_NAME} "${exe}"`, { timeout: 15000, cwd: workDir });
-            }
-            else {
-                await execAsync(`"${nssmPath}" install ${exports.SERVICE_NAME} "${exe}" "${script}"`, { timeout: 15000, cwd: workDir });
-            }
-            await execAsync(`"${nssmPath}" set ${exports.SERVICE_NAME} AppDirectory "${workDir}"`, { timeout: 10000 });
-            await execAsync(`"${nssmPath}" set ${exports.SERVICE_NAME} DisplayName "${exports.SERVICE_DISPLAY_NAME}"`, { timeout: 10000 });
-            await execAsync(`"${nssmPath}" set ${exports.SERVICE_NAME} Start SERVICE_AUTO_START`, { timeout: 10000 });
-        }
-        else {
-            if (isPkg) {
-                await execAsync(`sc.exe create ${exports.SERVICE_NAME} binPath= "\\"${exe}\\"" DisplayName= "${exports.SERVICE_DISPLAY_NAME}" start= auto`, { timeout: 15000 });
-            }
-            else {
-                await execAsync(`sc.exe create ${exports.SERVICE_NAME} binPath= "\\"${exe}\\" \\"${script}\\"" DisplayName= "${exports.SERVICE_DISPLAY_NAME}" start= auto`, { timeout: 15000 });
-            }
-        }
+        writeGatewayLauncherScript(exe, GATEWAY_LAUNCHER_FILE, workDir);
+        await registerRunKey(GATEWAY_LAUNCHER_FILE);
         await startService();
-        return { success: true, message: '服务安装并启动成功' };
+        return { success: true, message: 'Gateway 安装并启动成功（用户级进程）' };
     }
     catch (err) {
         return { success: false, message: `安装失败: ${err.message}` };
@@ -105,48 +214,48 @@ async function installWindows() {
 async function uninstallWindows() {
     try {
         await stopService();
-        const nssmPath = getNssmPath();
-        if (nssmPath && fs_1.default.existsSync(nssmPath)) {
-            await execAsync(`"${nssmPath}" remove ${exports.SERVICE_NAME} confirm`, { timeout: 10000 });
-        }
-        else {
-            await execAsync(`sc.exe delete ${exports.SERVICE_NAME}`, { timeout: 10000 });
+        await unregisterRunKey();
+        try {
+            fs_1.default.unlinkSync(GATEWAY_PID_FILE);
         }
-        return { success: true, message: '服务卸载成功' };
+        catch { /* ignore */ }
+        return { success: true, message: 'Gateway 已卸载（用户级进程）' };
     }
     catch (err) {
         return { success: false, message: `卸载失败: ${err.message}` };
     }
 }
 async function startServiceWindows() {
+    if (isGatewayRunning()) {
+        return { success: true, message: 'Gateway 已在运行' };
+    }
     try {
-        await execAsync(`sc.exe start ${exports.SERVICE_NAME}`, { timeout: 10000 });
-        return { success: true, message: '服务启动成功' };
+        const exe = getGatewayExePath();
+        const workDir = path_1.default.dirname(exe);
+        if (!fs_1.default.existsSync(GATEWAY_LAUNCHER_FILE)) {
+            writeGatewayLauncherScript(exe, GATEWAY_LAUNCHER_FILE, workDir);
+        }
+        await execAsync(`powershell -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "${GATEWAY_LAUNCHER_FILE}"`, { timeout: 5000, windowsHide: true });
+        const maxWait = 5000;
+        const start = Date.now();
+        while (!isGatewayRunning() && Date.now() - start < maxWait) {
+            await new Promise(r => setTimeout(r, 500));
+        }
+        if (isGatewayRunning()) {
+            return { success: true, message: 'Gateway 启动成功' };
+        }
+        return { success: false, message: 'Gateway 进程未能启动，请检查日志' };
     }
     catch (err) {
         return { success: false, message: `启动失败: ${err.message}` };
     }
 }
 async function restartServiceWindows() {
-    const nssmPath = getNssmPath();
-    // 无 nssm 时需要用户手动更新
-    if (!fs_1.default.existsSync(nssmPath)) {
-        const info = await getServiceInfo();
-        if (info.installed) {
-            return {
-                success: false,
-                message: '检测到您尚未安装 nssm，无法自动重启服务。请手动执行以下步骤更新 Gateway：\n' +
-                    '1. 在桌面上停止 Gateway 服务（系统托盘 → 右键 → 退出）\n' +
-                    '2. 运行 `npm install -g @myassis/gateway@latest`\n' +
-                    '3. 重新启动 Gateway 服务\n\n' +
-                    '如需自动重启功能，请从 https://nssm.cc/download 下载 nssm 并放置到 Gateway 同目录下',
-            };
-        }
-        // 服务未安装时，可直接更新
-    }
     try {
-        await execAsync(`"${nssmPath}" restart ${exports.SERVICE_NAME}`, { timeout: 15000 });
-        return { success: true, message: '服务重启成功' };
+        await stopService();
+        await new Promise(r => setTimeout(r, 1000));
+        await startService();
+        return { success: true, message: 'Gateway 重启成功' };
     }
     catch (err) {
         return { success: false, message: `重启失败: ${err.message}` };
@@ -154,8 +263,8 @@ async function restartServiceWindows() {
 }
 async function stopServiceWindows() {
     try {
-        await execAsync(`sc.exe stop ${exports.SERVICE_NAME}`, { timeout: 10000 });
-        return { success: true, message: '服务停止成功' };
+        await stopGatewayProcess();
+        return { success: true, message: 'Gateway 已停止' };
     }
     catch (err) {
         return { success: false, message: `停止失败: ${err.message}` };
@@ -190,21 +299,21 @@ async function installLinux() {
         if (installed)
             await stopService();
         const execStart = isPkg ? exe : `${exe} ${script}`;
-        const unitContent = `[Unit]
-Description=${exports.SERVICE_DISPLAY_NAME}
-After=network.target
-
-[Service]
-Type=simple
-User=${process.env.USER || 'root'}
-WorkingDirectory=${workDir}
-ExecStart=${execStart}
-Restart=always
-RestartSec=5
-Environment=NODE_ENV=production
-
-[Install]
-WantedBy=multi-user.target
+        const unitContent = `[Unit]
+Description=${exports.SERVICE_DISPLAY_NAME}
+After=network.target
+
+[Service]
+Type=simple
+User=${process.env.USER || 'root'}
+WorkingDirectory=${workDir}
+ExecStart=${execStart}
+Restart=always
+RestartSec=5
+Environment=NODE_ENV=production
+
+[Install]
+WantedBy=multi-user.target
 `;
         await fs_1.default.promises.writeFile('/tmp/myassis-gateway.service', unitContent, 'utf8');
         await execAsync('cp /tmp/myassis-gateway.service /etc/systemd/system/myassis-gateway.service', { timeout: 10000 });
@@ -560,6 +669,10 @@ exports.updateService = updateService;
 const HELPER_PORT = 19630;
 /** Helper 超时时间（毫秒） */
 const HELPER_TIMEOUT_MS = 60000;
+/** Gateway PID 文件路径（用户级进程跟踪） */
+const GATEWAY_PID_FILE = path_1.default.join(os_1.default.tmpdir(), 'myassis-gateway-pid.txt');
+/** Gateway 启动脚本路径 */
+const GATEWAY_LAUNCHER_FILE = path_1.default.join(os_1.default.tmpdir(), 'myassis-gateway-launcher.ps1');
 /** 当前活跃的 Helper 进程 */
 let helperProcess = null;
 /** Helper 连接 socket */
@@ -642,7 +755,19 @@ async function execAsUser(command, cwd) {
     if (!helperReady || !helperSocket) {
         const started = await spawnHelperAsUser();
         if (!started) {
-            return { stdout: '', stderr: 'Failed to start helper process', exitCode: -1 };
+            // Helper 启动失败，降级到直接 exec（exit=-2 表示降级执行）
+            logger.warn('Helper spawn failed, falling back to direct exec (exit=-2 = fallback used)');
+            try {
+                const { stdout, stderr } = await execAsync(command, {
+                    cwd: cwd || os_1.default.homedir(),
+                    timeout: HELPER_TIMEOUT_MS,
+                    windowsHide: true,
+                });
+                return { stdout, stderr, exitCode: 0 };
+            }
+            catch (err) {
+                return { stdout: '', stderr: err?.message || String(err), exitCode: -2 };
+            }
         }
     }
     const id = newCmdId();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myassis/gateway",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "description": "我的助手 Gateway Service - 本地 AI 网关服务，支持认证、WebSocket 实时通信和任务调度",
   "main": "dist/index.js",
   "bin": {