@myassis/gateway 1.0.1 → 1.0.3

package/dist/services/TaskSchedulerService.js

@@ -3,11 +3,12 @@
  * 基于 SQLite 数据库的任务调度
  * 每分钟检查待执行任务并发送通知
  */
-import { taskStore } from './task/TaskStore';
-import { webSocketService } from './WebSocketService';
-import { sessionManager } from './session';
-import { getLogger, getUTCTimeKey, formatUTCForLog, holidayService } from '@pocketclaw/shared';
-import { tasksService } from './dataService';
+import { taskStore } from './task/TaskStore.js';
+import { webSocketService } from './WebSocketService.js';
+import { getSessionManager } from './session.js';
+import { getLogger, getUTCTimeKey, formatUTCForLog, holidayService } from '@myassis/shared';
+import { tasksService } from './dataService.js';
+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;

package/dist/services/TaskService.js

@@ -7,10 +7,11 @@
  * - platformApply === currentPlatform → 本地 SQLite 存储（localTaskService）
  * - platformApply !== currentPlatform → 服务器 API（tasksApi）
  */
-import { tasksApi } from '../api';
-import { localTaskService } from './LocalTaskService';
-import { getLogger } from '@pocketclaw/shared';
-import { getPlatform } from '@pocketclaw/shared/dist/utils/system.js';
+import { authStore } from '@/stores';
+import { tasksApi } from '../api.js';
+import { localTaskService } from './LocalTaskService.js';
+import { getLogger } from '@myassis/shared';
+import { getPlatform } from '@myassis/shared/dist/utils/system.js';
 // 当前网关平台标识
 const CURRENT_PLATFORM = process.env.GATEWAY_PLATFORM || getPlatform();
 const logger = getLogger('TaskService');
@@ -29,7 +30,7 @@ class TaskService {
     /**
      * 创建任务（自动路由）
      */
-    async createTask(data) {
+    async createTask(data, token) {
         const isLocal = isLocalTask(data.platformApply);
         logger.info('[TaskService] 创建任务', {
             title: data.title,
@@ -73,19 +74,19 @@ class TaskService {
                     ? (typeof data.endTime === 'object' ? new Date(data.endTime).toISOString() : data.endTime)
                     : undefined,
                 platform_apply: data.platformApply,
-            });
+            }, token);
             return { id: String(result.id || result), isLocal: false };
         }
     }
     /**
      * 获取任务（自动路由 - 先本地后服务器）
      */
-    async getTask(taskId) {
+    async getTask(taskId, token) {
         const localTask = localTaskService.getTask(taskId);
         if (localTask)
             return localTask;
         try {
-            const result = await tasksApi.get(taskId);
+            const result = await tasksApi.get(taskId, token);
             return this.transformServerTask(result);
         }
         catch (error) {
@@ -99,12 +100,14 @@ class TaskService {
     async listTasks(params) {
         const localResult = localTaskService.listTasks(params);
         let serverTasks = [];
+        const userId = params.userId;
+        const token = authStore.get(userId).accessToken;
         try {
             const serverResult = await tasksApi.list({
-                status: params?.status,
-                page: params?.page ? String(params.page) : undefined,
-                pageSize: params?.pageSize ? String(params.pageSize) : undefined,
-            });
+                status: params.status,
+                page: params.page ? String(params.page) : undefined,
+                pageSize: params.pageSize ? String(params.pageSize) : undefined,
+            }, token);
             if (Array.isArray(serverResult)) {
                 serverTasks = serverResult.map(t => this.transformServerTask(t)).filter(Boolean);
             }
@@ -126,7 +129,7 @@ class TaskService {
     /**
      * 更新任务（自动路由）
      */
-    async updateTask(taskId, data) {
+    async updateTask(taskId, data, token) {
         const localTask = localTaskService.getTask(taskId);
         if (localTask) {
             const result = localTaskService.updateTask(taskId, data);
@@ -151,7 +154,7 @@ class TaskService {
                         ? (typeof data.endTime === 'object' ? new Date(data.endTime).toISOString() : data.endTime)
                         : undefined,
                     status: data.status,
-                });
+                }, token);
                 return true;
             }
             catch (error) {
@@ -163,14 +166,14 @@ class TaskService {
     /**
      * 删除任务（自动路由）
      */
-    async deleteTask(taskId) {
+    async deleteTask(taskId, token) {
         const localTask = localTaskService.getTask(taskId);
         if (localTask) {
             return localTaskService.deleteTask(taskId);
         }
         else {
             try {
-                await tasksApi.delete(taskId);
+                await tasksApi.delete(taskId, token);
                 return true;
             }
             catch (error) {
@@ -182,7 +185,7 @@ class TaskService {
     /**
      * 更新任务状态
      */
-    async updateTaskStatus(taskId, status) {
+    async updateTaskStatus(taskId, status, token) {
         const localTask = localTaskService.getTask(taskId);
         if (localTask) {
             await localTaskService.updateTaskStatus(taskId, status);
@@ -190,7 +193,7 @@ class TaskService {
         }
         else {
             try {
-                await tasksApi.updateStatus(taskId, { status });
+                await tasksApi.updateStatus(taskId, { status }, token);
                 return true;
             }
             catch (error) {
@@ -202,14 +205,14 @@ class TaskService {
     /**
      * 完成任务
      */
-    async completeTask(taskId) {
-        return this.updateTaskStatus(taskId, 'completed');
+    async completeTask(taskId, token) {
+        return this.updateTaskStatus(taskId, 'completed', token);
     }
     /**
      * 取消任务
      */
-    async cancelTask(taskId) {
-        return this.updateTaskStatus(taskId, 'cancelled');
+    async cancelTask(taskId, token) {
+        return this.updateTaskStatus(taskId, 'cancelled', token);
     }
     /**
      * 转换服务器任务格式

package/dist/services/WebSocketService.js

@@ -4,7 +4,7 @@
  */
 import { WebSocketServer, WebSocket } from 'ws';
 import { authStore } from '../stores/index.js';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('WebSocketService');
 class WebSocketService {
     wss = null;
@@ -93,13 +93,23 @@ class WebSocketService {
     }
     /**
      * 从请求中提取用户标识
-     * Desktop 不存储 token，Gateway 直接信任连接并使用已登录用户的 ID
+     * 支持两种方式：
+     * 1. URL 查询参数 ?token=xxx（Desktop WebSocket 连接）
+     * 2. 直接使用 authStore 中的用户 ID
      */
     getClientKey(req) {
-        // 直接使用 authStore 中的用户 ID（Gateway 登录后的用户）
-        const userId = authStore.getUserId();
-        if (userId) {
-            return String(userId);
+        // 优先从 URL 查询参数中提取 token
+        let token = null;
+        const url = req.url || '';
+        const match = url.match(/[?&]token=([^&]+)/);
+        if (match) {
+            token = decodeURIComponent(match[1]);
+        }
+        if (token) {
+            const userId = authStore.getUserId(token);
+            if (userId) {
+                return String(userId);
+            }
         }
         return null;
     }

package/dist/services/agent/Agent.js

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { sessionManager } from '../session/SessionManager';
+import { getSessionManager } from '../session/SessionManager.js';
 /**
  * Agent - Business logic entity
  * Represents an AI agent with independent system prompt and multiple sessions
@@ -16,7 +16,7 @@ export class Agent {
     updatedAt;
     isCurrent; // 是否是当前正在查看的 Agent
     store;
-    constructor(data, store, agentManager) {
+    constructor(data, store) {
         this.id = data.id;
         this.userId = data.userId;
         this.name = data.name;
@@ -33,14 +33,14 @@ export class Agent {
      * Get all sessions under this agent
      */
     getSessions() {
-        const allSessions = sessionManager.getUserSessions();
+        const allSessions = getSessionManager(this.userId).getUserSessions();
         return allSessions.filter(s => s.agentId === this.id);
     }
     /**
      * Create new session under this agent
      */
     createSession(config = {}) {
-        const session = sessionManager.createSession({
+        const session = getSessionManager(this.userId).createSession({
             id: config.id || uuidv4(),
             title: config.title || '新会话',
             selectModelId: config.selectModelId,
@@ -55,7 +55,7 @@ export class Agent {
         const session = this.getSession(sessionId);
         if (!session)
             return null;
-        return sessionManager.updateSession(sessionId, data);
+        return getSessionManager(this.userId).updateSession(sessionId, data);
     }
     /**
      * Delete session under this agent
@@ -64,13 +64,13 @@ export class Agent {
         const session = this.getSession(sessionId);
         if (!session)
             return false;
-        return sessionManager.deleteSession(sessionId);
+        return getSessionManager(this.userId).deleteSession(sessionId);
     }
     /**
      * Get session under this agent
      */
     getSession(sessionId) {
-        const session = sessionManager.getSession(sessionId);
+        const session = getSessionManager(this.userId).getSession(sessionId);
         if (session && session.agentId === this.id) {
             return session;
         }

package/dist/services/agent/AgentManager.js

@@ -1,8 +1,8 @@
 import { v4 as uuidv4 } from 'uuid';
-import { Agent } from './Agent';
-import { sessionManager } from '../session/SessionManager';
+import { Agent } from './Agent.js';
+import { getSessionManager } from '../session/SessionManager.js';
 import { authStore } from '@/stores/authStore';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 import appConfig from '@/config';
 const logger = getLogger('AgentManager');
 /**
@@ -13,8 +13,10 @@ export class AgentManager {
     store;
     agents = null;
     initialized = false;
-    constructor(store) {
+    userId;
+    constructor(store, userId) {
         this.store = store;
+        this.userId = userId;
     }
     /**
      * Initialize - Load all agents from database on startup
@@ -34,12 +36,12 @@ export class AgentManager {
         // Load all agents from database
         const agentDataList = this.store.findByUserId(userId);
         for (const agentData of agentDataList) {
-            const agent = new Agent(agentData, this.store, this);
+            const agent = new Agent(agentData, this.store);
             this.agents.set(agent.id, agent);
         }
-        // If no agents exist, create default "MyClaw" agent
+        // If no agents exist, create default "我的助手" agent
         if (this.agents.size === 0) {
-            logger.info('No agents found, creating default "MyClaw" agent');
+            logger.info('No agents found, creating default "我的助手" agent');
             this.createDefaultAgent(userId);
         }
         // Ensure exactly one agent has isCurrent=true
@@ -58,11 +60,11 @@ export class AgentManager {
      * Get current user ID
      */
     getCurrentUserId() {
-        const user = authStore.getUser();
+        const user = authStore.getUser(this.userId);
         return user ? String(user.id) : null;
     }
     /**
-     * Create default "MyClaw" agent
+     * Create default "我的助手" agent
      */
     createDefaultAgent(userId) {
         const agentData = {
@@ -78,7 +80,7 @@ export class AgentManager {
             isCurrent: true,
         };
         this.store.insert(agentData);
-        const agent = new Agent(agentData, this.store, this);
+        const agent = new Agent(agentData, this.store);
         this.agents.set(agent.id, agent);
         // Create default session
         agent.createSession({ title: '新会话' });
@@ -95,7 +97,7 @@ export class AgentManager {
             return [];
         const agentDataList = this.store.findByUserId(userId);
         return agentDataList.map(data => {
-            const sessions = sessionManager.getUserSessions();
+            const sessions = getSessionManager(this.userId).getUserSessions();
             const agentSessions = sessions
                 .filter(s => s.agentId === data.id)
                 .map(s => ({
@@ -146,7 +148,7 @@ export class AgentManager {
             updatedAt: Date.now(),
         };
         this.store.insert(agentData);
-        const agent = new Agent(agentData, this.store, this);
+        const agent = new Agent(agentData, this.store);
         this.agents.set(agent.id, agent);
         // Create default session
         agent.createSession({ title: '新会话' });
@@ -186,7 +188,7 @@ export class AgentManager {
         // Delete all sessions under this agent
         const sessions = agent.getSessions();
         for (const session of sessions) {
-            sessionManager.deleteSession(session.id);
+            getSessionManager(this.userId).deleteSession(session.id);
         }
         // Delete agent
         this.store.delete(agentId);
@@ -233,12 +235,15 @@ export class AgentManager {
      * Get sessions under an agent
      */
     getAgentSessions(agentId) {
-        const sessions = sessionManager.getUserSessions();
+        const sessions = getSessionManager(this.userId).getUserSessions();
         return sessions
             .filter(s => s.agentId === agentId)
             .map(s => ({
             id: s.id,
             title: s.title,
+            selectModelId: s.selectModelId,
+            isCurrent: s.isCurrent,
+            unreadCount: s.unreadCount,
             createdAt: s.createdAt,
             updatedAt: s.updatedAt,
         }));
@@ -258,8 +263,11 @@ export class AgentManager {
     }
 }
 // Export singleton
-export let agentManager;
-export function initAgentManager(store) {
-    agentManager = new AgentManager(store);
-    return agentManager;
+export let agentManagerMap = new Map();
+export function initAgentManager(store, userId) {
+    if (agentManagerMap.has(userId)) {
+        return agentManagerMap.get(userId);
+    }
+    agentManagerMap.set(userId, new AgentManager(store, userId));
+    return agentManagerMap.get(userId);
 }

package/dist/services/agent/AgentStore.js

@@ -1,4 +1,4 @@
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('AgentStore');
 /**
  * AgentStore - Data access layer