@yeaft/webchat-agent 0.0.5 → 0.0.6

package/connection.js

@@ -1,5 +1,5 @@
 import WebSocket from 'ws';
-import { execSync } from 'child_process';
+import { execSync, execFile } from 'child_process';
 import ctx from './context.js';
 import { encrypt, decrypt, isEncrypted, decodeKey } from './encryption.js';
 import { handleTerminalCreate, handleTerminalInput, handleTerminalResize, handleTerminalClose } from './terminal.js';
@@ -268,44 +268,55 @@ async function handleMessage(msg) {
 
     case 'upgrade_agent':
       console.log('[Agent] Upgrade requested, checking for updates...');
-      try {
-        const pkgName = ctx.pkgName || '@yeaft/webchat-agent';
-        // Check latest version before installing
-        const latestVersion = execSync(`npm view ${pkgName} version`, { stdio: 'pipe' }).toString().trim();
-        if (latestVersion === ctx.agentVersion) {
-          console.log(`[Agent] Already at latest version (${ctx.agentVersion}), skipping upgrade.`);
-          sendToServer({ type: 'upgrade_agent_ack', success: true, alreadyLatest: true, version: ctx.agentVersion });
-          break;
-        }
-        console.log(`[Agent] Upgrading from ${ctx.agentVersion} to ${latestVersion}...`);
-        execSync(`npm install -g ${pkgName}@latest`, { stdio: 'pipe' });
-        console.log('[Agent] Upgrade successful, restarting...');
-        sendToServer({ type: 'upgrade_agent_ack', success: true, version: latestVersion });
-        // Restart after upgrade (same as restart_agent)
-        setTimeout(() => {
-          for (const [, term] of ctx.terminals) {
-            if (term.pty) { try { term.pty.kill(); } catch {} }
-            if (term.timer) clearTimeout(term.timer);
-          }
-          ctx.terminals.clear();
-          for (const [, state] of ctx.conversations) {
-            if (state.abortController) state.abortController.abort();
-            if (state.inputStream) state.inputStream.done();
-          }
-          ctx.conversations.clear();
-          stopAgentHeartbeat();
-          if (ctx.ws) {
-            ctx.ws.removeAllListeners('close');
-            ctx.ws.close();
+      (async () => {
+        try {
+          const pkgName = ctx.pkgName || '@yeaft/webchat-agent';
+          // Check latest version (async to avoid blocking heartbeat)
+          const latestVersion = await new Promise((resolve, reject) => {
+            execFile('npm', ['view', pkgName, 'version'], { stdio: 'pipe' }, (err, stdout) => {
+              if (err) reject(err); else resolve(stdout.toString().trim());
+            });
+          });
+          if (latestVersion === ctx.agentVersion) {
+            console.log(`[Agent] Already at latest version (${ctx.agentVersion}), skipping upgrade.`);
+            sendToServer({ type: 'upgrade_agent_ack', success: true, alreadyLatest: true, version: ctx.agentVersion });
+            return;
           }
-          clearTimeout(ctx.reconnectTimer);
-          console.log('[Agent] Cleanup done, exiting for auto-restart...');
-          process.exit(1);
-        }, 500);
-      } catch (e) {
-        console.error('[Agent] Upgrade failed:', e.message);
-        sendToServer({ type: 'upgrade_agent_ack', success: false, error: e.message });
-      }
+          console.log(`[Agent] Upgrading from ${ctx.agentVersion} to ${latestVersion}...`);
+          // Use async execFile to avoid blocking event loop (heartbeat must keep running)
+          await new Promise((resolve, reject) => {
+            execFile('npm', ['install', '-g', `${pkgName}@latest`], { stdio: 'pipe' }, (err) => {
+              if (err) reject(err); else resolve();
+            });
+          });
+          console.log('[Agent] Upgrade successful, restarting...');
+          sendToServer({ type: 'upgrade_agent_ack', success: true, version: latestVersion });
+          // Restart after upgrade (same as restart_agent)
+          setTimeout(() => {
+            for (const [, term] of ctx.terminals) {
+              if (term.pty) { try { term.pty.kill(); } catch {} }
+              if (term.timer) clearTimeout(term.timer);
+            }
+            ctx.terminals.clear();
+            for (const [, state] of ctx.conversations) {
+              if (state.abortController) state.abortController.abort();
+              if (state.inputStream) state.inputStream.done();
+            }
+            ctx.conversations.clear();
+            stopAgentHeartbeat();
+            if (ctx.ws) {
+              ctx.ws.removeAllListeners('close');
+              ctx.ws.close();
+            }
+            clearTimeout(ctx.reconnectTimer);
+            console.log('[Agent] Cleanup done, exiting for auto-restart...');
+            process.exit(1);
+          }, 500);
+        } catch (e) {
+          console.error('[Agent] Upgrade failed:', e.message);
+          sendToServer({ type: 'upgrade_agent_ack', success: false, error: e.message });
+        }
+      })();
       break;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",

package/workbench.js

@@ -31,6 +31,19 @@ export function validateGitPath(filePath) {
   return filePath && !/[`$;|&><!\n\r]/.test(filePath);
 }
 
+// Binary file extensions → MIME type mapping
+const BINARY_EXTENSIONS = {
+  '.pdf': 'application/pdf',
+  '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+  '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+  '.xls': 'application/vnd.ms-excel',
+  '.pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+  '.ppt': 'application/vnd.ms-powerpoint',
+  '.png': 'image/png', '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg',
+  '.gif': 'image/gif', '.webp': 'image/webp', '.bmp': 'image/bmp',
+  '.ico': 'image/x-icon'
+};
+
 export async function handleReadFile(msg) {
   const { conversationId, filePath, _requestUserId } = msg;
   console.log('[Agent] handleReadFile received:', { filePath, conversationId, workDir: msg.workDir });
@@ -39,37 +52,55 @@ export async function handleReadFile(msg) {
 
   try {
     const resolved = resolveAndValidatePath(filePath, workDir);
-    const content = await readFile(resolved, 'utf-8');
-
-    // 检测语言
     const ext = extname(resolved).toLowerCase();
-    const langMap = {
-      '.js': 'javascript', '.mjs': 'javascript', '.cjs': 'javascript',
-      '.ts': 'javascript', '.tsx': 'javascript', '.jsx': 'javascript',
-      '.py': 'python', '.pyw': 'python',
-      '.html': 'htmlmixed', '.htm': 'htmlmixed',
-      '.css': 'css', '.scss': 'css', '.less': 'css',
-      '.json': 'javascript',
-      '.md': 'markdown',
-      '.sh': 'shell', '.bash': 'shell', '.zsh': 'shell',
-      '.cs': 'text/x-csharp', '.java': 'text/x-java',
-      '.cpp': 'text/x-c++src', '.c': 'text/x-csrc', '.h': 'text/x-csrc',
-      '.xml': 'xml', '.svg': 'xml',
-      '.yaml': 'yaml', '.yml': 'yaml',
-      '.sql': 'sql',
-      '.go': 'go', '.rs': 'rust', '.rb': 'ruby',
-      '.php': 'php', '.swift': 'swift'
-    };
-
-    console.log('[Agent] Sending file_content:', { filePath: resolved, contentLen: content.length, conversationId });
-    ctx.sendToServer({
-      type: 'file_content',
-      conversationId,
-      _requestUserId,
-      filePath: resolved,
-      content,
-      language: langMap[ext] || null
-    });
+    const mimeType = BINARY_EXTENSIONS[ext];
+
+    if (mimeType) {
+      // Binary file: read as Buffer, send base64
+      const buffer = await readFile(resolved);
+      console.log('[Agent] Sending binary file_content:', { filePath: resolved, size: buffer.length, mimeType, conversationId });
+      ctx.sendToServer({
+        type: 'file_content',
+        conversationId,
+        _requestUserId,
+        filePath: resolved,
+        content: buffer.toString('base64'),
+        binary: true,
+        mimeType
+      });
+    } else {
+      // Text file: read as utf-8
+      const content = await readFile(resolved, 'utf-8');
+
+      // 检测语言
+      const langMap = {
+        '.js': 'javascript', '.mjs': 'javascript', '.cjs': 'javascript',
+        '.ts': 'javascript', '.tsx': 'javascript', '.jsx': 'javascript',
+        '.py': 'python', '.pyw': 'python',
+        '.html': 'htmlmixed', '.htm': 'htmlmixed',
+        '.css': 'css', '.scss': 'css', '.less': 'css',
+        '.json': 'javascript',
+        '.md': 'markdown',
+        '.sh': 'shell', '.bash': 'shell', '.zsh': 'shell',
+        '.cs': 'text/x-csharp', '.java': 'text/x-java',
+        '.cpp': 'text/x-c++src', '.c': 'text/x-csrc', '.h': 'text/x-csrc',
+        '.xml': 'xml', '.svg': 'xml',
+        '.yaml': 'yaml', '.yml': 'yaml',
+        '.sql': 'sql',
+        '.go': 'go', '.rs': 'rust', '.rb': 'ruby',
+        '.php': 'php', '.swift': 'swift'
+      };
+
+      console.log('[Agent] Sending file_content:', { filePath: resolved, contentLen: content.length, conversationId });
+      ctx.sendToServer({
+        type: 'file_content',
+        conversationId,
+        _requestUserId,
+        filePath: resolved,
+        content,
+        language: langMap[ext] || null
+      });
+    }
   } catch (e) {
     ctx.sendToServer({
       type: 'file_content',