@myassis/gateway 1.0.2 → 1.0.4

package/dist/index.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import express from 'express';
 import cors from 'cors';
 import helmet from 'helmet';

package/dist/middleware/auth.js

@@ -3,7 +3,7 @@
  * 从请求头 Authorization: Bearer <token> 解码 JWT，提取 userId
  * 同时保留原始 token 供路由转发给 Server
  */
-import { authStore } from '@/stores';
+import { authStore } from '..\stores.js';
 import { getLogger } from '@myassis/shared';
 const logger = getLogger('middleware/auth');
 const JWT_SECRET = process.env.JWT_SECRET || 'your-secret-key-change-in-production';

package/dist/routes/agent.js

@@ -1,12 +1,12 @@
 import { Router } from 'express';
-import { requireAuth } from '@/middleware/auth.js';
-import { runWithToken } from '@/api/index.js';
-import { getSessionManager } from '@/services/session';
-import { initAgentManager, agentManagerMap } from '@/services/agent/AgentManager';
-import { AgentStore } from '@/services/agent/AgentStore';
+import { requireAuth } from '..\middleware\auth.js';
+import { runWithToken } from '..\api\index.js';
+import { getSessionManager } from '..\services\session.js';
+import { initAgentManager, agentManagerMap } from '..\services\agent\AgentManager.js';
+import { AgentStore } from '..\services\agent\AgentStore.js';
 import { getLogger } from '@myassis/shared';
 const logger = getLogger('AgentRoutes');
-import { sessionStore } from '@/services/session/SessionStore';
+import { sessionStore } from '..\services\session\SessionStore.js';
 const router = Router();
 // 所有路由需要认证
 router.use(requireAuth, (req, _res, next) => {

package/dist/routes/upload.js

@@ -1,8 +1,8 @@
 import { Router } from 'express';
 import multer from 'multer';
-import { appConfig } from '@/config/index.js';
-import { requireAuth } from '@/middleware/auth.js';
-import { runWithToken } from '@/api/index.js';
+import { appConfig } from '..\config\index.js';
+import { requireAuth } from '..\middleware\auth.js';
+import { runWithToken } from '..\api\index.js';
 import { getLogger } from '@myassis/shared';
 const logger = getLogger('UploadRoutes');
 const router = Router();

package/dist/services/TaskSchedulerService.js

@@ -8,7 +8,7 @@ import { webSocketService } from './WebSocketService';
 import { getSessionManager } from './session';
 import { getLogger, getUTCTimeKey, formatUTCForLog, holidayService } from '@myassis/shared';
 import { tasksService } from './dataService';
-import { authStore } from '@/stores';
+import { authStore } from '..\stores.js';
 const logger = getLogger('TaskSchedulerService');
 const EXPIRED_THRESHOLD = 60 * 60 * 1000; // 1小时
 const CHECK_INTERVAL = 60 * 1000; // 1分钟

package/dist/services/TaskService.js

@@ -7,7 +7,7 @@
  * - platformApply === currentPlatform → 本地 SQLite 存储（localTaskService）
  * - platformApply !== currentPlatform → 服务器 API（tasksApi）
  */
-import { authStore } from '@/stores';
+import { authStore } from '..\stores.js';
 import { tasksApi } from '../api';
 import { localTaskService } from './LocalTaskService';
 import { getLogger } from '@myassis/shared';

package/dist/services/agent/AgentManager.js

@@ -1,9 +1,9 @@
 import { v4 as uuidv4 } from 'uuid';
 import { Agent } from './Agent';
 import { getSessionManager } from '../session/SessionManager';
-import { authStore } from '@/stores/authStore';
+import { authStore } from '..\..\stores\authStore.js';
 import { getLogger } from '@myassis/shared';
-import appConfig from '@/config';
+import appConfig from '..\..\config.js';
 const logger = getLogger('AgentManager');
 /**
  * AgentManager - Business logic layer

package/dist/services/llm/LLMClient.js

@@ -1,4 +1,4 @@
-import { persistStore } from "@/stores";
+import { persistStore } from '..\..\stores.js';
 import { getLogger } from '@myassis/shared';
 import fs from 'fs/promises';
 const logger = getLogger('LLMClient');

package/dist/services/memory/MemoryManager.js

@@ -2,9 +2,9 @@ import { getLogger } from '@myassis/shared';
 const logger = getLogger('MemoryManager');
 import { toModel } from '../models';
 import { modelsService } from '../dataService';
-import { authStore } from '@/stores';
+import { authStore } from '..\..\stores.js';
 import { LLMClient } from '../llm/LLMClient';
-import { appConfig } from '@/config';
+import { appConfig } from '..\..\config.js';
 const DEFAULT_CONFIG = {
     summaryThreshold: 10,
     enabled: true,

package/dist/services/session/Session.js

@@ -1,15 +1,15 @@
 import { v4 as uuidv4 } from 'uuid';
 import { getLogger } from '@myassis/shared';
 import { SessionStore } from './SessionStore';
-import { AgentStore } from '@/services/agent/AgentStore';
-import { authStore } from '@/stores/authStore';
-import { toModel } from '@/services/models';
-import { executeTool, getToolDefinitions } from '@/services/tools';
+import { AgentStore } from '..\agent\AgentStore.js';
+import { authStore } from '..\..\stores\authStore.js';
+import { toModel } from '..\models.js';
+import { executeTool, getToolDefinitions } from '..\tools.js';
 import { getSystemPromptAsync } from '../systemPrompt';
 import { LLMClient, parseAruments } from '../llm/LLMClient';
-import { modelsService, settingsService } from '@/services/dataService';
+import { modelsService, settingsService } from '..\dataService.js';
 import { MemoryManager } from '../memory/MemoryManager';
-import { appConfig } from '@/config';
+import { appConfig } from '..\..\config.js';
 import { getSessionManager } from './SessionManager';
 const logger = getLogger('Session');
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));

package/dist/services/session/SessionManager.js

@@ -2,7 +2,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { getLogger } from '@myassis/shared';
 const logger = getLogger('SessionManager');
 import { sessionStore } from './SessionStore';
-import { authStore } from '@/stores/authStore';
+import { authStore } from '..\..\stores\authStore.js';
 import { Session } from './Session';
 /**
  * SessionManager - Business logic layer

package/dist/services/systemPrompt.js

@@ -1,4 +1,4 @@
-import { authStore } from '@/stores';
+import { authStore } from '..\stores.js';
 import os from 'os';
 import { settingsService, skillsService } from './dataService';
 import { getLogger } from '@myassis/shared';

package/dist/services/tools/model.js

@@ -1,5 +1,5 @@
 import { modelsService } from '../dataService';
-import { authStore } from '@/stores';
+import { authStore } from '..\..\stores.js';
 export const modelTool = {
     name: 'model',
     description: '模型管理工具',

package/dist/services/tools/skill.js

@@ -1,5 +1,5 @@
 import { skillsService, skillHubService } from '../dataService';
-import { authStore, persistStore } from '@/stores';
+import { authStore, persistStore } from '..\..\stores.js';
 import { getLogger } from '@myassis/shared';
 const logger = getLogger('skill');
 export const skillTool = {

package/dist/stores/authStore.js

@@ -6,7 +6,7 @@ import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import { getLogger } from '@myassis/shared';
-import { getSessionManager } from '@/services/session';
+import { getSessionManager } from '../services/session/index.js';
 const logger = getLogger('authStore');
 // 认证数据存储文件路径（使用应用数据目录，支持 STORAGE_DIR 环境变量）
 const AUTH_STORAGE_DIR = process.env.STORAGE_DIR || path.join(os.homedir(), 'myassis-gateway-storage');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myassis/gateway",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "我的助手 Gateway Service - 本地 AI 网关服务，支持认证、WebSocket 实时通信和任务调度",
   "main": "dist/index.js",
   "type": "module",
@@ -24,7 +24,7 @@
     "dev": "tsx watch src/index.ts",
     "start": "node dist/index.js",
     "build": "tsc",
-    "postbuild": "node scripts/postbuild.js",
+    "postbuild": "node scripts/fix-dist-aliases.js && 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,11 +43,11 @@
   "homepage": "https://github.com/myassis/myassis#readme",
   "repository": {
     "type": "git",
-    "url": "https://github.com/myassis/myassis.git"
+    "url": "git+https://github.com/myassis/myassis.git"
   },
   "dependencies": {
     "@nut-tree-fork/nut-js": "^4.2.0",
-    "@myassis/shared": "^1.0.0",
+    "@myassis/shared": "latest",
     "axios": "^1.15.2",
     "bcryptjs": "^2.4.3",
     "better-sqlite3": "^12.10.0",

package/scripts/fix-dist-aliases.js

@@ -0,0 +1,107 @@
+#!/usr/bin/env node
+/**
+ * 后处理 dist 目录，将 @/ 路径别名替换为相对路径
+ */
+
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { execSync } from 'child_process';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const distDir = path.join(__dirname, '..', 'dist');
+const srcDir = path.join(__dirname, '..', 'src');
+
+// 获取从当前文件到 @/ 模块的相对路径
+function resolveAliasToRelative(filePath, aliasPath) {
+  // aliasPath: @/services/session
+  // 转换为相对于 src 的路径
+  const targetPath = aliasPath.replace(/^@\//, '');
+  const targetFullPath = path.resolve(srcDir, targetPath);
+  
+  // 计算从当前 dist 文件到目标 dist 文件的相对路径
+  const currentDistFile = filePath; // filePath 已经在 dist 中
+  const targetDistPath = targetFullPath.replace(srcDir, distDir);
+  
+  let relativePath = path.relative(path.dirname(currentDistFile), targetDistPath);
+  
+  // 确保使用正斜杠（ES Modules 要求）
+  relativePath = relativePath.replace(/\\/g, '/');
+  
+  // 确保以 ./ 或 ../ 开头
+  if (!relativePath.startsWith('.')) {
+    relativePath = './' + relativePath;
+  }
+  
+  // 添加 .js 扩展名
+  if (!relativePath.endsWith('.js')) {
+    relativePath += '.js';
+  }
+  
+  return relativePath;
+}
+
+// 处理单个文件
+function processFile(filePath) {
+  let content = fs.readFileSync(filePath, 'utf8');
+  let modified = false;
+  
+  // 匹配 import ... from '@/...' 或 export ... from '@/...'
+  const importRegex = /(import|export)\s+(.+?)\s+from\s+['"]@\/([^'"]+)['"]/g;
+  
+  content = content.replace(importRegex, (match, keyword, imports, modulePath) => {
+    const relativePath = resolveAliasToRelative(filePath, '@/' + modulePath);
+    modified = true;
+    return `${keyword} ${imports} from '${relativePath}'`;
+  });
+  
+  if (modified) {
+    fs.writeFileSync(filePath, content, 'utf8');
+    return true;
+  }
+  
+  return false;
+}
+
+// 递归处理目录
+function processDirectory(dir) {
+  let fixedCount = 0;
+  
+  const items = fs.readdirSync(dir, { withFileTypes: true });
+  
+  for (const item of items) {
+    const itemPath = path.join(dir, item.name);
+    
+    if (item.isDirectory()) {
+      // 跳过 node_modules（如果在 dist 中）
+      if (item.name !== 'node_modules') {
+        fixedCount += processDirectory(itemPath);
+      }
+    } else if (item.name.endsWith('.js')) {
+      if (processFile(itemPath)) {
+        fixedCount++;
+      }
+    }
+  }
+  
+  return fixedCount;
+}
+
+// 主函数
+function main() {
+  console.log('🔧 修复 dist 目录中的 @/ 路径别名...\n');
+  console.log(`Dist 目录: ${distDir}\n`);
+  
+  if (!fs.existsSync(distDir)) {
+    console.error('❌ dist 目录不存在！请先运行 tsc');
+    process.exit(1);
+  }
+  
+  const fixedCount = processDirectory(distDir);
+  
+  console.log(`\n✅ 完成！修复了 ${fixedCount} 个文件`);
+}
+
+main();

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/fix-path-aliases.js

@@ -0,0 +1,95 @@
+#!/usr/bin/env node
+/**
+ * 将 @/ 路径别名转换为相对路径
+ */
+
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const srcDir = path.join(__dirname, '..', 'src');
+
+// 计算从当前文件到目标文件的相对路径
+function getRelativePath(fromFile, toPath) {
+  // toPath 例如：@/services/agent/AgentManager
+  // 转换为：src/services/agent/AgentManager
+  const targetPath = toPath.replace(/^@\//, '');
+  const targetFullPath = path.join(srcDir, targetPath);
+  
+  // 计算相对路径
+  let relativePath = path.relative(path.dirname(fromFile), targetFullPath);
+  
+  // 确保以 ./ 或 ../ 开头
+  if (!relativePath.startsWith('.')) {
+    relativePath = './' + relativePath;
+  }
+  
+  return relativePath;
+}
+
+// 修复文件中的 @/ 导入
+function fixFile(filePath) {
+  let content = fs.readFileSync(filePath, 'utf8');
+  let modified = false;
+  
+  // 匹配 import ... from '@/...' 或 export ... from '@/...'
+  const importRegex = /(import|export)\s+(.+?)\s+from\s+['"]@\/([^'"]+)['"]/g;
+  
+  content = content.replace(importRegex, (match, keyword, imports, modulePath) => {
+    const relativePath = getRelativePath(filePath, '@/' + modulePath);
+    // 添加 .js 扩展名
+    const newPath = relativePath + '.js';
+    modified = true;
+    return `${keyword} ${imports} from '${newPath}'`;
+  });
+  
+  if (modified) {
+    fs.writeFileSync(filePath, content, 'utf8');
+    console.log(`✓ Fixed: ${path.relative(process.cwd(), filePath)}`);
+    return true;
+  }
+  
+  return false;
+}
+
+// 递归处理所有 .ts 文件
+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()) {
+      // 跳过 node_modules 和 dist
+      if (item !== 'node_modules' && item !== 'dist' && item !== '.git') {
+        fixedCount += processDirectory(itemPath);
+      }
+    } else if (item.endsWith('.ts') && !item.endsWith('.d.ts')) {
+      if (fixFile(itemPath)) {
+        fixedCount++;
+      }
+    }
+  });
+  
+  return fixedCount;
+}
+
+// 主函数
+function main() {
+  console.log('🔧 将 @/ 路径别名转换为相对路径...\n');
+  
+  const fixedCount = processDirectory(srcDir);
+  
+  console.log(`\n✅ 完成！修复了 ${fixedCount} 个文件`);
+  console.log('\n⚠️  请运行以下命令验证：');
+  console.log('  npm run build');
+  console.log('  node dist/index.js');
+}
+
+main();