shellx-ai 1.0.11 → 1.0.12

package/dist/index.js

@@ -71,7 +71,6 @@ function getWebSocket() {
         }
         // Node.js环境下动态导入ws模块
         try {
-            // @ts-ignore - Dynamic import may not have types
             const wsModule = yield Promise.resolve().then(() => __importStar(require('ws')));
             return wsModule.default || wsModule;
         }
@@ -108,7 +107,11 @@ class ConnectionTaskClient {
             var _a, _b;
             try {
                 this.wsUrl = yield this.authenticateDevice(this.deviceId);
-                console.log('Initializing WebSocket client...' + this.wsUrl);
+                if (!this.wsUrl) {
+                    this.config.onError(new Event("connection"));
+                    return;
+                }
+                console.log('Initializing ShellX client wsUrl:' + this.wsUrl + " deviceId: " + this.deviceId);
                 // 获取适合当前环境的WebSocket构造函数
                 const WebSocketConstructor = yield getWebSocket();
                 this.ws = new WebSocketConstructor(this.wsUrl);
@@ -153,6 +156,7 @@ class ConnectionTaskClient {
     }
     authenticateDevice(deviceId) {
         return __awaiter(this, void 0, void 0, function* () {
+            let fallbackUrl = undefined;
             // 1. 优先检测本地服务
             try {
                 // fetch超时实现
@@ -164,9 +168,9 @@ class ConnectionTaskClient {
                 if (localResp.ok) {
                     const info = yield localResp.json();
                     if (info && (info.status === 'ok' || info.status === 1) && info.uuid) {
-                        if (deviceId == info.uuid) {
+                        if (deviceId == undefined || deviceId == info.uuid) {
                             const localUuid = info.uuid;
-                            const fallbackUrl = `ws://127.0.0.1:9091/api/s/${localUuid}`;
+                            fallbackUrl = `ws://127.0.0.1:9091/api/s/${localUuid}`;
                             console.log('✅ [Auth] 本地ShellX服务可用，使用本地 /info 返回的 uuid:', localUuid, '，服务地址:', fallbackUrl);
                             return fallbackUrl;
                         }
@@ -176,11 +180,15 @@ class ConnectionTaskClient {
             catch (e) {
                 // 本地不可用，继续走远程
             }
-            const fallbackUrl = `ws://127.0.0.1:9091/api/s/${deviceId}`;
+            if (deviceId == undefined) {
+                console.warn('❌ [Auth] 设备ID未设置，本地未连接USB，请设置环境变量 SHELLX_DEVICE_ID 或者 USB连接设备');
+                return undefined;
+            }
             // 2. 远程认证逻辑
             authKey = (0, utils_1.getEnvVar)('SHELLX_AUTH_KEY');
             if (!authKey) {
-                throw new Error('SHELLX_AUTH_KEY environment variable is required');
+                authKey = (0, uuid_1.v4)();
+                console.log('✅ [Auth] SHELLX_AUTH_KEY 环境变量未设置, 生成新的authKey: ' + authKey);
             }
             try {
                 console.log('🔑 [Auth] 正在认证设备...');
@@ -192,6 +200,12 @@ class ConnectionTaskClient {
                     },
                 });
                 console.log('ShellX.ai设备认证响应:', jsonData);
+                // 验证认证响应是否有效
+                // 如果接口返回 null 或者缺少必要字段，说明设备未注册
+                if (!jsonData || jsonData === null || !jsonData.machine || !jsonData.authenticate) {
+                    console.error('❌ [Auth] ShellX.ai设备未注册或认证信息无效');
+                    return `wss://shellx.ai/api/s/${deviceId}`;
+                }
                 // const jsonData = JSON.parse(data);
                 console.log('✅ [Auth] ShellX.ai设备认证成功');
                 console.log(`📡 [Auth] 设备ID: ${jsonData.authenticate}`);
@@ -252,19 +266,16 @@ class ConnectionTaskClient {
             try {
                 authKey = (0, utils_1.getEnvVar)('SHELLX_AUTH_KEY');
                 if (!authKey) {
-                    console.error('❌ [Auth] SHELLX_AUTH_KEY 环境变量未设置');
-                    return;
+                    authKey = (0, uuid_1.v4)();
+                    console.log('✅ [Auth] SHELLX_AUTH_KEY 环境变量未设置, 生成新的authKey: ' + authKey);
                 }
-                console.log('🔑 [Auth] 发送认证消息...');
-                // 从URL中提取认证密钥（如果URL包含认证信息）
-                // 发送认证消息
                 const authMessage = { authenticate: authKey };
                 console.log('📤 [Auth] 发送认证消息:', { authenticate: authKey });
                 if (this.ws && this.wsConnected) {
                     this.ws.send((0, cbor_1.encode)(authMessage));
                 }
                 else {
-                    console.error('❌ [Auth] WebSocket未连接，无法发送认证消息');
+                    console.error('❌ [Auth] ShellX 未连接，无法发送认证消息');
                 }
             }
             catch (error) {
@@ -391,12 +402,8 @@ class ConnectionTaskClient {
             if (shouldResolve) {
                 clearTimeout(task.timer);
                 this.pendingTasks.delete(taskId);
-                if ((responseData === null || responseData === void 0 ? void 0 : responseData.success) === false) {
-                    task.reject(new Error(responseData.errorMessage || 'Task failed'));
-                }
-                else {
-                    task.resolve(responseData);
-                }
+                // 始终 resolve，保持原始响应数据结构不变
+                task.resolve(responseData);
                 break; // Only resolve the first matching task
             }
         }
@@ -408,7 +415,9 @@ class ConnectionTaskClient {
                 if (taskType) {
                     const timer = setTimeout(() => {
                         this.pendingTasks.delete(taskId);
-                        reject(new Error(`Task ${taskType} timeout (${timeout ? timeout : this.config.timeout}ms)`));
+                        // 超时时返回 undefined 而不是 reject
+                        console.log(`⏰ [ShellX] 任务超时: ${taskType}, 返回 undefined`);
+                        resolve(undefined);
                     }, timeout ? timeout : this.config.timeout);
                     this.pendingTasks.set(taskId, {
                         resolve,
@@ -429,7 +438,9 @@ class ConnectionTaskClient {
                         if (taskType) {
                             this.pendingTasks.delete(taskId);
                         }
-                        reject(error);
+                        // 发送失败时返回 undefined 而不是 reject
+                        console.log(`❌ [ShellX] 发送消息失败，返回 undefined:`, error);
+                        resolve(undefined);
                     }
                 }
                 else {
@@ -673,7 +684,7 @@ class ConnectionTaskClient {
         });
     }
     flushQueue() {
-        while (this.messageQueue.length > 0 && this.ws) {
+        while (this.messageQueue.length > 0 && this.ws && this.shellxConnected) {
             const message = this.messageQueue.shift();
             if (message) {
                 try {
@@ -682,6 +693,9 @@ class ConnectionTaskClient {
                 }
                 catch (error) {
                     console.error('Failed to send queued message:', error);
+                    // Re-queue the message if sending fails
+                    this.messageQueue.unshift(message);
+                    break;
                 }
             }
         }

package/dist/shellx.d.ts

@@ -49,7 +49,7 @@ export declare class ShellX {
      */
     private combineSessionOutputs;
     /**
-     * 通用重试机制
+     * 通用重试机制 - 失败时返回 undefined 而不是抛出异常
      */
     private withRetry;
     /**
@@ -88,6 +88,8 @@ export declare class ShellX {
      * 执行命令 - 兼容现有的 shell 命令执行
      */
     executeCommand(commandData: Command): Promise<CommandResult>;
+    executeCodeEval(context: any, code: string, timeout?: number): Promise<any>;
+    executeCode(agentCode: string, context: any, timeout?: number): Promise<any>;
     /**
      * 获取应用信息
      */

package/dist/shellx.js

@@ -16,7 +16,6 @@ exports.ShellX = void 0;
 exports.createShellX = createShellX;
 exports.createShellXWithShellMonitoring = createShellXWithShellMonitoring;
 const uuid_1 = require("uuid");
-// 导入 WebSocketTaskClient 类
 const index_1 = __importDefault(require("./index"));
 const COMMAND_PTY_SID = 999;
 /**
@@ -105,7 +104,7 @@ class ShellX {
         return combined;
     }
     /**
-     * 通用重试机制
+     * 通用重试机制 - 失败时返回 undefined 而不是抛出异常
      */
     withRetry(operation_1) {
         return __awaiter(this, arguments, void 0, function* (operation, options = {}) {
@@ -116,7 +115,8 @@ class ShellX {
                 }
                 catch (error) {
                     if (attempt === retry) {
-                        throw error;
+                        console.log(`❌ [Retry] 重试 ${retry} 次后仍然失败，返回 undefined:`, error);
+                        return undefined;
                     }
                     if (onRetry) {
                         onRetry(attempt, error);
@@ -125,7 +125,7 @@ class ShellX {
                     yield new Promise(resolve => setTimeout(resolve, delay));
                 }
             }
-            throw new Error('重试次数已用完');
+            return undefined;
         });
     }
     /**
@@ -165,7 +165,7 @@ class ShellX {
     click(clickData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     let target;
                     if (clickData.targetElementId) {
@@ -221,6 +221,15 @@ class ShellX {
                     throw new Error(`点击操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: clickData.retry, delay: 500 });
+            // 如果 withRetry 返回 undefined，返回失败的 ActionResult
+            if (!result) {
+                return {
+                    success: false,
+                    error: '点击操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -229,7 +238,7 @@ class ShellX {
     input(inputData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
                 try {
                     let target;
@@ -279,6 +288,14 @@ class ShellX {
                     throw new Error(`输入操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: inputData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '输入操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -287,7 +304,7 @@ class ShellX {
     swipe(swipeData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const from = { x: swipeData.fromX, y: swipeData.fromY };
                     const to = { x: swipeData.toX, y: swipeData.toY };
@@ -314,6 +331,14 @@ class ShellX {
                     throw new Error(`滑动操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: swipeData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '滑动操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -322,7 +347,7 @@ class ShellX {
     pressKey(keyData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const action = {
                         title: `按键操作: ${keyData.key}${keyData.longPress ? ' (长按)' : ''}`,
@@ -348,6 +373,14 @@ class ShellX {
                     throw new Error(`按键操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: keyData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '按键操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -356,7 +389,7 @@ class ShellX {
     wait(waitData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const selector = this.convertSelector(waitData);
                     const timeout = waitData.timeout || 10000;
@@ -370,7 +403,12 @@ class ShellX {
                                 visibleOnly: waitData.condition === 'visible',
                                 clickableOnly: waitData.condition === 'clickable'
                             });
-                            if (result.elements.length > 0) {
+                            // 如果服务器返回失败，跳过本次尝试
+                            if (!result || result.success === false) {
+                                yield new Promise(resolve => setTimeout(resolve, interval));
+                                continue;
+                            }
+                            if (result.elements && result.elements.length > 0) {
                                 if (waitData.condition === 'gone') {
                                     // 等待元素消失，继续等待
                                     yield new Promise(resolve => setTimeout(resolve, interval));
@@ -405,6 +443,14 @@ class ShellX {
                     throw new Error(`等待操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: waitData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '等待操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -412,7 +458,7 @@ class ShellX {
      */
     find(findData) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const selector = this.convertSelector(findData);
                     const result = yield this.client.findElement(selector, {
@@ -423,6 +469,13 @@ class ShellX {
                         clickableOnly: false,
                         multiple: findData.multiple || false
                     });
+                    // 检查服务器是否返回了失败响应
+                    if (!result || result.success === false) {
+                        throw new Error((result === null || result === void 0 ? void 0 : result.errorMessage) || '查找元素失败');
+                    }
+                    if (!result.elements) {
+                        throw new Error('未找到元素');
+                    }
                     const elements = result.elements.map(element => this.convertElement(element));
                     return {
                         elements,
@@ -435,6 +488,15 @@ class ShellX {
                     throw new Error(`查找操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: findData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    elements: [],
+                    count: 0,
+                    success: false,
+                    found: false
+                };
+            }
+            return result;
         });
     }
     /**
@@ -442,7 +504,7 @@ class ShellX {
      */
     executeCommand(commandData) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield this.executeShellCommand(commandData.cmd, {
                         title: `执行命令: ${commandData.cmd}`,
@@ -455,6 +517,35 @@ class ShellX {
                     throw new Error(`命令执行失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: commandData.retry, delay: 1000 });
+            if (!result) {
+                return {
+                    success: false,
+                    output: '',
+                    error: '命令执行失败',
+                    duration: 0
+                };
+            }
+            return result;
+        });
+    }
+    executeCodeEval(context, code, timeout) {
+        const evalInstance = require('eval');
+        return evalInstance(code, context, true);
+    }
+    executeCode(agentCode, context, timeout) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // console.log('executeCode', agentCode);
+            // Interpreter.global = context;
+            // const evalFunc = getEvalInstance(context);
+            // 如果没有指定 timeout，直接执行
+            if (!timeout) {
+                return yield this.executeCodeEval(context, agentCode);
+            }
+            // 使用 timeout 执行 - 修复：await 应该在 Promise.race 上，而不是在内部的 promise 上
+            return yield Promise.race([
+                this.executeCodeEval(context, agentCode),
+                new Promise((_, reject) => setTimeout(() => reject(new Error(`代码执行超时: ${timeout}ms`)), timeout))
+            ]);
         });
     }
     /**
@@ -463,7 +554,7 @@ class ShellX {
     getAppInfo(appInfoData) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const action = {
                         title: `获取应用信息: ${appInfoData.package}`,
@@ -483,6 +574,14 @@ class ShellX {
                     throw new Error(`获取应用信息失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: appInfoData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '获取应用信息失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -491,7 +590,7 @@ class ShellX {
     takeScreenshot() {
         return __awaiter(this, arguments, void 0, function* (screenshotData = {}) {
             const startTime = Date.now();
-            return this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.withRetry(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const options = {
                         format: screenshotData.format || 'png',
@@ -508,6 +607,10 @@ class ShellX {
                         };
                     }
                     const screenshot = yield this.client.screenShot(options);
+                    // 检查服务器是否返回了失败响应
+                    if (!screenshot || screenshot.success === false) {
+                        throw new Error((screenshot === null || screenshot === void 0 ? void 0 : screenshot.errorMessage) || '截图失败');
+                    }
                     return {
                         success: true,
                         data: screenshot,
@@ -518,6 +621,14 @@ class ShellX {
                     throw new Error(`截图操作失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }), { retry: screenshotData.retry, delay: 500 });
+            if (!result) {
+                return {
+                    success: false,
+                    error: '截图操作失败',
+                    duration: Date.now() - startTime
+                };
+            }
+            return result;
         });
     }
     /**
@@ -568,11 +679,13 @@ class ShellX {
                         result = yield this.takeScreenshot(action);
                     }
                     results.push(result);
-                    // 如果操作失败且不允许继续，则抛出错误
+                    // 记录操作结果但不抛出错误，让调用者决定如何处理失败的操作
                     if (!result.success) {
-                        throw new Error(`操作 ${index + 1} 失败: ${result.error}`);
+                        console.warn(`⚠️ [Actions] 第 ${index + 1} 个操作失败: ${result.error}`);
+                    }
+                    else {
+                        console.log(`✅ [Actions] 第 ${index + 1} 个操作执行成功`);
                     }
-                    console.log(`✅ [Actions] 第 ${index + 1} 个操作执行成功`);
                 }
                 catch (error) {
                     const errorResult = {
@@ -582,7 +695,7 @@ class ShellX {
                     };
                     results.push(errorResult);
                     console.error(`❌ [Actions] 第 ${index + 1} 个操作执行失败:`, error);
-                    throw error; // 停止执行后续操作
+                    // 不再抛出错误，继续执行后续操作
                 }
             }
             return results;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shellx-ai",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "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",
@@ -33,7 +33,9 @@
     "cbor": "^9.0.0",
     "dotenv": "^16.4.5",
     "ofetch": "^1.4.1",
-    "uuid": "^11.1.0"
+    "uuid": "^11.1.0",
+    "promptflow-eval": "1.0.0",
+    "@babel/standalone": "^7.18.13"
   },
   "optionalDependencies": {
     "node-fetch": "^3.3.2",
@@ -47,6 +49,7 @@
     "langchain": "^0.1.34",
     "promptflow-eval": "1.0.0",
     "promptflow-template": "1.0.0",
+    "eval": "^0.1.8",
     "promptflowx": "^0.1.9",
     "ts-jest": "^29.4.0",
     "ts-node": "^10.9.2",