@myassis/gateway 1.0.0 → 1.0.2

package/dist/routes/auth.js

@@ -1,19 +1,12 @@
 import { Router } from 'express';
 import { authApi } from '../api/index.js';
 import { authStore } from '../stores/index.js';
-import { optionalAuth, requireAuth } from '../middleware/auth.js';
-import { getLogger } from '@pocketclaw/shared';
-import { getPlatform } from '@pocketclaw/shared/dist/utils/system.js';
+import { requireAuth } from '../middleware/auth.js';
+import { runWithToken } from '../api/index.js';
+import { getLogger } from '@myassis/shared';
+import { getPlatform } from '@myassis/shared/dist/utils/system.js';
 const logger = getLogger('auth');
 const router = Router();
-// Check auth status - 解码请求中的 token 返回认证状态
-router.get('/isAuth', optionalAuth, async (req, res) => {
-    const userId = req.userId;
-    res.json({
-        authenticated: !!userId,
-        user: userId ? { id: userId } : null,
-    });
-});
 // Get publish token - 获取发布技能库所需的 token
 router.get('/publish-token', requireAuth, async (req, res) => {
     res.json({
@@ -40,7 +33,7 @@ router.post('/register', async (req, res) => {
         if (response.success && response.data) {
             const expiresIn = response.data.expiresIn || 86400;
             authStore.save({
-                token: response.data.accessToken,
+                accessToken: response.data.accessToken,
                 refreshToken: response.data.refreshToken,
                 expiresIn,
                 expiresAt: Date.now() + expiresIn * 1000,
@@ -79,17 +72,10 @@ router.post('/login', async (req, res) => {
             platform: getPlatform(),
         });
         if (response.success && response.data) {
-            const expiresIn = response.data.expiresIn || 86400;
-            authStore.save({
-                token: response.data.accessToken,
-                refreshToken: response.data.refreshToken,
-                expiresIn,
-                expiresAt: Date.now() + expiresIn * 1000,
-                user: response.data.user,
-            });
+            authStore.save(response.data);
             res.json({
                 success: true,
-                user: response.data.user,
+                data: response.data,
             });
         }
         else {
@@ -132,12 +118,13 @@ router.post('/refresh', async (req, res) => {
 // Logout - 清除本地存储
 router.post('/logout', requireAuth, async (req, res) => {
     try {
-        // refreshToken 在请求 body 中
         const { refreshToken } = req.body;
-        // 尝试转发登出请求到 Server（忽略错误）
-        if (refreshToken) {
-            authApi.logout().catch(() => { });
-        }
+        // 用 AsyncLocalStorage 将 token 注入 server 请求上下文
+        await runWithToken(req.token, async () => {
+            if (refreshToken) {
+                authApi.logout(req.token).catch(() => { });
+            }
+        });
         authStore.clear();
         res.json({ success: true });
     }
@@ -146,6 +133,28 @@ router.post('/logout', requireAuth, async (req, res) => {
         res.json({ success: true });
     }
 });
+// Check authentication - 验证 token 有效性并获取用户信息
+router.get('/isAuth', requireAuth, async (req, res) => {
+    try {
+        // 用 AsyncLocalStorage 将 token 注入 server 请求上下文
+        const userResponse = await runWithToken(req.token, async () => {
+            return await authApi.me(req.token);
+        });
+        res.json({
+            authenticated: true,
+            user: userResponse.data,
+        });
+    }
+    catch (error) {
+        logger.error('Auth check error:', error);
+        // token 无效时返回认证失败
+        res.status(401).json({
+            authenticated: false,
+            user: null,
+            error: error.message || 'Invalid token',
+        });
+    }
+});
 // Delete account - 删除账号
 router.post('/account/delete', requireAuth, async (req, res) => {
     try {

package/dist/routes/chat.js

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('ChatRoutes');
 const router = Router();
 // Chat completion proxy - forwards to cloud API

package/dist/routes/models.js

@@ -1,17 +1,21 @@
 import express from 'express';
-import { getLogger, detectModelCapabilities } from '@pocketclaw/shared';
+import { getLogger, detectModelCapabilities } from '@myassis/shared';
 import { modelsService } from '../services/index.js';
 import { persistStore } from '../stores/persistStore.js';
 import { requireAuth } from '../middleware/auth.js';
+import { runWithToken } from '../api/index.js';
 const logger = getLogger('models');
 const router = express.Router();
+router.use(requireAuth, (req, _res, next) => {
+    void runWithToken(req.token, async () => { next(); });
+});
 /**
  * 获取所有模型配置
  * GET /api/v1/models
  */
 router.get('/', async (req, res) => {
     try {
-        const result = await modelsService.list();
+        const result = await modelsService.list(req.token);
         res.json(result);
     }
     catch (error) {
@@ -25,7 +29,7 @@ router.get('/', async (req, res) => {
  */
 router.get('/:id', async (req, res) => {
     try {
-        const result = await modelsService.get(req.params.id);
+        const result = await modelsService.get(req.params.id, req.token);
         res.json(result);
     }
     catch (error) {
@@ -42,18 +46,14 @@ router.post('/', requireAuth, async (req, res) => {
         const userId = req.userId;
         const modelData = req.body;
         const apiKey = modelData.apiKey;
-        // 自动检测模型能力，设置 supportsToolCall
         const modelCapabilities = detectModelCapabilities(modelData.modelId || '');
         const dataToSave = {
             ...modelData,
-            // 数据库 is_primary, is_active, supports_tool_call 都是 INTEGER 类型，转换为 0/1
             isPrimary: modelData.isPrimary ? 1 : 0,
             isActive: modelData.isActive ? 1 : 0,
             supportsToolCall: modelCapabilities.supportsToolCall ? 1 : 0,
         };
-        // 调用服务端，不包含 apiKey
-        const result = await modelsService.create(dataToSave);
-        // 如果提供了 API Key，持久化存储
+        const result = await runWithToken(req.token, () => modelsService.create(dataToSave, req.token));
         if (apiKey && result.success && result.data?.id) {
             persistStore.setModelApiKey(result.data.id, apiKey);
         }
@@ -73,18 +73,15 @@ router.put('/:id', requireAuth, async (req, res) => {
         const userId = req.userId;
         const modelData = req.body;
         const apiKey = modelData.apiKey;
-        // API Key 单独存储到本地，不传给服务端
         if (apiKey) {
             persistStore.setModelApiKey(req.params.id, apiKey);
         }
-        // 自动检测模型能力，设置 supportsToolCall
         const modelCapabilities = detectModelCapabilities(modelData.modelId || '');
         const dataToSave = {
             ...modelData,
             supportsToolCall: modelCapabilities.supportsToolCall ? 1 : 0,
         };
-        // 调用服务端，不包含 apiKey
-        const result = await modelsService.update(req.params.id, dataToSave);
+        const result = await runWithToken(req.token, () => modelsService.update(req.params.id, dataToSave, req.token));
         res.json(result);
     }
     catch (error) {
@@ -98,7 +95,7 @@ router.put('/:id', requireAuth, async (req, res) => {
  */
 router.delete('/:id', async (req, res) => {
     try {
-        const result = await modelsService.delete(req.params.id);
+        const result = await modelsService.delete(req.params.id, req.token);
         res.json(result);
     }
     catch (error) {
@@ -112,7 +109,7 @@ router.delete('/:id', async (req, res) => {
  */
 router.post('/:id/primary', async (req, res) => {
     try {
-        const result = await modelsService.setPrimary(req.params.id);
+        const result = await modelsService.setPrimary(req.params.id, req.token);
         res.json(result);
     }
     catch (error) {

package/dist/routes/service.js

@@ -1,12 +1,9 @@
 import { Router } from 'express';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 import path from 'path';
 import { getServiceInfo, installService, uninstallService, startService, stopService, restartService, checkForUpdates, updateService, } from '../services/ServiceManager.js';
 import { webSocketService } from '../services/WebSocketService.js';
-import { requireAuth } from '../middleware/auth.js';
 const router = Router();
-// 所有 service 路由需要认证
-router.use(requireAuth);
 const logger = getLogger('service');
 /**
  * 获取服务状态
@@ -185,8 +182,8 @@ router.get('/latest-exe-url', async (_req, res) => {
             return;
         }
         // TODO: 从 GitHub Releases 或自有 CDN 获取下载地址
-        // 示例: https://github.com/pocketclaw/gateway/releases/download/v${check.latestVersion}/gateway.exe
-        const downloadUrl = `https://pocket-claw-1251246038.cos.ap-chengdu.myqcloud.com/pocket-claw-1251246038/installs/v${check.latestVersion}/gateway-installer_${check.latestVersion}.exe`;
+        // 示例: https://github.com/myassis/gateway/releases/download/v${check.latestVersion}/gateway.exe
+        const downloadUrl = `https://my-assis-1251246038.cos.ap-chengdu.myqcloud.com/my-assis-1251246038/installs/v${check.latestVersion}/gateway-installer_${check.latestVersion}.exe`;
         res.json({
             success: true,
             hasUpdate: true,

package/dist/routes/settings.js

@@ -1,17 +1,19 @@
 import express from 'express';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 import { settingsService } from '../services/index.js';
 import { authStore, persistStore } from '../stores/index.js';
-import { authApi } from '../api/index.js';
+import { authApi, runWithToken } from '../api/index.js';
+import { requireAuth } from '../middleware/auth.js';
 const logger = getLogger('settings');
 const router = express.Router();
+router.use(requireAuth);
 /**
  * 获取用户设置
  * GET /api/v1/settings
  */
 router.get('/', async (req, res) => {
     try {
-        const result = await settingsService.get();
+        const result = await settingsService.get(req.token);
         res.json(result);
     }
     catch (error) {
@@ -23,9 +25,9 @@ router.get('/', async (req, res) => {
  * 更新用户设置
  * PUT /api/v1/settings
  */
-router.put('/', async (req, res) => {
+router.put('/', requireAuth, async (req, res) => {
     try {
-        const result = await settingsService.update(req.body);
+        const result = await runWithToken(req.token, () => settingsService.update(req.body, req.token));
         res.json(result);
     }
     catch (error) {
@@ -37,14 +39,14 @@ router.put('/', async (req, res) => {
  * 修改密码
  * PUT /api/v1/settings/password
  */
-router.put('/password', async (req, res) => {
+router.put('/password', requireAuth, async (req, res) => {
     try {
         const { oldPassword, newPassword } = req.body;
         if (!oldPassword || !newPassword) {
             res.status(400).json({ success: false, error: 'Missing required fields' });
             return;
         }
-        const result = await authApi.changePassword({ oldPassword, newPassword });
+        const result = await authApi.changePassword({ oldPassword, newPassword }, req.token);
         res.json(result);
     }
     catch (error) {
@@ -85,9 +87,9 @@ router.put('/local', async (req, res) => {
  * 删除账号
  * DELETE /api/v1/settings/account
  */
-router.delete('/account', async (req, res) => {
+router.delete('/account', requireAuth, async (req, res) => {
     try {
-        const result = await authApi.deleteAccount({ password: req.params.password });
+        const result = await authApi.deleteAccount({ password: req.params.password }, req.token);
         if (result.success) {
             authStore.clear();
         }

package/dist/routes/skillHub.js

@@ -5,9 +5,13 @@
 import express from 'express';
 import { skillHubService } from '../services/index.js';
 import { requireAuth } from '../middleware/auth.js';
-import { getLogger } from '@pocketclaw/shared';
+import { runWithToken } from '../api/index.js';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('skillHub');
 const router = express.Router();
+router.use(requireAuth, (req, _res, next) => {
+    void runWithToken(req.token, async () => { next(); });
+});
 /**
  * 获取技能库列表
  * GET /api/v1/skill-hub?page=1&pageSize=20&keyword=xxx&category=xxx
@@ -42,7 +46,7 @@ router.get('/:id', async (req, res) => {
         if (!hubId) {
             return res.status(400).json({ success: false, error: '无效的技能库ID' });
         }
-        const result = await skillHubService.get(hubId);
+        const result = await skillHubService.get(hubId, req.token);
         res.json(result);
     }
     catch (error) {
@@ -60,7 +64,7 @@ router.get('/:id/used', async (req, res) => {
         if (!hubId) {
             return res.status(400).json({ success: false, error: '无效的技能库ID' });
         }
-        const result = await skillHubService.checkUsed(hubId);
+        const result = await skillHubService.checkUsed(hubId, req.token);
         res.json(result);
     }
     catch (error) {
@@ -78,7 +82,7 @@ router.get('/:id/user-rating', async (req, res) => {
         if (!hubId) {
             return res.status(400).json({ success: false, error: '无效的技能库ID' });
         }
-        const result = await skillHubService.userRating(hubId);
+        const result = await skillHubService.userRating(hubId, req.token);
         res.json(result);
     }
     catch (error) {
@@ -92,7 +96,7 @@ router.get('/:id/user-rating', async (req, res) => {
  */
 router.get('/categories/list', async (req, res) => {
     try {
-        const result = await skillHubService.categories();
+        const result = await skillHubService.categories(req.token);
         res.json(result);
     }
     catch (error) {
@@ -115,7 +119,7 @@ router.post('/:id/rate', requireAuth, async (req, res) => {
         if (rating === undefined || rating < 1 || rating > 5) {
             return res.status(400).json({ success: false, error: '评分必须是1-5的数字' });
         }
-        const result = await skillHubService.rate(hubId, rating);
+        const result = await runWithToken(req.token, () => skillHubService.rate(hubId, rating, req.token));
         res.json(result);
     }
     catch (error) {

package/dist/routes/skills.js

@@ -5,18 +5,21 @@
 import express from 'express';
 import { skillsService } from '../services/index.js';
 import { persistStore } from '../stores/persistStore.js';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 import { requireAuth } from '../middleware/auth.js';
+import { runWithToken } from '../api/index.js';
 const logger = getLogger('skills');
 const router = express.Router();
-router.use(requireAuth);
+router.use(requireAuth, (req, _res, next) => {
+    void runWithToken(req.token, async () => { next(); });
+});
 /**
  * 获取用户已安装的技能列表
  * GET /api/v1/skills
  */
 router.get('/', async (req, res) => {
     try {
-        const result = await skillsService.list();
+        const result = await skillsService.list(req.token);
         res.json(result);
     }
     catch (error) {
@@ -34,7 +37,7 @@ router.post('/parse', async (req, res) => {
         if (!content) {
             return res.status(400).json({ success: false, error: '缺少 content 参数' });
         }
-        const result = await skillsService.parse(content);
+        const result = await skillsService.parse(content, req.token);
         res.json(result);
     }
     catch (error) {
@@ -49,7 +52,7 @@ router.post('/parse', async (req, res) => {
 router.get('/:id', async (req, res) => {
     try {
         const skillId = req.params.id;
-        const result = await skillsService.get(skillId);
+        const result = await skillsService.get(skillId, req.token);
         res.json(result);
     }
     catch (error) {
@@ -69,7 +72,7 @@ router.post('/', async (req, res) => {
         if (skillHubId) {
             // 从技能库安装
             const hubId = String(skillHubId);
-            const result = await skillsService.install(hubId);
+            const result = await skillsService.install(hubId, req.token);
             res.json(result);
         }
         else {
@@ -77,7 +80,7 @@ router.post('/', async (req, res) => {
             if (!req.body.name) {
                 return res.status(400).json({ success: false, error: '自定义技能必须提供 name' });
             }
-            const result = await skillsService.create(req.body);
+            const result = await skillsService.create(req.body, req.token);
             res.json(result);
         }
     }
@@ -93,7 +96,7 @@ router.post('/', async (req, res) => {
 router.put('/:id', async (req, res) => {
     try {
         const skillId = req.params.id;
-        const result = await skillsService.update(skillId, req.body);
+        const result = await skillsService.update(skillId, req.body, req.token);
         res.json(result);
     }
     catch (error) {
@@ -108,7 +111,7 @@ router.put('/:id', async (req, res) => {
 router.delete('/:id', async (req, res) => {
     try {
         const skillId = req.params.id;
-        const result = await skillsService.uninstall(skillId);
+        const result = await skillsService.uninstall(skillId, req.token);
         res.json(result);
     }
     catch (error) {
@@ -148,7 +151,7 @@ router.post('/:id/rating', async (req, res) => {
         if (!score || score < 1 || score > 5) {
             return res.status(400).json({ success: false, error: '评分必须在 1-5 之间' });
         }
-        const result = await skillsService.rate(skillId, score);
+        const result = await skillsService.rate(skillId, score, req.token);
         res.json(result);
     }
     catch (error) {

package/dist/routes/tasks.js

@@ -4,11 +4,14 @@
  */
 import express from 'express';
 import { tasksService } from '../services/index.js';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 import { requireAuth } from '../middleware/auth.js';
+import { runWithToken } from '../api/index.js';
 const logger = getLogger('tasks');
 const router = express.Router();
-router.use(requireAuth);
+router.use(requireAuth, (req, _res, next) => {
+    void runWithToken(req.token, async () => { next(); });
+});
 /**
  * 获取任务列表
  * GET /api/v1/tasks
@@ -17,7 +20,7 @@ router.get('/', async (req, res) => {
     try {
         const { status, page, pageSize } = req.query;
         const userId = req.userId;
-        const result = await tasksService.list({ status, page, pageSize }, userId);
+        const result = await tasksService.list(userId, { status, page, pageSize });
         res.json(result);
     }
     catch (error) {

package/dist/routes/upload.js

@@ -2,10 +2,13 @@ import { Router } from 'express';
 import multer from 'multer';
 import { appConfig } from '@/config/index.js';
 import { requireAuth } from '@/middleware/auth.js';
-import { getLogger } from '@pocketclaw/shared';
+import { runWithToken } from '@/api/index.js';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('UploadRoutes');
 const router = Router();
-router.use(requireAuth);
+router.use(requireAuth, (req, _res, next) => {
+    void runWithToken(req.token, async () => { next(); });
+});
 // 配置 multer 用于解析 multipart/form-data
 const upload = multer({
     storage: multer.memoryStorage(),

package/dist/routes/version.js

@@ -1,11 +1,11 @@
 import express from 'express';
 import axios from 'axios';
 import { appConfig } from '../config/index.js';
-import { optionalAuth } from '../middleware/auth.js';
+import { requireAuth } from '../middleware/auth.js';
 import { readFileSync } from 'fs';
 import { resolve, dirname } from 'path';
 import { fileURLToPath } from 'url';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('VersionRoutes');
 const router = express.Router();
 // ESM 兼容的 __dirname
@@ -42,9 +42,9 @@ router.get('/local', async (req, res) => {
 /**
  * 转发到服务端接口
  */
-router.get('/latest', optionalAuth, async (req, res) => {
+router.get('/latest', requireAuth, async (req, res) => {
     try {
-        const serverBaseUrl = appConfig.serverBaseUrl || 'https://api.pocketclaw.ai';
+        const serverBaseUrl = appConfig.serverBaseUrl || 'http://localhost:9091';
         const response = await axios.get(`${serverBaseUrl}/api/v1/version/latest`, {
             timeout: 10000,
             headers: {

package/dist/services/LocalTaskService.js

@@ -6,7 +6,7 @@
  */
 import { v4 as uuidv4 } from 'uuid';
 import { TaskStore } from './task/TaskStore';
-import { getLogger, sharedTaskService, formatUTCForLog } from '@pocketclaw/shared';
+import { getLogger, sharedTaskService, formatUTCForLog } from '@myassis/shared';
 const logger = getLogger('LocalTaskService');
 class LocalTaskService {
     store;

package/dist/services/NotificationService.js

@@ -6,7 +6,7 @@
 import { PushTokenStore } from './task/PushTokenStore';
 import { webSocketService } from './WebSocketService';
 import { hmsPushService } from './HMSPushService';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('NotificationService');
 const log = logger;
 // 全局 PushTokenStore 实例

package/dist/services/ServiceManager.js

@@ -5,8 +5,8 @@ import fs from 'fs';
 import axios from 'axios';
 import { fileURLToPath } from 'url';
 const execAsync = promisify(exec);
-export const SERVICE_NAME = 'myclaw-gateway';
-export const SERVICE_DISPLAY_NAME = 'MyClaw Desktop Gateway Service';
+export const SERVICE_NAME = 'myassis-gateway';
+export const SERVICE_DISPLAY_NAME = '我的助手 Desktop Gateway Service';
 // ─── 平台无关工具 ────────────────────────────────────────────
 function getServiceScript() {
     // pkg 环境
@@ -94,7 +94,7 @@ async function restartServiceWindows() {
                 success: false,
                 message: '检测到您尚未安装 nssm，无法自动重启服务。请手动执行以下步骤更新 Gateway：\n' +
                     '1. 在桌面上停止 Gateway 服务（系统托盘 → 右键 → 退出）\n' +
-                    '2. 运行 `npm install -g @myclaw/gateway@latest`\n' +
+                    '2. 运行 `npm install -g @myassis/gateway@latest`\n' +
                     '3. 重新启动 Gateway 服务\n\n' +
                     '如需自动重启功能，请从 https://nssm.cc/download 下载 nssm 并放置到 Gateway 同目录下',
             };
@@ -160,11 +160,11 @@ Environment=NODE_ENV=production
 [Install]
 WantedBy=multi-user.target
 `;
-        await fs.promises.writeFile('/tmp/myclaw-gateway.service', unitContent, 'utf8');
-        await execAsync('cp /tmp/myclaw-gateway.service /etc/systemd/system/myclaw-gateway.service', { timeout: 10000 });
+        await fs.promises.writeFile('/tmp/myassis-gateway.service', unitContent, 'utf8');
+        await execAsync('cp /tmp/myassis-gateway.service /etc/systemd/system/myassis-gateway.service', { timeout: 10000 });
         await execAsync('systemctl daemon-reload', { timeout: 10000 });
-        await execAsync('systemctl enable myclaw-gateway', { timeout: 10000 });
-        await execAsync('systemctl start myclaw-gateway', { timeout: 10000 });
+        await execAsync('systemctl enable myassis-gateway', { timeout: 10000 });
+        await execAsync('systemctl start myassis-gateway', { timeout: 10000 });
         return { success: true, message: '服务安装并启动成功' };
     }
     catch (err) {
@@ -173,9 +173,9 @@ WantedBy=multi-user.target
 }
 async function uninstallLinux() {
     try {
-        await execAsync('systemctl stop myclaw-gateway', { timeout: 10000 });
-        await execAsync('systemctl disable myclaw-gateway', { timeout: 10000 });
-        await execAsync('rm -f /etc/systemd/system/myclaw-gateway.service', { timeout: 10000 });
+        await execAsync('systemctl stop myassis-gateway', { timeout: 10000 });
+        await execAsync('systemctl disable myassis-gateway', { timeout: 10000 });
+        await execAsync('rm -f /etc/systemd/system/myassis-gateway.service', { timeout: 10000 });
         await execAsync('systemctl daemon-reload', { timeout: 10000 });
         return { success: true, message: '服务卸载成功' };
     }
@@ -304,7 +304,7 @@ function compareVersions(a, b) {
 export async function checkForUpdates() {
     try {
         const currentVersion = getPackageVersion();
-        const response = await axios.get('https://registry.npmjs.org/@myclaw/gateway/latest', { timeout: 10000 });
+        const response = await axios.get('https://registry.npmjs.org/@myassis/gateway/latest', { timeout: 10000 });
         const latestVersion = response.data.version;
         if (!latestVersion) {
             return { hasUpdate: false, currentVersion, latestVersion: currentVersion, error: '无法获取最新版本' };
@@ -326,7 +326,7 @@ export async function updateService() {
             return { success: true, message: `已是最新版本 ${check.currentVersion}` };
         }
         console.log(`发现新版本 ${check.latestVersion}，正在更新...`);
-        const { stdout, stderr } = await execAsync('npm install -g @myclaw/gateway@latest', { timeout: 120000 });
+        const { stdout, stderr } = await execAsync('npm install -g @myassis/gateway@latest', { timeout: 120000 });
         if (stdout)
             console.log(stdout);
         if (stderr)

package/dist/services/TaskSchedulerService.js

@@ -5,9 +5,10 @@
  */
 import { taskStore } from './task/TaskStore';
 import { webSocketService } from './WebSocketService';
-import { sessionManager } from './session';
-import { getLogger, getUTCTimeKey, formatUTCForLog, holidayService } from '@pocketclaw/shared';
+import { getSessionManager } from './session';
+import { getLogger, getUTCTimeKey, formatUTCForLog, holidayService } from '@myassis/shared';
 import { tasksService } from './dataService';
+import { authStore } from '@/stores';
 const logger = getLogger('TaskSchedulerService');
 const EXPIRED_THRESHOLD = 60 * 60 * 1000; // 1小时
 const CHECK_INTERVAL = 60 * 1000; // 1分钟
@@ -65,13 +66,17 @@ class TaskSchedulerService {
         try {
             const now = Date.now();
             const nowBeforeHour = now - EXPIRED_THRESHOLD;
-            const response = await tasksService.list();
-            if (!response.success) {
+            const authMap = authStore.getAll();
+            if (!authMap) {
+                return;
+            }
+            const response = await Promise.all(Array.from(authMap.values()).map(x => tasksService.list(x.user.id)));
+            if (response.some(x => !x.success)) {
                 logger.error('获取任务失败');
                 return;
             }
             // 获取过期待执行任务
-            const tasks = response.data.filter(x => x.scheduledAt < nowBeforeHour && x.status !== 'completed' && x.status !== 'expired' && x.status !== 'error');
+            const tasks = response.flatMap(x => x.data).filter(x => x.scheduledAt < nowBeforeHour && x.status !== 'completed' && x.status !== 'expired' && x.status !== 'error');
             if (tasks.length > 0) {
                 for (let task of tasks) {
                     await tasksService.updateStatus(task.id, 'expired');
@@ -90,13 +95,17 @@ class TaskSchedulerService {
             const now = Date.now();
             const nowBeforeHour = now - EXPIRED_THRESHOLD;
             const timeKey = getUTCTimeKey(new Date());
-            const response = await tasksService.list();
-            if (!response.success) {
+            const authMap = authStore.getAll();
+            if (!authMap) {
+                return;
+            }
+            const response = await Promise.all(Array.from(authMap.values()).map(x => tasksService.list(x.user.id)));
+            if (response.some(x => !x.success)) {
                 logger.error('获取任务失败');
                 return;
             }
             // 获取待执行任务
-            const tasks = response.data.filter(x => x.scheduledAt >= nowBeforeHour && x.scheduledAt <= now && x.status === 'pending');
+            const tasks = response.flatMap(x => x.data).filter(x => x.scheduledAt >= nowBeforeHour && x.scheduledAt <= now && x.status === 'pending');
             if (tasks.length > 0) {
                 logger.info(`Found ${tasks.length} tasks to execute at ${timeKey}`);
                 for (const task of tasks) {
@@ -152,7 +161,7 @@ class TaskSchedulerService {
      */
     async executeTaskLocally(task) {
         try {
-            const currentSession = sessionManager.getCurrentSession();
+            const currentSession = getSessionManager(task.userId).getCurrentSession();
             if (!currentSession) {
                 logger.warn(`No current session found, cannot execute task: ${task.title}`);
                 return;