@myassis/gateway 1.0.72 → 1.0.74

package/dist/routes/auth.js

@@ -100,10 +100,28 @@ router.post('/refresh', async (req, res) => {
             res.status(400).json({ success: false, error: 'Missing refresh token' });
             return;
         }
+        // 刷新前先找到持有该 refreshToken 的旧 accessToken，用于定位记录
+        const oldToken = Array.from(index_js_2.authStore.getAll()?.values() ?? [])
+            .find(x => x.refreshToken === refreshToken)?.accessToken;
         const response = await index_js_1.authApi.refresh(refreshToken);
-        if (response.success && response.accessToken) {
-            index_js_2.authStore.updateToken(response.accessToken, response.refreshToken);
-            res.json({ success: true });
+        // server 可能返回 {accessToken} 或 {data:{accessToken}}，两种都兼容
+        const accessToken = response.data?.accessToken ?? response.accessToken;
+        const newRefreshToken = response.data?.refreshToken ?? response.refreshToken;
+        const expiresIn = response.data?.expiresIn ?? response.expiresIn;
+        if (response.success && accessToken) {
+            index_js_2.authStore.updateToken(oldToken ?? accessToken, accessToken, newRefreshToken, expiresIn);
+            // 必须将新 token 回传给客户端，否则客户端无法更新本地 token
+            res.json({
+                success: true,
+                data: {
+                    accessToken,
+                    refreshToken: newRefreshToken,
+                    expiresIn,
+                },
+                accessToken,
+                refreshToken: newRefreshToken,
+                expiresIn,
+            });
         }
         else {
             res.status(401).json({ success: false, error: response.error || 'Invalid refresh token' });

package/dist/services/dataService.js

@@ -75,9 +75,15 @@ exports.authService = {
     getUser: (token) => index_js_2.authStore.get(token)?.user || null,
     // 刷新 Token
     refresh: async (refreshToken) => {
+        // 刷新前先定位旧 accessToken
+        const oldToken = Array.from(index_js_2.authStore.getAll()?.values() ?? [])
+            .find(x => x.refreshToken === refreshToken)?.accessToken;
         const response = await index_js_1.authApi.refresh(refreshToken);
-        if (response.success && response.accessToken) {
-            index_js_2.authStore.updateToken(response.accessToken, response.refreshToken);
+        const accessToken = response.data?.accessToken ?? response.accessToken;
+        const newRefreshToken = response.data?.refreshToken ?? response.refreshToken;
+        const expiresIn = response.data?.expiresIn ?? response.expiresIn;
+        if (response.success && accessToken) {
+            index_js_2.authStore.updateToken(oldToken ?? accessToken, accessToken, newRefreshToken, expiresIn);
         }
         return response;
     }
@@ -86,30 +92,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/stores/authStore.js

@@ -123,19 +123,38 @@ exports.authStore = {
     },
     /**
      * 更新 Token
+     * @param oldToken 刷新前的旧 accessToken，用于定位记录
+     * @param newToken 刷新后的新 accessToken
+     * @param refreshToken 新的 refreshToken（可选）
+     * @param expiresIn 有效期秒数（可选）
+     * @returns 是否更新成功
      */
-    updateToken(token, expiresIn, refreshToken) {
-        if (authMap) {
-            const auth = Array.from(authMap.values()).find(x => x.accessToken === token);
-            if (auth) {
-                auth.accessToken = token;
-                if (refreshToken) {
-                    auth.refreshToken = refreshToken;
-                }
-                saveAuthToFile(authMap);
-                logger.debug('Token updated');
-            }
+    updateToken(oldToken, newToken, refreshToken, expiresIn) {
+        if (!authMap) {
+            this.load();
+        }
+        if (!newToken) {
+            logger.warn('updateToken called without newToken');
+            return false;
         }
+        // 按旧 token 定位记录；若传入的旧 token 已被替换过，则回退用新 token 匹配（幂等）
+        const auth = Array.from(authMap.values()).find(x => x.accessToken === oldToken)
+            || Array.from(authMap.values()).find(x => x.accessToken === newToken);
+        if (!auth) {
+            logger.warn('updateToken: no auth record matched the given token');
+            return false;
+        }
+        auth.accessToken = newToken;
+        if (refreshToken) {
+            auth.refreshToken = refreshToken;
+        }
+        if (expiresIn) {
+            auth.expiresIn = expiresIn;
+            auth.expiresAt = Date.now() + expiresIn * 1000;
+        }
+        saveAuthToFile(authMap);
+        logger.debug('Token updated for user:', auth.user?.nickname || auth.user?.account);
+        return true;
     },
     /**
      * 获取用户 ID

package/package.json

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