shellx-ai 1.0.5 → 1.0.7

package/dist/index.js

@@ -57,7 +57,7 @@ exports.DEFAULT_CONFIG = {
     onError: () => { },
     onReconnectFailed: () => { },
 };
-const cbor_x_1 = require("cbor-x");
+const cbor_1 = require("cbor");
 // 安全地获取环境变量，兼容浏览器和Node.js环境
 let authKey = (0, utils_1.getEnvVar)('SHELLX_AUTH_KEY');
 /**
@@ -171,7 +171,7 @@ class WebSocketTaskClient {
                 const authMessage = { authenticate: authKey };
                 console.log('📤 [Auth] 发送认证消息:', { authenticate: authKey });
                 if (this.ws && this.wsConnected) {
-                    this.ws.send((0, cbor_x_1.encode)(authMessage));
+                    this.ws.send((0, cbor_1.encode)(authMessage));
                 }
                 else {
                     console.error('❌ [Auth] WebSocket未连接，无法发送认证消息');
@@ -199,7 +199,7 @@ class WebSocketTaskClient {
                 this.processServerMessage(serverMessage);
                 return;
             }
-            serverMessage = (0, cbor_x_1.decode)(binaryData);
+            serverMessage = (0, cbor_1.decode)(binaryData);
             this.processServerMessage(serverMessage);
         }
         catch (cborError) {
@@ -321,7 +321,7 @@ class WebSocketTaskClient {
             if (this.shellxConnected && this.ws) {
                 try {
                     console.log('📤 [ShellX] 发送消息:', message);
-                    this.ws.send((0, cbor_x_1.encode)(message));
+                    this.ws.send((0, cbor_1.encode)(message));
                     if (!taskType)
                         resolve(undefined); // For fire-and-forget messages
                 }
@@ -506,7 +506,7 @@ class WebSocketTaskClient {
             if (this.shellxConnected && this.ws) {
                 try {
                     console.log('📤 [ShellX] 发送消息:', message);
-                    this.ws.send((0, cbor_x_1.encode)(message));
+                    this.ws.send((0, cbor_1.encode)(message));
                     const promise = new Promise((promiseResolve, promiseReject) => {
                         if (taskType) {
                             if (taskId != null) {
@@ -543,7 +543,7 @@ class WebSocketTaskClient {
         console.log('🏓 [ShellX] 开始心跳检测...');
         this.pingIntervalId = setInterval(() => {
             if (this.ws && this.shellxConnected) {
-                this.ws.send((0, cbor_x_1.encode)({ ping: BigInt(Date.now()) }));
+                this.ws.send((0, cbor_1.encode)({ ping: BigInt(Date.now()) }));
             }
         }, this.config.pingInterval);
     }
@@ -573,7 +573,7 @@ class WebSocketTaskClient {
             if (message) {
                 try {
                     console.log('flushQueue Sending message:', message);
-                    this.ws.send((0, cbor_x_1.encode)(message));
+                    this.ws.send((0, cbor_1.encode)(message));
                 }
                 catch (error) {
                     console.error('Failed to send queued message:', error);

package/dist/shellx.js

@@ -56,6 +56,7 @@ const utils_1 = require("./utils");
 const index_1 = __importDefault(require("./index"));
 // 安全地获取环境变量，兼容浏览器和Node.js环境
 let authKey = (0, utils_1.getEnvVar)('SHELLX_AUTH_KEY');
+const COMMAND_PTY_SID = 999;
 /**
  * ShellX automation utilities for common patterns
  */
@@ -90,38 +91,40 @@ class ShellX {
      */
     handleShellOutput(chunks) {
         const [sessionId, len, dataArrays] = chunks;
-        try {
-            // 将 Uint8Array 数组转换为字符串
-            let output = '';
-            for (const data of dataArrays) {
-                output += new TextDecoder().decode(data);
-            }
-            console.log(`📟 [Shell] 收到输出 (Session ${sessionId}): ${output.trim()}`);
-            // 为每个等待的命令累积输出
-            for (const [commandKey, commandPromise] of this.shellCommandPromises.entries()) {
-                // 检查是否该命令相关的输出
-                if (this.isOutputForCommand(output, commandPromise.command, sessionId)) {
-                    // 存储该 session 的输出
-                    if (!commandPromise.sessionOutputs.has(sessionId)) {
-                        commandPromise.sessionOutputs.set(sessionId, '');
-                    }
-                    const currentSessionOutput = commandPromise.sessionOutputs.get(sessionId) || '';
-                    commandPromise.sessionOutputs.set(sessionId, currentSessionOutput + output);
-                    // 更新总输出
-                    commandPromise.output = this.combineSessionOutputs(commandPromise.sessionOutputs);
-                    console.log(`📊 [Shell] 命令 ${commandKey} 累积输出长度: ${commandPromise.output.length}`);
-                    // 调用输出回调（传递清理后的输出）
-                    if (commandPromise.options.onOutput) {
-                        const cleanOutput = this.cleanCommandOutput(output, commandPromise.command);
-                        commandPromise.options.onOutput(cleanOutput);
+        if (sessionId === COMMAND_PTY_SID) {
+            try {
+                // 将 Uint8Array 数组转换为字符串
+                let output = '';
+                for (const data of dataArrays) {
+                    output += new TextDecoder().decode(data);
+                }
+                console.log(`📟 [Shell] 收到输出 (Session ${sessionId}): ${output.trim()}`);
+                // 为每个等待的命令累积输出
+                for (const [commandKey, commandPromise] of this.shellCommandPromises.entries()) {
+                    // 检查是否该命令相关的输出
+                    if (this.isOutputForCommand(output, commandPromise.command, sessionId)) {
+                        // 存储该 session 的输出
+                        if (!commandPromise.sessionOutputs.has(sessionId)) {
+                            commandPromise.sessionOutputs.set(sessionId, '');
+                        }
+                        const currentSessionOutput = commandPromise.sessionOutputs.get(sessionId) || '';
+                        commandPromise.sessionOutputs.set(sessionId, currentSessionOutput + output);
+                        // 更新总输出
+                        commandPromise.output = this.combineSessionOutputs(commandPromise.sessionOutputs);
+                        console.log(`📊 [Shell] 命令 ${commandKey} 累积输出长度: ${commandPromise.output.length}`);
+                        // 调用输出回调（传递清理后的输出）
+                        if (commandPromise.options.onOutput) {
+                            const cleanOutput = this.cleanCommandOutput(output, commandPromise.command);
+                            commandPromise.options.onOutput(cleanOutput);
+                        }
+                        // 检查是否满足完成条件
+                        this.checkCommandCompletion(commandKey, commandPromise, output);
                     }
-                    // 检查是否满足完成条件
-                    this.checkCommandCompletion(commandKey, commandPromise, output);
                 }
             }
-        }
-        catch (error) {
-            console.error(`❌ [Shell] 处理输出数据失败:`, error);
+            catch (error) {
+                console.error(`❌ [Shell] 处理输出数据失败:`, error);
+            }
         }
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shellx-ai",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "shellx is a powerful WebSocket-based client for controlling shell commands and UI automation on remote devices.",
   "repository": {
     "url": "git+https://github.com/10cl/shellx.git",
@@ -30,7 +30,7 @@
   "author": "10cl <notice@toscl.com>",
   "license": "MIT",
   "dependencies": {
-    "cbor-x": "^1.6.0",
+    "cbor": "^9.0.0",
     "dotenv": "^16.4.5",
     "ofetch": "^1.4.1",
     "uuid": "^11.1.0"