onebots 1.0.7 → 1.1.0

package/lib/routes/terminal.js

@@ -0,0 +1,164 @@
+import * as pty from "@karinjs/node-pty";
+import { existsSync, readFileSync } from "fs";
+/** SSE 心跳间隔（毫秒） */
+const SSE_HEARTBEAT_INTERVAL_MS = 30000;
+/** 终端重启延迟（毫秒） */
+const TERMINAL_RESTART_DELAY_MS = 500;
+/**
+ * Register terminal and log-streaming endpoints.
+ *
+ *  WS  /api/terminal  — interactive PTY terminal via WebSocket
+ *  SSE /api/logs      — real-time log stream (stdout / stderr interception)
+ */
+export function registerTerminalRoutes(app, router) {
+    const expectedAccessToken = (app.config.access_token?.trim()
+        || process.env.ONEBOTS_ACCESS_TOKEN?.trim()
+        || undefined);
+    /** Extract a Bearer token or ?access_token from an http.IncomingMessage. */
+    const getTokenFromRequest = (request) => {
+        const authHeader = request.headers.authorization;
+        if (authHeader && typeof authHeader === 'string') {
+            const match = authHeader.match(/^Bearer\s+(.+)$/i);
+            return match ? match[1] : authHeader;
+        }
+        try {
+            const url = new URL(request.url || '/', 'http://localhost');
+            return url.searchParams.get('access_token') || undefined;
+        }
+        catch {
+            return undefined;
+        }
+    };
+    /* ── PTY 终端 WebSocket ────────────────────────────────────── */
+    const terminalWs = router.ws("/api/terminal");
+    terminalWs.on("connection", (client, request) => {
+        const token = getTokenFromRequest(request);
+        const valid = !!token && (expectedAccessToken
+            ? token === expectedAccessToken
+            : app.tokenManager.validateToken(token).valid);
+        if (!valid) {
+            client.close(1008, "Unauthorized");
+            return;
+        }
+        // 创建 PTY 终端实例（如果不存在）
+        if (!app.ptyTerminal) {
+            const shell = process.platform === 'win32' ? 'powershell.exe' : 'bash';
+            app.ptyTerminal = pty.spawn(shell, [], {
+                name: "xterm-color",
+                cols: 80,
+                rows: 30,
+                cwd: process.env.HOME,
+                env: process.env,
+            });
+            // 监听 PTY 输出
+            app.ptyTerminal.onData((data) => {
+                // 广播到所有连接的客户端
+                app.terminalClients.forEach((c) => {
+                    try {
+                        c.send(JSON.stringify({ type: 'output', data }));
+                    }
+                    catch (e) {
+                        app.terminalClients.delete(c);
+                    }
+                });
+            });
+            // 监听 PTY 退出
+            app.ptyTerminal.onExit(() => {
+                app.ptyTerminal = null;
+                app.terminalClients.forEach((c) => {
+                    try {
+                        c.send(JSON.stringify({ type: 'exit' }));
+                    }
+                    catch {
+                        // 客户端可能已断开，将在后续连接清理中移除
+                    }
+                });
+                app.terminalClients.clear();
+            });
+        }
+        // 添加到客户端列表
+        app.terminalClients.add(client);
+        // 监听客户端消息（用户输入）
+        client.on("message", (msg) => {
+            try {
+                const payload = JSON.parse(msg.toString());
+                if (payload.type === 'input' && app.ptyTerminal) {
+                    app.ptyTerminal.write(payload.data);
+                }
+                else if (payload.type === 'resize' && app.ptyTerminal) {
+                    app.ptyTerminal.resize(payload.cols, payload.rows);
+                }
+                else if (payload.type === 'restart') {
+                    // 通知所有客户端
+                    app.terminalClients.forEach((c) => {
+                        try {
+                            c.send(JSON.stringify({ type: 'output', data: '\r\n\x1b[33m[服务即将重启]\x1b[0m' }));
+                        }
+                        catch {
+                            // 客户端可能已断开，忽略
+                        }
+                    });
+                    setTimeout(() => process.exit(100), TERMINAL_RESTART_DELAY_MS);
+                }
+            }
+            catch (e) {
+                app.logger.error('终端消息处理失败:', e);
+            }
+        });
+        // 监听客户端断开
+        client.on("close", () => {
+            app.terminalClients.delete(client);
+            // 如果没有客户端了，关闭 PTY
+            if (app.terminalClients.size === 0 && app.ptyTerminal) {
+                app.ptyTerminal.kill();
+                app.ptyTerminal = null;
+            }
+        });
+    });
+    /* ── 日志流 SSE ───────────────────────────────────────────── */
+    router.get("/api/logs", (ctx) => {
+        ctx.request.socket.setTimeout(0);
+        ctx.req.socket.setNoDelay(true);
+        ctx.req.socket.setKeepAlive(true);
+        ctx.set({
+            'Content-Type': 'text/event-stream',
+            'Cache-Control': 'no-cache',
+            'Connection': 'keep-alive',
+            'Access-Control-Allow-Origin': '*',
+            'Access-Control-Allow-Headers': 'Content-Type',
+        });
+        ctx.status = 200;
+        ctx.respond = false;
+        app.logClients.add(ctx.res);
+        // 发送缓存日志到客户端
+        try {
+            if (existsSync(app.logCacheFile)) {
+                const cachedLogs = readFileSync(app.logCacheFile, 'utf-8');
+                if (cachedLogs) {
+                    // 将历史日志的 \n 也替换为 \r\n
+                    const terminalLogs = cachedLogs.replace(/\n/g, '\r\n');
+                    ctx.res.write(`data: ${JSON.stringify({ message: terminalLogs })}\n\n`);
+                }
+            }
+        }
+        catch (error) {
+            app.logger.error('读取日志缓存失败:', error);
+        }
+        // 定时发送心跳
+        const heartbeat = setInterval(() => {
+            try {
+                ctx.res.write(': heartbeat\n\n');
+            }
+            catch (error) {
+                clearInterval(heartbeat);
+                app.logClients.delete(ctx.res);
+            }
+        }, SSE_HEARTBEAT_INTERVAL_MS);
+        // 监听连接关闭
+        ctx.req.on('close', () => {
+            clearInterval(heartbeat);
+            app.logClients.delete(ctx.res);
+        });
+    });
+}
+//# sourceMappingURL=terminal.js.map

package/lib/routes/verification.d.ts

@@ -0,0 +1,17 @@
+import type { Router } from "@onebots/core";
+import type { App } from "../app.js";
+/**
+ * Register verification-related routes for adapter login flows (device lock, SMS, etc.).
+ *
+ * Routes:
+ *  GET  /api/verification/stream       — SSE endpoint; pushes verification events to the web UI
+ *  GET  /api/verification/pending      — returns pending verification requests
+ *  POST /api/verification/request-sms  — ask the adapter to send an SMS code
+ *  POST /api/verification/submit       — submit a completed verification (slider, SMS, …)
+ *
+ * Verification-event broadcasting is wired by the App class lifecycle hooks
+ * (onAdapterCreated / the adapter subscription loop) — this module only
+ * handles the HTTP / SSE endpoints.
+ */
+export declare function registerVerificationRoutes(app: App, router: Router): void;
+//# sourceMappingURL=verification.d.ts.map

package/lib/routes/verification.js

@@ -0,0 +1,116 @@
+/**
+ * Register verification-related routes for adapter login flows (device lock, SMS, etc.).
+ *
+ * Routes:
+ *  GET  /api/verification/stream       — SSE endpoint; pushes verification events to the web UI
+ *  GET  /api/verification/pending      — returns pending verification requests
+ *  POST /api/verification/request-sms  — ask the adapter to send an SMS code
+ *  POST /api/verification/submit       — submit a completed verification (slider, SMS, …)
+ *
+ * Verification-event broadcasting is wired by the App class lifecycle hooks
+ * (onAdapterCreated / the adapter subscription loop) — this module only
+ * handles the HTTP / SSE endpoints.
+ */
+export function registerVerificationRoutes(app, router) {
+    // 验证流 SSE 端点（登录验证事件推送到 Web）
+    router.get("/api/verification/stream", (ctx) => {
+        ctx.request.socket.setTimeout(0);
+        ctx.req.socket.setNoDelay(true);
+        ctx.req.socket.setKeepAlive(true);
+        ctx.set({
+            'Content-Type': 'text/event-stream',
+            'Cache-Control': 'no-cache',
+            'Connection': 'keep-alive',
+            'Access-Control-Allow-Origin': '*',
+            'Access-Control-Allow-Headers': 'Content-Type',
+        });
+        ctx.status = 200;
+        ctx.respond = false;
+        app.verificationClients.add(ctx.res);
+        const heartbeat = setInterval(() => {
+            try {
+                ctx.res.write(': heartbeat\n\n');
+            }
+            catch (error) {
+                clearInterval(heartbeat);
+                app.verificationClients.delete(ctx.res);
+            }
+        }, 30000);
+        ctx.req.on('close', () => {
+            clearInterval(heartbeat);
+            app.verificationClients.delete(ctx.res);
+        });
+    });
+    // 待处理验证列表（Web 打开页面时拉取，避免离线期间错过验证）
+    router.get("/api/verification/pending", (ctx) => {
+        ctx.body = app.getPendingVerificationList();
+    });
+    // 请求发送短信验证码（设备锁带手机号时，用户选短信验证前调用）
+    router.post("/api/verification/request-sms", async (ctx) => {
+        try {
+            const body = ctx.request.body || {};
+            const platform = String(body.platform ?? '');
+            const account_id = String(body.account_id ?? '');
+            if (!platform || !account_id) {
+                ctx.status = 400;
+                ctx.body = { success: false, message: '缺少 platform 或 account_id' };
+                return;
+            }
+            const adapter = app.adapters.get(platform);
+            if (!adapter) {
+                ctx.status = 404;
+                ctx.body = { success: false, message: `适配器 ${platform} 不存在` };
+                return;
+            }
+            const requestSms = adapter.requestSmsCode;
+            if (typeof requestSms !== 'function') {
+                ctx.status = 501;
+                ctx.body = { success: false, message: `适配器 ${platform} 不支持请求短信验证码` };
+                return;
+            }
+            await Promise.resolve(requestSms.call(adapter, account_id));
+            ctx.body = { success: true };
+        }
+        catch (e) {
+            const err = e;
+            ctx.status = 500;
+            ctx.body = { success: false, message: err?.message ?? '请求失败' };
+        }
+    });
+    // 验证提交接口（Web 完成滑块/短信等后提交）
+    router.post("/api/verification/submit", async (ctx) => {
+        try {
+            const body = ctx.request.body || {};
+            const platform = String(body.platform ?? '');
+            const account_id = String(body.account_id ?? '');
+            const type = String(body.type ?? '');
+            const data = body.data && typeof body.data === 'object' ? body.data : {};
+            if (!platform || !account_id || !type) {
+                ctx.status = 400;
+                ctx.body = { success: false, message: '缺少 platform、account_id 或 type' };
+                return;
+            }
+            const adapter = app.adapters.get(platform);
+            if (!adapter) {
+                ctx.status = 404;
+                ctx.body = { success: false, message: `适配器 ${platform} 不存在` };
+                return;
+            }
+            const submit = adapter.submitVerification;
+            if (typeof submit !== 'function') {
+                ctx.status = 501;
+                ctx.body = { success: false, message: `适配器 ${platform} 不支持 Web 验证提交` };
+                return;
+            }
+            await Promise.resolve(submit.call(adapter, account_id, type, data));
+            app.pendingVerifications.delete(`${platform}:${account_id}:${type}`);
+            ctx.body = { success: true };
+        }
+        catch (e) {
+            const err = e;
+            ctx.status = 500;
+            ctx.body = { success: false, message: err?.message ?? '提交失败' };
+        }
+    });
+}
+//# sourceMappingURL=verification.js.map

package/lib/service-manager.js

@@ -3,8 +3,16 @@
  */
 import * as fs from "fs";
 import * as path from "path";
-import { execSync } from "child_process";
+import * as os from "os";
+import { execFileSync } from "child_process";
 const SERVICE_NAME = "onebots-gateway";
+function getHomeDir() {
+    const home = process.env.HOME || os.homedir();
+    if (!home) {
+        throw new Error("无法确定用户主目录（HOME 环境变量未设置且 os.homedir() 返回空）");
+    }
+    return home;
+}
 function getConfigDir(configPath) {
     return path.dirname(path.resolve(process.cwd(), configPath));
 }
@@ -15,7 +23,7 @@ export async function serviceInstall(configPath) {
     const binPath = process.argv[1];
     const startCmd = `"${nodePath}" "${binPath}" gateway start -c "${resolvedConfig}"`;
     if (process.platform === "darwin") {
-        const plistPath = path.join(process.env.HOME, "Library", "LaunchAgents", `com.onebots.${SERVICE_NAME}.plist`);
+        const plistPath = path.join(getHomeDir(), "Library", "LaunchAgents", `com.onebots.${SERVICE_NAME}.plist`);
         const plist = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -52,7 +60,7 @@ export async function serviceInstall(configPath) {
         return;
     }
     if (process.platform === "linux") {
-        const unitDir = path.join(process.env.HOME, ".config", "systemd", "user");
+        const unitDir = path.join(getHomeDir(), ".config", "systemd", "user");
         if (!fs.existsSync(unitDir))
             fs.mkdirSync(unitDir, { recursive: true });
         const unitPath = path.join(unitDir, `${SERVICE_NAME}.service`);
@@ -73,7 +81,7 @@ WantedBy=default.target
         fs.writeFileSync(unitPath, unit, "utf8");
         console.log("已安装 systemd 用户服务:", unitPath);
         try {
-            execSync("systemctl --user daemon-reload", { stdio: "inherit" });
+            execFileSync("systemctl", ["--user", "daemon-reload"], { stdio: "inherit" });
             console.log("启用: systemctl --user enable --now " + SERVICE_NAME);
         }
         catch {
@@ -97,12 +105,12 @@ WantedBy=default.target
 }
 export async function serviceUninstall() {
     if (process.platform === "darwin") {
-        const plistPath = path.join(process.env.HOME, "Library", "LaunchAgents", `com.onebots.${SERVICE_NAME}.plist`);
+        const plistPath = path.join(getHomeDir(), "Library", "LaunchAgents", `com.onebots.${SERVICE_NAME}.plist`);
         try {
-            execSync(`launchctl unload "${plistPath}"`, { stdio: "inherit" });
+            execFileSync("launchctl", ["unload", plistPath], { stdio: "inherit" });
         }
         catch {
-            // ignore
+            // launchctl unload 失败（服务可能未加载），忽略
         }
         if (fs.existsSync(plistPath)) {
             fs.unlinkSync(plistPath);
@@ -111,22 +119,22 @@ export async function serviceUninstall() {
         return;
     }
     if (process.platform === "linux") {
-        const unitPath = path.join(process.env.HOME, ".config", "systemd", "user", `${SERVICE_NAME}.service`);
+        const unitPath = path.join(getHomeDir(), ".config", "systemd", "user", `${SERVICE_NAME}.service`);
         try {
-            execSync("systemctl --user disable " + SERVICE_NAME, { stdio: "inherit" });
+            execFileSync("systemctl", ["--user", "disable", SERVICE_NAME], { stdio: "inherit" });
         }
         catch {
-            // ignore
+            // systemctl disable 失败（服务可能未启用），忽略
         }
         if (fs.existsSync(unitPath)) {
             fs.unlinkSync(unitPath);
             console.log("已卸载 systemd 服务");
         }
         try {
-            execSync("systemctl --user daemon-reload", { stdio: "inherit" });
+            execFileSync("systemctl", ["--user", "daemon-reload"], { stdio: "inherit" });
         }
         catch {
-            // ignore
+            // daemon-reload 失败，忽略
         }
         return;
     }
@@ -141,8 +149,9 @@ export async function serviceUninstall() {
 export async function serviceStatus() {
     if (process.platform === "darwin") {
         try {
-            const out = execSync("launchctl list | grep onebots", { encoding: "utf8" });
-            console.log(out || "未找到 onebots 服务");
+            const out = execFileSync("launchctl", ["list"], { encoding: "utf8" });
+            const lines = out.split("\n").filter(line => line.includes("onebots"));
+            console.log(lines.length > 0 ? lines.join("\n") : "未找到 onebots 服务");
         }
         catch {
             console.log("未找到 onebots 服务或未加载");
@@ -151,10 +160,10 @@ export async function serviceStatus() {
     }
     if (process.platform === "linux") {
         try {
-            execSync("systemctl --user status " + SERVICE_NAME, { stdio: "inherit" });
+            execFileSync("systemctl", ["--user", "status", SERVICE_NAME], { stdio: "inherit" });
         }
-        catch (e) {
-            const code = e?.status;
+        catch (error) {
+            const code = error?.status;
             if (code !== 0)
                 console.log("服务未运行或未安装");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "OneBots 整合适配器和协议，提供HTTP/WebSocket服务",
   "type": "module",
   "main": "lib/index.js",
@@ -42,7 +42,7 @@
     "@karinjs/node-pty": "^1.1.3",
     "commander": "^14.0.3",
     "koa-static": "^5.0.0",
-    "@onebots/core": "1.0.6",
+    "@onebots/core": "1.1.0",
     "@onebots/web": "1.0.7"
   },
   "repository": {