@myassis/gateway 1.0.21 → 1.0.23

package/dist/config/index.js

@@ -34,6 +34,9 @@ const fs = __importStar(require("fs"));
  * dist/config/index.js → 上三级 = 包根目录
  */
 function getPackageRootDir() {
+    if (process.pkg) {
+        return path.dirname(process.execPath);
+    }
     return path.resolve(__dirname, '..', '..');
 }
 const getEnvPath = () => {
@@ -42,7 +45,16 @@ const getEnvPath = () => {
     if (fs.existsSync(cwdEnvPath)) {
         return cwdEnvPath;
     }
-    // 2. 包安装目录（随包发布的默认 .env）
+    // 2. pkg 环境：从 snapshot 虚拟路径读取打包的 .env
+    if (process.pkg) {
+        // __dirname 在 pkg 中指向 /snapshot/pocketclaw/gateway/dist/config
+        // 打包的 .env 在 /snapshot/pocketclaw/gateway/dist/.env
+        const snapshotEnvPath = path.resolve(__dirname, '..', '.env');
+        if (fs.existsSync(snapshotEnvPath)) {
+            return snapshotEnvPath;
+        }
+    }
+    // 3. 包安装目录（随包发布的默认 .env）
     const pkgEnvPath = path.join(getPackageRootDir(), 'dist', '.env');
     if (fs.existsSync(pkgEnvPath)) {
         return pkgEnvPath;

package/dist/main.js

@@ -159,6 +159,7 @@ else {
             }
             // 内网地址正则
             const lanPatterns = [
+                /^http:\/\/tauri.localhost(:\d+)?$/,
                 /^http:\/\/localhost(:\d+)?$/,
                 /^http:\/\/127\.\d+\.\d+\.\d+(:\d+)?$/,
                 /^http:\/\/10\.\d+\.\d+\.\d+(:\d+)?$/,

package/dist/routes/agent.js

@@ -433,8 +433,8 @@ router.post('/sessions/:sessionId/stream', ensureAgentManager, async (req, res)
         const userId = req.userId;
         const { sessionId } = req.params;
         const { content, attachments, userMessageId, assistantMessageId } = req.body;
-        if (!content) {
-            return res.status(400).json({ success: false, error: 'Content is required' });
+        if (!content && attachments.length === 0) {
+            return res.status(400).json({ success: false, error: 'Content or attachments are required' });
         }
         // Find session directly
         const session = (0, index_js_2.getSessionManager)(userId).getSession(sessionId);

package/dist/services/ServiceManager.js

@@ -9,11 +9,19 @@ const util_1 = require("util");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const axios_1 = __importDefault(require("axios"));
+const shared_1 = require("@myassis/shared");
+const os_1 = __importDefault(require("os"));
+const logger = (0, shared_1.getLogger)('ServiceManager');
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 exports.SERVICE_NAME = 'myassis-gateway';
 exports.SERVICE_DISPLAY_NAME = '我的助手 Desktop Gateway Service';
 // ─── 平台无关工具 ────────────────────────────────────────────
+function isPackagedExe() {
+    return !!process.pkg;
+}
 function getServiceScript() {
+    if (isPackagedExe())
+        return '';
     // npm install -g 后，用当前模块位置定位包目录
     const pkgRoot = path_1.default.resolve(__dirname, '..', '..');
     return path_1.default.join(pkgRoot, 'dist', 'index.js');
@@ -21,10 +29,34 @@ function getServiceScript() {
 function getNodeExec() {
     return process.execPath;
 }
+function getNssmPath() {
+    // 1. 优先：exe 同目录下有 nssm.exe
+    const alongside = path_1.default.join(path_1.default.dirname(process.execPath), 'nssm.exe');
+    if (fs_1.default.existsSync(alongside))
+        return alongside;
+    // 2. pkg 运行时从包内虚拟文件系统提取 nssm.exe 到临时目录
+    if (isPackagedExe()) {
+        const tmpPath = path_1.default.join(os_1.default.tmpdir(), 'myassis-nssm.exe');
+        if (!fs_1.default.existsSync(tmpPath)) {
+            try {
+                const bundledPath = path_1.default.join(__dirname, '..', '..', 'nssm.exe');
+                const data = fs_1.default.readFileSync(bundledPath);
+                fs_1.default.writeFileSync(tmpPath, data);
+                logger.info(`Extracted nssm.exe to ${tmpPath}`);
+            }
+            catch (e) {
+                logger.warn(`Failed to extract nssm.exe: ${e.message}`);
+                return '';
+            }
+        }
+        return tmpPath;
+    }
+    return '';
+}
 // ─── Windows 实现 ───────────────────────────────────────────
 async function queryServiceWindows() {
     try {
-        const { stdout } = await execAsync(`sc query ${exports.SERVICE_NAME}`, { timeout: 5000 });
+        const { stdout } = await execAsync(`sc.exe query ${exports.SERVICE_NAME}`, { timeout: 5000 });
         return { installed: true, running: stdout.includes('RUNNING') };
     }
     catch {
@@ -32,23 +64,35 @@ async function queryServiceWindows() {
     }
 }
 async function installWindows() {
+    const isPkg = isPackagedExe();
     const script = getServiceScript();
-    const workDir = path_1.default.dirname(script);
-    const nodeExe = getNodeExec();
+    const exe = getNodeExec();
+    const workDir = isPkg ? path_1.default.dirname(exe) : path_1.default.dirname(script);
+    logger.info(`isPkg=${isPkg}, exe=${exe}, script=${script}, workDir=${workDir}`);
     const { installed } = await queryServiceWindows();
     if (installed)
-        await stopService();
-    const nssmPath = path_1.default.join(path_1.default.dirname(process.execPath), 'nssm.exe');
-    const useNssm = fs_1.default.existsSync(nssmPath);
+        await uninstallWindows();
+    const nssmPath = getNssmPath();
+    const useNssm = !!nssmPath && fs_1.default.existsSync(nssmPath);
     try {
         if (useNssm) {
-            await execAsync(`"${nssmPath}" install ${exports.SERVICE_NAME} "${nodeExe}" "${script}"`, { timeout: 15000, cwd: workDir });
+            if (isPkg) {
+                await execAsync(`"${nssmPath}" install ${exports.SERVICE_NAME} "${exe}"`, { timeout: 15000, cwd: workDir });
+            }
+            else {
+                await execAsync(`"${nssmPath}" install ${exports.SERVICE_NAME} "${exe}" "${script}"`, { timeout: 15000, cwd: workDir });
+            }
             await execAsync(`"${nssmPath}" set ${exports.SERVICE_NAME} AppDirectory "${workDir}"`, { timeout: 10000 });
             await execAsync(`"${nssmPath}" set ${exports.SERVICE_NAME} DisplayName "${exports.SERVICE_DISPLAY_NAME}"`, { timeout: 10000 });
             await execAsync(`"${nssmPath}" set ${exports.SERVICE_NAME} Start SERVICE_AUTO_START`, { timeout: 10000 });
         }
         else {
-            await execAsync(`sc create ${exports.SERVICE_NAME} binPath= "\\"${nodeExe}\\" \\"${script}\\"" DisplayName= "${exports.SERVICE_DISPLAY_NAME}" start= auto`, { timeout: 15000 });
+            if (isPkg) {
+                await execAsync(`sc.exe create ${exports.SERVICE_NAME} binPath= "\\"${exe}\\"" DisplayName= "${exports.SERVICE_DISPLAY_NAME}" start= auto`, { timeout: 15000 });
+            }
+            else {
+                await execAsync(`sc.exe create ${exports.SERVICE_NAME} binPath= "\\"${exe}\\" \\"${script}\\"" DisplayName= "${exports.SERVICE_DISPLAY_NAME}" start= auto`, { timeout: 15000 });
+            }
         }
         await startService();
         return { success: true, message: '服务安装并启动成功' };
@@ -60,12 +104,12 @@ async function installWindows() {
 async function uninstallWindows() {
     try {
         await stopService();
-        const nssmPath = path_1.default.join(path_1.default.dirname(process.execPath), 'nssm.exe');
-        if (fs_1.default.existsSync(nssmPath)) {
+        const nssmPath = getNssmPath();
+        if (nssmPath && fs_1.default.existsSync(nssmPath)) {
             await execAsync(`"${nssmPath}" remove ${exports.SERVICE_NAME} confirm`, { timeout: 10000 });
         }
         else {
-            await execAsync(`sc delete ${exports.SERVICE_NAME}`, { timeout: 10000 });
+            await execAsync(`sc.exe delete ${exports.SERVICE_NAME}`, { timeout: 10000 });
         }
         return { success: true, message: '服务卸载成功' };
     }
@@ -75,7 +119,7 @@ async function uninstallWindows() {
 }
 async function startServiceWindows() {
     try {
-        await execAsync(`sc start ${exports.SERVICE_NAME}`, { timeout: 10000 });
+        await execAsync(`sc.exe start ${exports.SERVICE_NAME}`, { timeout: 10000 });
         return { success: true, message: '服务启动成功' };
     }
     catch (err) {
@@ -83,7 +127,7 @@ async function startServiceWindows() {
     }
 }
 async function restartServiceWindows() {
-    const nssmPath = path_1.default.join(path_1.default.dirname(process.execPath), 'nssm.exe');
+    const nssmPath = getNssmPath();
     // 无 nssm 时需要用户手动更新
     if (!fs_1.default.existsSync(nssmPath)) {
         const info = await getServiceInfo();
@@ -109,7 +153,7 @@ async function restartServiceWindows() {
 }
 async function stopServiceWindows() {
     try {
-        await execAsync(`sc stop ${exports.SERVICE_NAME}`, { timeout: 10000 });
+        await execAsync(`sc.exe stop ${exports.SERVICE_NAME}`, { timeout: 10000 });
         return { success: true, message: '服务停止成功' };
     }
     catch (err) {
@@ -136,28 +180,30 @@ async function queryServiceLinux() {
     }
 }
 async function installLinux() {
+    const isPkg = isPackagedExe();
     const script = getServiceScript();
-    const workDir = path_1.default.dirname(script);
-    const nodeExe = getNodeExec();
+    const exe = getNodeExec();
+    const workDir = isPkg ? path_1.default.dirname(exe) : path_1.default.dirname(script);
     try {
         const { installed } = await queryServiceLinux();
         if (installed)
             await stopService();
-        const unitContent = `[Unit]
-Description=${exports.SERVICE_DISPLAY_NAME}
-After=network.target
-
-[Service]
-Type=simple
-User=${process.env.USER || 'root'}
-WorkingDirectory=${workDir}
-ExecStart=${nodeExe} ${script}
-Restart=always
-RestartSec=5
-Environment=NODE_ENV=production
-
-[Install]
-WantedBy=multi-user.target
+        const execStart = isPkg ? exe : `${exe} ${script}`;
+        const unitContent = `[Unit]
+Description=${exports.SERVICE_DISPLAY_NAME}
+After=network.target
+
+[Service]
+Type=simple
+User=${process.env.USER || 'root'}
+WorkingDirectory=${workDir}
+ExecStart=${execStart}
+Restart=always
+RestartSec=5
+Environment=NODE_ENV=production
+
+[Install]
+WantedBy=multi-user.target
 `;
         await fs_1.default.promises.writeFile('/tmp/myassis-gateway.service', unitContent, 'utf8');
         await execAsync('cp /tmp/myassis-gateway.service /etc/systemd/system/myassis-gateway.service', { timeout: 10000 });

package/dist/services/llm/LLMClient.js

@@ -400,7 +400,7 @@ class LLMClient {
             }
             const tokens = JSON.stringify(body).length;
             logger.debug('tokens', tokens);
-            if (tokens > 200000) {
+            if (tokens > 200000 && !existAttachments) {
                 logger.warn('message is too large and has writen to the file debug.json');
                 await promises_1.default.writeFile('debug.json', JSON.stringify(body.messages), 'utf-8');
                 throw Error('exceed max message tokens');

package/dist/services/session/Session.js

@@ -110,8 +110,22 @@ class Session {
         // 将附件统一为 Attachment 对象格式
         const normalizedAttachments = (attachments || []).map((att) => {
             if (typeof att === 'string') {
-                // URL 字符串格式，转换为对象
+                // 可能是 base64 data URL 或普通 URL
                 const url = att;
+                const mimeMatch = url.match(/^data:([^;]+)/);
+                if (mimeMatch) {
+                    // base64 data URL: 从 MIME 识别类型
+                    const mime = mimeMatch[1];
+                    let type = 'file';
+                    if (mime.startsWith('image/'))
+                        type = 'image';
+                    else if (mime.startsWith('video/'))
+                        type = 'video';
+                    else if (mime.startsWith('audio/'))
+                        type = 'audio';
+                    return { type, name: 'attachment', url };
+                }
+                // 普通 URL: 从后缀识别类型
                 const name = url.split('/').pop().split('?')[0] || 'attachment';
                 const ext = name.split('.').pop()?.toLowerCase() || '';
                 const imageExts = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp', 'svg'];
@@ -127,10 +141,22 @@ class Session {
                 return { type, name, url };
             }
             // 已经是对象格式，确保有必要字段
+            const url = att.url || att.uri || '';
+            const mimeMatch = url.match(/^data:([^;]+)/);
+            let type = att.type || 'file';
+            if (!att.type && mimeMatch) {
+                const mime = mimeMatch[1];
+                if (mime.startsWith('image/'))
+                    type = 'image';
+                else if (mime.startsWith('video/'))
+                    type = 'video';
+                else if (mime.startsWith('audio/'))
+                    type = 'audio';
+            }
             return {
-                type: att.type || 'file',
+                type,
                 name: att.name || 'attachment',
-                url: att.url || att.uri || '',
+                url,
                 size: att.size,
                 mimeType: att.mimeType,
             };

package/dist/services/session/SessionStore.js

@@ -15,6 +15,12 @@ const logger = (0, shared_1.getLogger)('SessionStore');
  * 用 __dirname 定位，比 process.execPath 可靠
  */
 function getPackageRootDir() {
+    // pkg 打包后 __dirname 是 /snapshot/... 虚拟路径，无法写文件
+    // 用 process.pkg 判断是否在 pkg 环境中
+    if (process.pkg) {
+        // process.execPath 指向二进制文件本身，取其所在目录
+        return path_1.default.dirname(process.execPath);
+    }
     // dist/services/session/SessionStore.js → 包根目录
     return path_1.default.resolve(__dirname, '..', '..', '..');
 }
@@ -33,6 +39,13 @@ function getDbPath() {
 }
 exports.getDbPath = getDbPath;
 function getMigrationsDir() {
+    // pkg 环境：从 snapshot 虚拟路径读取打包的 migrations
+    if (process.pkg) {
+        const snapshotMigrations = path_1.default.resolve(__dirname, '..', '..', '..', 'migrations');
+        if (fs_1.default.existsSync(snapshotMigrations)) {
+            return snapshotMigrations;
+        }
+    }
     // migrations 随包发布，从包安装目录读取
     const pkgMigrations = path_1.default.join(getPackageRootDir(), 'migrations');
     if (fs_1.default.existsSync(pkgMigrations)) {

package/dist/services/tools/search.js

@@ -22,13 +22,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchTool = void 0;
 // @ts-ignore
-const got_1 = __importDefault(require("got"));
+const undici_1 = require("undici");
 const cheerio = __importStar(require("cheerio"));
 exports.searchTool = {
     name: 'search',
@@ -44,14 +41,15 @@ exports.searchTool = {
     handler: async (args) => {
         try {
             const { query, limit = 5 } = args;
-            const response = await (0, got_1.default)(`https://cn.bing.com/search?q=${encodeURIComponent(query)}`, {
+            const response = await (0, undici_1.fetch)(`https://cn.bing.com/search?q=${encodeURIComponent(query)}`, {
                 headers: {
                     'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
                     'Accept-Language': 'zh-CN,zh;q=0.9',
                 },
-                timeout: { request: 10000 },
+                signal: AbortSignal.timeout(10000),
             });
-            const $ = cheerio.load(response.body);
+            const body = await response.text();
+            const $ = cheerio.load(body);
             const results = [];
             $('li.b_algo').each((_, el) => {
                 if (results.length >= limit)

package/dist/services/tools/webFetch.js

@@ -22,13 +22,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webFetchTool = void 0;
 // @ts-ignore
-const got_1 = __importDefault(require("got"));
+const undici_1 = require("undici");
 const cheerio = __importStar(require("cheerio"));
 exports.webFetchTool = {
     name: 'webFetch',
@@ -44,13 +41,14 @@ exports.webFetchTool = {
     handler: async (args) => {
         try {
             const { url, query } = args;
-            const response = await (0, got_1.default)(url, {
+            const response = await (0, undici_1.fetch)(url, {
                 headers: {
                     'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
                 },
-                timeout: { request: 15000 },
+                signal: AbortSignal.timeout(15000),
             });
-            const $ = cheerio.load(response.body);
+            const body = await response.text();
+            const $ = cheerio.load(body);
             let content = $.html();
             if (query) {
                 content = $(query).text().trim() || `选择器 ${query} 未找到匹配内容`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myassis/gateway",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "我的助手 Gateway Service - 本地 AI 网关服务，支持认证、WebSocket 实时通信和任务调度",
   "main": "dist/index.js",
   "bin": {
@@ -24,9 +24,10 @@
     "start": "node dist/index.js",
     "build": "tsc --skipLibCheck",
     "postbuild": "node scripts/add-shebang.js && npx tsc-alias",
-    "pkg:win": "npx @yao-pkg/pkg . --targets node18-win-x64 --output myassis-gateway-win.exe",
-    "pkg:linux": "npx @yao-pkg/pkg . --targets node18-linux-x64 --output myassis-gateway-linux",
+    "pkg:win": "node scripts/pkg-build-win.js node24-win-x64 myassis-gateway-win.exe",
+    "pkg:linux": "npx @yao-pkg/pkg . --targets node24-linux-x64 --output myassis-gateway-linux",
     "pkg:all": "npm run pkg:win && npm run pkg:linux",
+    "pkg:linux-analyze": "npx @yao-pkg/pkg . --targets node24-linux-x64 --output myassis-gateway-linux --public-packages got --debug",
     "test": "jest"
   },
   "keywords": [
@@ -39,7 +40,7 @@
   ],
   "author": "duzhengjie",
   "dependencies": {
-    "@myassis/shared": "1.0.15",
+    "@myassis/shared": "workspace:*",
     "@nut-tree/nut-js": "^4.2.0",
     "axios": "^1.15.2",
     "bcryptjs": "^2.4.3",
@@ -49,7 +50,6 @@
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
-    "got": "^15.0.3",
     "helmet": "^7.1.0",
     "https-proxy-agent": "^9.0.0",
     "jsonwebtoken": "^9.0.2",
@@ -61,7 +61,6 @@
   },
   "devDependencies": {
     "@types/bcryptjs": "^2.4.6",
-    "@types/compression": "^1.7.5",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/jsonwebtoken": "^9.0.6",
@@ -72,7 +71,8 @@
     "@yao-pkg/pkg": "^6.20.0",
     "tsc-alias": "^1.8.10",
     "tsx": "^4.7.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "@yao-pkg/pkg-fetch": "3.6.3"
   },
   "pkg": {
     "scripts": [
@@ -81,11 +81,15 @@
     "assets": [
       "dist/**/*",
       "migrations/**/*",
-      "README*"
+      "README*",
+      "node_modules/better-sqlite3/build/Release/better_sqlite3.node",
+      "node_modules/.pnpm/@nut-tree+libnut-linux@2.7.1/node_modules/@nut-tree/libnut-linux/build/Release/libnut.node",
+      "node_modules/.pnpm/@nut-tree+libnut-win32@2.7.1/node_modules/@nut-tree/libnut-win32/build/Release/libnut.node",
+      "nssm.exe"
     ],
     "targets": [
-      "node18-win-x64",
-      "node18-linux-x64"
+      "node24-win-x64",
+      "node24-linux-x64"
     ]
   }
 }

package/scripts/pkg-build-win.js

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+// pkg-build-win.js - Windows pkg build using PKG_CACHE_PATH
+// Points to ~/.pkg-cache which contains the correct v3.6 patched binary (40.6 MB, hash matches)
+'use strict';
+const { spawn } = require('child_process');
+const path = require('path');
+const os = require('os');
+const fs = require('fs');
+
+const TARGET = process.argv[2] || 'node18-win-x64';
+const OUTPUT = process.argv[3] || 'myassis-gateway-win.exe';
+
+const CACHE_DIR = path.join(os.homedir(), '.pkg-cache');
+const V36_BINARY = path.join(CACHE_DIR, 'v3.6', 'fetched-v18.20.8-win-x64');
+const PKG_BIN = path.resolve(__dirname, '../node_modules/@yao-pkg/pkg/lib-es5/bin.js');
+
+function log(msg) { console.error('[pkg-build] ' + msg); }
+
+async function main() {
+    log(`Building for ${TARGET}`);
+    log(`Output: ${OUTPUT}`);
+
+    // Verify v3.6 binary exists
+    if (!fs.existsSync(V36_BINARY)) {
+        log(`ERROR: Patched binary not found at ${V36_BINARY}`);
+        log('Please run: node node_modules/@yao-pkg/pkg/lib-es5/bin.js --targets node18-win-x64 first');
+        process.exit(1);
+    }
+    const size = (fs.statSync(V36_BINARY).size / 1024 / 1024).toFixed(1);
+    log(`Using patched binary: ${V36_BINARY} (${size} MB)`);
+
+    // Use PKG_CACHE_PATH so pkg-fetch finds the correct v3.6 binary by hash
+    const env = { ...process.env };
+    delete env.PKG_NODE_PATH;  // MUST NOT use PKG_NODE_PATH - it bypasses placeholders check
+    env.PKG_CACHE_PATH = CACHE_DIR;
+    log(`PKG_CACHE_PATH=${CACHE_DIR}`);
+
+    log('Starting pkg...');
+    return new Promise((resolve) => {
+        const child = spawn(process.execPath, [PKG_BIN, '.', '--targets', TARGET, '--output', OUTPUT], {
+            cwd: path.resolve(__dirname, '..'),
+            env,
+            stdio: 'inherit'
+        });
+        child.on('exit', (code) => process.exit(code || 0));
+        child.on('error', (e) => { log('Spawn error: ' + e.message); process.exit(1); });
+    });
+}
+
+main().catch(e => { console.error('[pkg-build] Fatal:', e.message); process.exit(1); });