@myassis/gateway 1.0.1 → 1.0.3

package/dist/services/tools/skill.js

@@ -1,6 +1,6 @@
-import { skillsService, skillHubService } from '../dataService';
-import { persistStore } from '@/stores';
-import { getLogger } from '@pocketclaw/shared';
+import { skillsService, skillHubService } from '../dataService.js';
+import { authStore, persistStore } from '@/stores';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('skill');
 export const skillTool = {
     name: 'skill',
@@ -22,19 +22,20 @@ export const skillTool = {
         },
         required: ['action'],
     },
-    handler: async (args) => {
+    handler: async (args, sessionId, messageId, userId) => {
         try {
             const { action, query, skillId, hubId, apiKey, apiBaseUrl, rating } = args;
+            const token = authStore.get(userId).accessToken;
             switch (action) {
                 case 'listInstalled': {
-                    const response = await skillsService.list();
+                    const response = await skillsService.list(token);
                     if (!response.success)
                         return { success: false, errorMessage: response.error || '获取列表失败' };
                     const skills = response.data || [];
                     return { success: true, output: JSON.stringify({ total: skills.length, skills: skills.map((s) => ({ id: s.id, name: s.name, description: s.description, version: s.version, status: s.status })) }) };
                 }
                 case 'search': {
-                    const response = await skillHubService.list({ keyword: query, pageSize: 10 });
+                    const response = await skillHubService.list(token, { keyword: query, pageSize: 10 });
                     if (!response.success)
                         return { success: false, errorMessage: response.error || '搜索失败' };
                     const skills = response.data?.items || response.data || [];
@@ -44,7 +45,7 @@ export const skillTool = {
                     const installId = hubId || query;
                     if (!installId)
                         return { success: false, errorMessage: '安装需要提供 hubId 或 query' };
-                    const response = await skillsService.install(installId);
+                    const response = await skillsService.install(installId, token);
                     if (!response.success)
                         return { success: false, errorMessage: response.error || '安装失败' };
                     return { success: true };
@@ -52,7 +53,7 @@ export const skillTool = {
                 case 'uninstall': {
                     if (!skillId)
                         return { success: false, errorMessage: '卸载需要提供技能 ID' };
-                    const response = await skillsService.uninstall(skillId);
+                    const response = await skillsService.uninstall(skillId, token);
                     if (!response.success)
                         return { success: false, errorMessage: response.error || '卸载失败' };
                     return { success: true };
@@ -60,21 +61,21 @@ export const skillTool = {
                 case 'detail': {
                     if (!skillId)
                         return { success: false, errorMessage: '查看详情需要提供技能 ID' };
-                    const response = await skillsService.get(skillId);
+                    const response = await skillsService.get(skillId, token);
                     if (!response.success)
                         return { success: false, errorMessage: response.error || '获取详情失败' };
                     // 表明该技能已被使用
                     const detailHubId = response.data?.templateId;
                     if (detailHubId) {
-                        skillHubService.use(detailHubId).catch((err) => logger.warn('技能使用记录失败:', err?.message));
+                        skillHubService.use(detailHubId, token).catch((err) => logger.warn('技能使用记录失败:', err?.message));
                     }
-                    const apikey = await skillsService.getApiKey(skillId);
+                    const apikey = await skillsService.getApiKey(skillId, token);
                     return { success: true, output: JSON.stringify({ skill: { ...response.data, apiKey: apikey.apiKey } }) };
                 }
                 case 'setApiKey': {
                     if (!skillId || !apiKey)
                         return { success: false, errorMessage: '设置 API Key 需要提供技能 ID 和 API Key' };
-                    const response = await skillsService.setApiKey(skillId, apiKey);
+                    const response = await skillsService.setApiKey(skillId, apiKey, token);
                     if (!response)
                         return { success: false, errorMessage: '设置失败' };
                     return { success: true };
@@ -84,7 +85,7 @@ export const skillTool = {
                         return { success: false, errorMessage: '评分需要提供 hubId 和评分（1-5）' };
                     if (rating < 1 || rating > 5)
                         return { success: false, errorMessage: '评分必须是 1-5 之间的整数' };
-                    const response = await skillHubService.rate(hubId, rating);
+                    const response = await skillHubService.rate(hubId, rating, token);
                     if (!response.success)
                         return { success: false, errorMessage: response.error || '评分失败' };
                     return { success: true };

package/dist/services/tools/task.js

@@ -1,6 +1,5 @@
-import { tasksService } from '../dataService';
-import { authStore } from '@/stores';
-import { validPlatformApplies, getPlatform } from '@pocketclaw/shared/dist/utils/system.js';
+import { tasksService } from '../dataService.js';
+import { validPlatformApplies, getPlatform } from '@myassis/shared/dist/utils/system.js';
 export const taskTool = {
     name: 'task',
     description: '任务管理工具',
@@ -32,7 +31,7 @@ export const taskTool = {
         },
         required: ['action'],
     },
-    handler: async (args) => {
+    handler: async (args, sessionId, messageId, userId) => {
         try {
             const { action, title, description, taskType, recurrenceRule, intervalValue, intervalUnit, startTime, endTime, scheduledAt, platformApply, status, taskId, newTitle, newDescription, newStatus, newRecurrenceRule, newScheduledAt } = args;
             switch (action) {
@@ -54,7 +53,6 @@ export const taskTool = {
                         createData.endTime = endTime;
                     if (scheduledAt)
                         createData.scheduledAt = scheduledAt;
-                    const userId = authStore.getUserId();
                     if (!userId) {
                         return { success: false, errorMessage: '未登录' };
                     }

package/dist/stores/authStore.js

@@ -5,14 +5,14 @@
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-import { getLogger } from '@pocketclaw/shared';
-import { sessionManager } from '@/services/session';
+import { getLogger } from '@myassis/shared';
+import { getSessionManager } from '@/services/session';
 const logger = getLogger('authStore');
 // 认证数据存储文件路径（使用应用数据目录，支持 STORAGE_DIR 环境变量）
-const AUTH_STORAGE_DIR = process.env.STORAGE_DIR || path.join(os.homedir(), 'myclaw-gateway-storage');
+const AUTH_STORAGE_DIR = process.env.STORAGE_DIR || path.join(os.homedir(), 'myassis-gateway-storage');
 const AUTH_STORAGE_FILE = path.join(AUTH_STORAGE_DIR, 'auth', 'auth.json');
 // 内存中的认证数据
-let auth = null;
+let authMap = null;
 // 确保存储目录存在
 function ensureStorageDir() {
     const dir = path.dirname(AUTH_STORAGE_FILE);
@@ -25,15 +25,9 @@ function loadFromFile() {
     try {
         if (fs.existsSync(AUTH_STORAGE_FILE)) {
             const data = fs.readFileSync(AUTH_STORAGE_FILE, 'utf-8');
-            const authData = JSON.parse(data);
-            // 检查 token 是否过期
-            if (authData.expiresAt && authData.expiresAt < Date.now()) {
-                logger.debug('Token expired, clearing...');
-                clearAuth();
-                return null;
-            }
+            const obj = JSON.parse(data);
             logger.debug('Auth data loaded from file');
-            return authData;
+            return new Map(Object.entries(obj));
         }
     }
     catch (error) {
@@ -42,10 +36,10 @@ function loadFromFile() {
     return null;
 }
 // 保存认证数据到本地文件
-function saveAuthToFile(authData) {
+function saveAuthToFile(authMap) {
     ensureStorageDir();
     try {
-        fs.writeFileSync(AUTH_STORAGE_FILE, JSON.stringify(authData, null, 2), 'utf-8');
+        fs.writeFileSync(AUTH_STORAGE_FILE, JSON.stringify(Object.fromEntries(authMap)), 'utf-8');
         logger.debug('Auth data saved to file');
     }
     catch (error) {
@@ -66,7 +60,7 @@ function clearAuthFile() {
 }
 // 清除认证数据
 function clearAuth() {
-    auth = null;
+    authMap = null;
     clearAuthFile();
 }
 /**
@@ -78,84 +72,75 @@ export const authStore = {
      * 应在 Gateway 启动时调用
      */
     load() {
-        auth = loadFromFile();
-        if (auth) {
-            logger.debug('Initialized with user:', auth.user.nickname);
-        }
-        else {
-            logger.debug('Initialized, no valid auth data');
+        authMap = loadFromFile();
+        if (authMap === null) {
+            authMap = new Map();
         }
     },
     /**
      * 保存认证数据（内存 + 本地）
      */
     save(authData) {
-        auth = authData;
-        saveAuthToFile(authData);
+        if (authMap === null) {
+            this.load();
+        }
+        authMap.set(authData.user.id, authData);
+        saveAuthToFile(authMap);
         // 用户登录后初始化 SessionManager
-        sessionManager.initialize();
+        getSessionManager(authData.user.id).initialize();
         logger.debug('Auth saved for user:', authData.user.nickname);
     },
+    //获取所有认证用户
+    getAll() {
+        if (authMap === null) {
+            this.load();
+        }
+        return authMap;
+    },
     /**
      * 获取当前认证数据
      */
-    get() {
-        return auth;
+    get(userId) {
+        return authMap.get(userId);
     },
     /**
      * 获取用户信息
      */
-    getUser() {
-        return auth?.user || null;
-    },
-    /**
-     * 获取 Token（自动检查过期）
-     */
-    getToken() {
-        if (!auth) {
-            return null;
-        }
-        // 检查是否过期（预留 60 秒缓冲时间）
-        if (auth.expiresAt && auth.expiresAt < Date.now() + 60000) {
-            logger.debug('Token expired');
-            return null;
-        }
-        return auth.token;
+    getUser(userId) {
+        return authMap.get(userId).user || null;
     },
     /**
      * 获取刷新 Token
      */
-    getRefreshToken() {
-        return auth?.refreshToken || null;
+    getRefreshToken(userId) {
+        return authMap.get(userId)?.refreshToken || null;
     },
     /**
      * 更新 Token
      */
     updateToken(token, expiresIn, refreshToken) {
-        if (auth) {
-            auth.token = token;
-            if (expiresIn) {
-                auth.expiresIn = expiresIn;
-                auth.expiresAt = Date.now() + expiresIn * 1000;
-            }
-            if (refreshToken) {
-                auth.refreshToken = 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');
             }
-            saveAuthToFile(auth);
-            logger.debug('Token updated');
         }
     },
     /**
      * 获取用户 ID
      */
-    getUserId() {
-        return auth?.user?.id || null;
-    },
-    /**
-     * 是否已认证
-     */
-    isAuthenticated() {
-        return this.getToken() !== null;
+    getUserId(token) {
+        if (authMap) {
+            return Array.from(authMap.values()).find(x => x.accessToken === token)?.user?.id || null;
+        }
+        else {
+            return null;
+        }
     },
     /**
      * 清除认证数据（内存 + 本地）
@@ -167,11 +152,12 @@ export const authStore = {
     /**
      * 更新用户信息
      */
-    updateUser(userData) {
-        if (auth) {
+    updateUser(token, userData) {
+        if (authMap) {
+            const auth = Array.from(authMap.values()).find(x => x.accessToken === token);
             auth.user = { ...auth.user, ...userData };
-            saveAuthToFile(auth);
-            logger.debug('User updated:', auth.user?.nickname || auth.user?.email);
+            saveAuthToFile(authMap);
+            logger.debug('User updated:', auth.user?.nickname || auth.user?.account);
         }
     },
 };

package/dist/stores/index.js

@@ -1,6 +1,6 @@
 /**
  * Gateway Stores 统一导出
  */
-export { memoryStore } from './memoryStore';
-export { persistStore } from './persistStore';
-export { authStore } from './authStore';
+export { memoryStore } from './memoryStore.js';
+export { persistStore } from './persistStore.js';
+export { authStore } from './authStore.js';

package/dist/stores/persistStore.js

@@ -5,10 +5,10 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('persistStore');
 // 存储文件路径（跨平台兼容）
-const STORAGE_DIR = process.env.STORAGE_DIR || path.join(os.homedir(), 'myclaw-gateway-storage');
+const STORAGE_DIR = process.env.STORAGE_DIR || path.join(os.homedir(), 'myassis-gateway-storage');
 const STORAGE_FILE = path.join(STORAGE_DIR, 'persist.json');
 // 确保存储目录存在
 function ensureStorageDir() {
@@ -312,6 +312,40 @@ export const persistStore = {
             writeStorage(storage);
         }
         return cleaned;
-    }
+    },
+    // ─── CORS 自定义域名 ────────────────────────────────
+    /**
+     * 获取所有自定义 CORS 域名
+     */
+    getCorsDomains() {
+        return this.get('corsDomains', []);
+    },
+    /**
+     * 添加自定义 CORS 域名
+     */
+    addCorsDomain(domain) {
+        const domains = this.getCorsDomains();
+        const normalized = domain.trim().toLowerCase();
+        if (!normalized)
+            return false;
+        if (domains.some(d => d.toLowerCase() === normalized))
+            return false; // 重复
+        domains.push(domain.trim());
+        this.set('corsDomains', domains);
+        return true;
+    },
+    /**
+     * 移除自定义 CORS 域名
+     */
+    removeCorsDomain(domain) {
+        const domains = this.getCorsDomains();
+        const normalized = domain.trim().toLowerCase();
+        const before = domains.length;
+        const filtered = domains.filter(d => d.toLowerCase() !== normalized);
+        if (filtered.length === before)
+            return false; // 不存在
+        this.set('corsDomains', filtered);
+        return true;
+    },
 };
 export default persistStore;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myassis/gateway",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "我的助手 Gateway Service - 本地 AI 网关服务，支持认证、WebSocket 实时通信和任务调度",
   "main": "dist/index.js",
   "type": "module",
@@ -9,7 +9,10 @@
     "gateway": "dist/index.js"
   },
   "files": [
-    "dist"
+    "dist",
+    "scripts",
+    "README.md",
+    "LICENSE"
   ],
   "exports": {
     ".": {
@@ -21,6 +24,7 @@
     "dev": "tsx watch src/index.ts",
     "start": "node dist/index.js",
     "build": "tsc",
+    "postbuild": "node scripts/fix-dist-imports.js",
     "pkg:win": "pkg . --targets node18-win-x64 --output myassis-gateway-win.exe",
     "pkg:linux": "pkg . --targets node18-linux-x64 --output myassis-gateway-linux",
     "pkg:all": "npm run pkg:win && npm run pkg:linux",
@@ -43,7 +47,7 @@
   },
   "dependencies": {
     "@nut-tree-fork/nut-js": "^4.2.0",
-    "@myassis/shared": "latest",
+    "@myassis/shared": "^1.0.0",
     "axios": "^1.15.2",
     "bcryptjs": "^2.4.3",
     "better-sqlite3": "^12.10.0",

package/scripts/fix-dist-imports.js

@@ -0,0 +1,95 @@
+#!/usr/bin/env node
+/**
+ * 修复 dist 目录中的 ES Module 导入
+ * 为所有本地导入添加 .js 扩展名
+ */
+
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const distDir = path.join(__dirname, '..', 'dist');
+
+// 递归处理所有 .js 文件
+function processFile(filePath) {
+  let content = fs.readFileSync(filePath, 'utf8');
+  let modified = false;
+  
+  // 匹配 import 和 export ... from 语句
+  // 匹配模式：from './xxx' 或 from '../xxx'（不包含协议、不为 / 开头、不包含 .js）
+  const importRegex = /(?:import|export)\s+(?:[\w*{}\s,]+from\s+)?['"](\.\.?\/[^'"]+)['"]/g;
+  
+  let match;
+  while ((match = importRegex.exec(content)) !== null) {
+    const importPath = match[1];
+    
+    // 跳过已经有扩展名的
+    if (importPath.endsWith('.js') || importPath.endsWith('.json') || importPath.endsWith('.ts')) {
+      continue;
+    }
+    
+    // 跳过 node_modules 中的包（不包含 . 或 .. 开头的）
+    if (!importPath.startsWith('./') && !importPath.startsWith('../')) {
+      continue;
+    }
+    
+    // 添加 .js 扩展名
+    const newImportPath = importPath + '.js';
+    content = content.replace(
+      new RegExp(`['"]${importPath}['"]`, 'g'),
+      `'${newImportPath}'`
+    );
+    modified = true;
+    
+    console.log(`  Fixed: ${importPath} -> ${newImportPath}`);
+  }
+  
+  if (modified) {
+    fs.writeFileSync(filePath, content, 'utf8');
+    return true;
+  }
+  
+  return false;
+}
+
+// 递归查找并处理所有 .js 文件
+function processDirectory(dir) {
+  let fixedCount = 0;
+  
+  const items = fs.readdirSync(dir);
+  
+  items.forEach(item => {
+    const itemPath = path.join(dir, item);
+    const stat = fs.statSync(itemPath);
+    
+    if (stat.isDirectory()) {
+      fixedCount += processDirectory(itemPath);
+    } else if (item.endsWith('.js')) {
+      if (processFile(itemPath)) {
+        fixedCount++;
+      }
+    }
+  });
+  
+  return fixedCount;
+}
+
+// 主函数
+function main() {
+  console.log('🔧 修复 dist 目录中的 ES Module 导入...');
+  console.log(`目录: ${distDir}\n`);
+  
+  if (!fs.existsSync(distDir)) {
+    console.error('❌ dist 目录不存在！请先运行 npm run build');
+    process.exit(1);
+  }
+  
+  const fixedCount = processDirectory(distDir);
+  
+  console.log(`\n✅ 完成！修复了 ${fixedCount} 个文件`);
+}
+
+main();

package/scripts/fix-imports.js

@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+/**
+ * 自动修复 ES Module 导入的扩展名
+ * 在 TypeScript 文件中，所有本地导入必须包含 .js 扩展名
+ */
+
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// 递归查找所有 .ts 文件（排除 .d.ts）
+function findTsFiles(dir) {
+  let results = [];
+  const list = fs.readdirSync(dir);
+  
+  list.forEach(file => {
+    const filePath = path.join(dir, file);
+    const stat = fs.statSync(filePath);
+    
+    if (stat && stat.isDirectory()) {
+      // 跳过 node_modules 和 dist
+      if (file !== 'node_modules' && file !== 'dist' && file !== '.git') {
+        results = results.concat(findTsFiles(filePath));
+      }
+    } else if (file.endsWith('.ts') && !file.endsWith('.d.ts')) {
+      results.push(filePath);
+    }
+  });
+  
+  return results;
+}
+
+// 修复文件中的导入语句
+function fixImports(filePath) {
+  let content = fs.readFileSync(filePath, 'utf8');
+  let modified = false;
+  
+  // 匹配 import 语句中的本地文件路径（以 ./ 或 ../ 开头，且不以 .js 或 .ts 结尾）
+  const importRegex = /from\s+['"](\.\.?\/[^'"]+)['"]/g;
+  
+  content = content.replace(importRegex, (match, importPath) => {
+    // 如果已经以 .js 或 .ts 结尾，跳过
+    if (importPath.endsWith('.js') || importPath.endsWith('.ts')) {
+      return match;
+    }
+    
+    // 添加 .js 扩展名
+    modified = true;
+    return `from '${importPath}.js'`;
+  });
+  
+  if (modified) {
+    fs.writeFileSync(filePath, content, 'utf8');
+    console.log(`✓ Fixed: ${path.relative(process.cwd(), filePath)}`);
+    return true;
+  }
+  
+  return false;
+}
+
+// 主函数
+function main() {
+  const srcDir = path.join(__dirname, '..', 'src');
+  
+  console.log('🔍 查找 TypeScript 文件...');
+  const tsFiles = findTsFiles(srcDir);
+  console.log(`找到 ${tsFiles.length} 个文件\n`);
+  
+  console.log('🔧 修复导入语句...');
+  let fixedCount = 0;
+  
+  tsFiles.forEach(file => {
+    if (fixImports(file)) {
+      fixedCount++;
+    }
+  });
+  
+  console.log(`\n✅ 完成！修复了 ${fixedCount} 个文件`);
+  
+  if (fixedCount > 0) {
+    console.log('\n⚠️  请运行以下命令验证修改：');
+    console.log('  npm run build');
+    console.log('  node dist/index.js');
+  }
+}
+
+main();

package/scripts/postbuild.js

@@ -0,0 +1,39 @@
+#!/usr/bin/env node
+import fs from 'fs';
+import path from 'path';
+
+const files = [
+  path.join(process.cwd(), 'dist/index.js'),
+  // 如果有其他 CLI 入口文件，也添加到这里
+];
+
+files.forEach(filePath => {
+  if (!fs.existsSync(filePath)) {
+    console.warn(`Warning: ${filePath} does not exist, skipping...`);
+    return;
+  }
+
+  let content = fs.readFileSync(filePath, 'utf8');
+  
+  // 检查是否已有 shebang
+  if (!content.startsWith('#!/usr/bin/env node')) {
+    // 添加 shebang
+    content = '#!/usr/bin/env node\n' + content;
+    fs.writeFileSync(filePath, content, 'utf8');
+    console.log(`✓ Added shebang to ${path.relative(process.cwd(), filePath)}`);
+  } else {
+    console.log(`✓ Shebang already exists in ${path.relative(process.cwd(), filePath)}`);
+  }
+  
+  // 设置可执行权限（Unix/Linux/macOS）
+  if (process.platform !== 'win32') {
+    try {
+      fs.chmodSync(filePath, '755');
+      console.log(`✓ Set executable permission for ${path.relative(process.cwd(), filePath)}`);
+    } catch (err) {
+      console.warn(`Warning: Could not set executable permission for ${filePath}`);
+    }
+  }
+});
+
+console.log('\n✓ Postbuild script completed!');