@myassis/gateway 1.0.73 → 1.0.75

package/dist/api/index.js

@@ -131,7 +131,7 @@ function skillHubRequest(path, options) {
 exports.authApi = {
     login: (data) => authRequest('/login', { method: 'POST', body: data, skipAuth: true }),
     register: (data) => authRequest('/register', { method: 'POST', body: data, skipAuth: true }),
-    logout: (token) => authRequest('/logout', { method: 'POST', body: {}, token }),
+    logout: (refreshToken, token) => authRequest('/logout', { method: 'POST', body: { refreshToken }, token }),
     refresh: (refreshToken) => authRequest('/refresh', { method: 'POST', body: { refreshToken }, skipAuth: true }),
     me: (token) => authRequest('/me', { token }),
     updateProfile: (data, token) => authRequest('/profile', { method: 'PUT', body: data, token }),
@@ -142,7 +142,6 @@ exports.authApi = {
 exports.skillsApi = {
     list: (token) => dataRequest('/skills?brief=true', { token }),
     get: (skillId, token) => dataRequest(`/skills/${skillId}`, { token }),
-    install: (data, token) => dataRequest('/skills', { method: 'POST', body: data, token }),
     create: (data, token) => dataRequest('/skills', { method: 'POST', body: data, token }),
     update: (skillId, data, token) => dataRequest(`/skills/${skillId}`, { method: 'PUT', body: data, token }),
     uninstall: (skillId, token) => dataRequest(`/skills/${skillId}`, { method: 'DELETE', token }),

package/dist/middleware/auth.js

@@ -5,11 +5,13 @@ exports.requireAuth = void 0;
  * 认证中间件
  * 从请求头 Authorization: Bearer <token> 解码 JWT，提取 userId
  * 同时保留原始 token 供路由转发给 Server
+ *
+ * 注：Gateway 不自行验证 JWT 签名，而是比对 authStore 中由 Server 下发并本地持久化的 token。
+ * 因此无需也不应持有 JWT_SECRET，避免密钥在末端多处散落。
  */
-const authStore_js_1 = require("../stores/authStore.js");
+const authStore_js_1 = require("@/stores/authStore.js");
 const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('middleware/auth');
-const JWT_SECRET = process.env.JWT_SECRET || 'your-secret-key-change-in-production';
 /**
  * 从请求头提取 Bearer token
  */

package/dist/routes/agent.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = require("express");
-const auth_js_1 = require("../middleware/auth.js");
-const index_js_1 = require("../api/index.js");
-const index_js_2 = require("../services/session/index.js");
-const AgentManager_js_1 = require("../services/agent/AgentManager.js");
-const AgentStore_js_1 = require("../services/agent/AgentStore.js");
+const auth_js_1 = require("@/middleware/auth.js");
+const index_js_1 = require("@/api/index.js");
+const index_js_2 = require("@/services/session/index.js");
+const AgentManager_js_1 = require("@/services/agent/AgentManager.js");
+const AgentStore_js_1 = require("@/services/agent/AgentStore.js");
 const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('AgentRoutes');
-const SessionStore_js_1 = require("../services/session/SessionStore.js");
+const SessionStore_js_1 = require("@/services/session/SessionStore.js");
 const router = (0, express_1.Router)();
 // 所有路由需要认证
 router.use(auth_js_1.requireAuth, (req, _res, next) => {

package/dist/routes/auth.js

@@ -135,23 +135,25 @@ router.post('/refresh', async (req, res) => {
         });
     }
 });
-// Logout - 清除本地存储
+// Logout - 通知 Server 失效 refreshToken，并清除当前用户的本地存储
 router.post('/logout', auth_js_1.requireAuth, async (req, res) => {
+    const token = req.token;
+    // 优先用客户端上报的 refreshToken，缺失时回退到 Gateway 本地持久化的那一个
+    const refreshToken = req.body?.refreshToken || index_js_2.authStore.getRefreshToken(req.userId) || undefined;
     try {
-        const { refreshToken } = req.body;
-        // 用 AsyncLocalStorage 将 token 注入 server 请求上下文
-        await (0, index_js_3.runWithToken)(req.token, async () => {
-            if (refreshToken) {
-                index_js_1.authApi.logout(req.token).catch(() => { });
-            }
-        });
-        index_js_2.authStore.clear();
-        res.json({ success: true });
+        if (refreshToken) {
+            // 用 AsyncLocalStorage 将 token 注入 server 请求上下文；
+            // 必须 await，否则请求可能在上下文退出后才发出
+            await (0, index_js_3.runWithToken)(token, () => index_js_1.authApi.logout(refreshToken, token));
+        }
     }
     catch (error) {
-        index_js_2.authStore.clear();
-        res.json({ success: true });
+        // 登出为 best-effort：服务端失败不能阻断本地清理
+        logger.warn('Logout: failed to revoke refreshToken on server:', error?.message);
     }
+    // 只移除当前用户：authMap 为多用户共享，clear() 会把其他人一起踢下线
+    index_js_2.authStore.removeByToken(token);
+    res.json({ success: true });
 });
 // Check authentication - 验证 token 有效性并获取用户信息
 router.get('/isAuth', auth_js_1.requireAuth, async (req, res) => {
@@ -186,7 +188,7 @@ router.post('/account/delete', auth_js_1.requireAuth, async (req, res) => {
         // 转发删除账号请求到 Server（带上 token）
         const response = await index_js_1.authApi.deleteAccount({ password }, req.token);
         if (response.success) {
-            index_js_2.authStore.clear();
+            index_js_2.authStore.removeByToken(req.token);
         }
         res.json(response);
     }

package/dist/routes/settings.js

@@ -96,7 +96,7 @@ router.delete('/account', auth_js_1.requireAuth, async (req, res) => {
     try {
         const result = await index_js_3.authApi.deleteAccount({ password: req.params.password }, req.token);
         if (result.success) {
-            index_js_2.authStore.clear();
+            index_js_2.authStore.removeByToken(req.token);
         }
         res.json(result);
     }

package/dist/routes/upload.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteFile = void 0;
 const express_1 = require("express");
 const multer_1 = __importDefault(require("multer"));
-const index_js_1 = require("../config/index.js");
-const auth_js_1 = require("../middleware/auth.js");
-const index_js_2 = require("../api/index.js");
+const index_js_1 = require("@/config/index.js");
+const auth_js_1 = require("@/middleware/auth.js");
+const index_js_2 = require("@/api/index.js");
 const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('UploadRoutes');
 const router = (0, express_1.Router)();

package/dist/services/TaskSchedulerService.js

@@ -11,7 +11,7 @@ const WebSocketService_js_1 = require("./WebSocketService.js");
 const index_js_1 = require("./session/index.js");
 const shared_1 = require("@myassis/shared");
 const dataService_js_1 = require("./dataService.js");
-const authStore_js_1 = require("../stores/authStore.js");
+const authStore_js_1 = require("@/stores/authStore.js");
 const logger = (0, shared_1.getLogger)('TaskSchedulerService');
 const EXPIRED_THRESHOLD = 60 * 60 * 1000; // 1小时
 const CHECK_INTERVAL = 60 * 1000; // 1分钟

package/dist/services/TaskService.js

@@ -10,7 +10,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskService = void 0;
-const index_js_1 = require("../stores/index.js");
+const index_js_1 = require("@/stores/index.js");
 const index_js_2 = require("../api/index.js");
 const LocalTaskService_js_1 = require("./LocalTaskService.js");
 const shared_1 = require("@myassis/shared");

package/dist/services/agent/AgentManager.js

@@ -7,9 +7,9 @@ exports.initAgentManager = exports.agentManagerMap = exports.AgentManager = void
 const uuid_1 = require("uuid");
 const Agent_js_1 = require("./Agent.js");
 const SessionManager_js_1 = require("../session/SessionManager.js");
-const authStore_js_1 = require("../../stores/authStore.js");
+const authStore_js_1 = require("@/stores/authStore.js");
 const shared_1 = require("@myassis/shared");
-const index_js_1 = __importDefault(require("../../config/index.js"));
+const index_js_1 = __importDefault(require("@/config/index.js"));
 const logger = (0, shared_1.getLogger)('AgentManager');
 /**
  * AgentManager - Business logic layer

package/dist/services/dataService.js

@@ -53,14 +53,18 @@ exports.authService = {
         return response;
     },
     // 登出
-    logout: async (token) => {
-        try {
-            await index_js_1.authApi.logout(token);
-        }
-        catch (e) {
-            // 忽略错误
+    logout: async (token, refreshToken) => {
+        const userId = index_js_2.authStore.getUserId(token);
+        const revokeToken = refreshToken || (userId ? index_js_2.authStore.getRefreshToken(userId) : null);
+        if (revokeToken) {
+            try {
+                await index_js_1.authApi.logout(revokeToken, token);
+            }
+            catch (e) {
+                // 登出为 best-effort，服务端失败不阻断本地清理
+            }
         }
-        index_js_2.authStore.clear();
+        index_js_2.authStore.removeByToken(token);
         return { success: true };
     },
     // 获取当前用户
@@ -92,30 +96,9 @@ exports.authService = {
 exports.skillsService = {
     list: async (token) => await index_js_1.skillsApi.list(token),
     get: (skillId, token) => index_js_1.skillsApi.get(skillId, token),
-    install: async (skillHubId, token) => {
-        // 1. 从技能库获取技能详情
-        const hubResult = await index_js_1.skillHubApi.get(skillHubId, token);
-        if (!hubResult.success || !hubResult.data) {
-            return { success: false, error: '获取技能详情失败' };
-        }
-        const hub = hubResult.data;
-        // 2. 创建用户技能记录
-        const skillData = {
-            name: hub.name,
-            description: hub.description || '',
-            content: hub.content || '',
-            icon: hub.icon,
-            templateId: skillHubId,
-            isActive: true,
-            apiKeyRequired: hub.apiKeyRequired || false,
-        };
-        const response = await index_js_1.skillsApi.create(skillData, token);
-        if (response.success) {
-            // 3. 增加安装计数
-            await index_js_1.skillHubApi.install(skillHubId, token);
-        }
-        return response;
-    },
+    // 安装技能：字段由服务端从 skill_hubs 回填，此处不再拼装 body，
+    // 防止漏传 scriptsUrl / version 等字段导致入库为空
+    install: async (skillHubId, token) => await index_js_1.skillHubApi.install(skillHubId, token),
     update: (skillId, data, token) => index_js_1.skillsApi.update(skillId, data, token),
     uninstall: async (skillId, token) => await index_js_1.skillsApi.uninstall(skillId, token),
     setApiKey: (skillId, apiKey, token) => {

package/dist/services/llm/LLMClient.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalModelSelector = exports.parseAruments = exports.LLMClient = void 0;
-const index_js_1 = require("../../stores/index.js");
+const index_js_1 = require("@/stores/index.js");
 const shared_1 = require("@myassis/shared");
 const promises_1 = __importDefault(require("fs/promises"));
 const logger = (0, shared_1.getLogger)('LLMClient');

package/dist/services/memory/MemoryManager.js

@@ -28,9 +28,9 @@ const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('MemoryManager');
 const models_js_1 = require("../models.js");
 const dataService_js_1 = require("../dataService.js");
-const index_js_1 = require("../../stores/index.js");
+const index_js_1 = require("@/stores/index.js");
 const LLMClient_js_1 = require("../llm/LLMClient.js");
-const index_js_2 = require("../../config/index.js");
+const index_js_2 = require("@/config/index.js");
 const DEFAULT_CONFIG = {
     summaryThreshold: 10,
     enabled: true,

package/dist/services/session/Session.js

@@ -27,15 +27,15 @@ exports.Session = exports.handleApprovalResponse = exports.registerApprovalWaite
 const uuid_1 = require("uuid");
 const shared_1 = require("@myassis/shared");
 const SessionStore_js_1 = require("./SessionStore.js");
-const AgentStore_js_1 = require("../../services/agent/AgentStore.js");
-const authStore_js_1 = require("../../stores/authStore.js");
-const models_js_1 = require("../../services/models.js");
-const index_js_1 = require("../../services/tools/index.js");
+const AgentStore_js_1 = require("@/services/agent/AgentStore.js");
+const authStore_js_1 = require("@/stores/authStore.js");
+const models_js_1 = require("@/services/models.js");
+const index_js_1 = require("@/services/tools/index.js");
 const systemPrompt_js_1 = require("../systemPrompt.js");
 const LLMClient_js_1 = require("../llm/LLMClient.js");
-const dataService_js_1 = require("../../services/dataService.js");
+const dataService_js_1 = require("@/services/dataService.js");
 const MemoryManager_js_1 = require("../memory/MemoryManager.js");
-const index_js_2 = require("../../config/index.js");
+const index_js_2 = require("@/config/index.js");
 const SessionManager_js_1 = require("./SessionManager.js");
 const logger = (0, shared_1.getLogger)('Session');
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));

package/dist/services/session/SessionManager.js

@@ -5,7 +5,7 @@ const uuid_1 = require("uuid");
 const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('SessionManager');
 const SessionStore_js_1 = require("./SessionStore.js");
-const authStore_js_1 = require("../../stores/authStore.js");
+const authStore_js_1 = require("@/stores/authStore.js");
 const Session_js_1 = require("./Session.js");
 /**
  * SessionManager - Business logic layer

package/dist/services/systemPrompt.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSystemPromptAsync = exports.LANGUAGES = exports.CHAT_STYLE_TEMPLATES = void 0;
-const index_js_1 = require("../stores/index.js");
+const index_js_1 = require("@/stores/index.js");
 const os_1 = __importDefault(require("os"));
 const dataService_js_1 = require("./dataService.js");
 const shared_1 = require("@myassis/shared");

package/dist/services/tools/model.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.modelTool = void 0;
 const dataService_js_1 = require("../dataService.js");
-const index_js_1 = require("../../stores/index.js");
+const index_js_1 = require("@/stores/index.js");
 exports.modelTool = {
     name: 'model',
     description: '模型管理工具',

package/dist/services/tools/skill.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.skillTool = void 0;
 const dataService_js_1 = require("../dataService.js");
-const index_js_1 = require("../../stores/index.js");
+const index_js_1 = require("@/stores/index.js");
 const shared_1 = require("@myassis/shared");
 const logger = (0, shared_1.getLogger)('skill');
 exports.skillTool = {

package/dist/stores/authStore.js

@@ -168,12 +168,39 @@ exports.authStore = {
         }
     },
     /**
-     * 清除认证数据（内存 + 本地）
+     * 清除全部认证数据（内存 + 本地）
+     * 注：authMap 为多用户共享，单用户登出请用 remove/removeByToken。
      */
     clear() {
         clearAuth();
         logger.debug('Auth cleared');
     },
+    /**
+     * 移除单个用户的认证数据，不影响其他已登录用户
+     * @returns 是否确实移除了记录
+     */
+    remove(userId) {
+        if (!authMap) {
+            this.load();
+        }
+        const removed = authMap.delete(userId);
+        if (removed) {
+            saveAuthToFile(authMap);
+            logger.debug('Auth removed for user:', userId);
+        }
+        return removed;
+    },
+    /**
+     * 按 accessToken 定位并移除单个用户的认证数据
+     * @returns 是否确实移除了记录
+     */
+    removeByToken(token) {
+        const userId = this.getUserId(token);
+        if (!userId) {
+            return false;
+        }
+        return this.remove(userId);
+    },
     /**
      * 更新用户信息
      */

package/package.json

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