@ynhcj/xiaoyi 2.2.7 → 2.2.9

package/dist/channel.js

@@ -381,6 +381,18 @@ exports.xiaoyiPlugin = {
                                     console.log("=".repeat(60) + "\n");
                                     return;
                                 }
+                                // ==================== CHECK EMPTY RESPONSE ====================
+                                // If response is empty, don't clear timeout (let it trigger)
+                                if (!completeText || completeText.length === 0) {
+                                    console.log("\n" + "=".repeat(60));
+                                    console.log(`[TIMEOUT] Empty response detected`);
+                                    console.log(`  Session: ${message.sessionId}`);
+                                    console.log(`  Elapsed: ${elapsed}ms`);
+                                    console.log(`  Action: KEEPING TIMEOUT (session conflict detected)`);
+                                    console.log("=".repeat(60) + "\n");
+                                    // Don't send anything, and don't clear timeout
+                                    return;
+                                }
                                 console.log("\n" + "-".repeat(60));
                                 console.log(`XiaoYi: [DELIVER] AI response received`);
                                 console.log(`  Elapsed: ${elapsed}ms`);
@@ -421,9 +433,16 @@ exports.xiaoyiPlugin = {
                                 console.log(`XiaoYi: [IDLE] Processing complete`);
                                 console.log(`  Total time: ${elapsed}ms`);
                                 console.log(`  Final length: ${accumulatedText.length} chars`);
+                                // Only clear timeout if we have a valid response
+                                // If empty, keep timeout running to handle session conflict
+                                if (accumulatedText.length > 0) {
+                                    runtime.markSessionCompleted(message.sessionId);
+                                    console.log(`[TIMEOUT] Timeout cleared (valid response)\n`);
+                                }
+                                else {
+                                    console.log(`[TIMEOUT] Keeping timeout (no valid response)\n`);
+                                }
                                 console.log("=".repeat(60) + "\n");
-                                // Clear timeout on completion
-                                runtime.markSessionCompleted(message.sessionId);
                             },
                         },
                         replyOptions: undefined,

package/dist/websocket.d.ts

@@ -15,6 +15,10 @@ export declare class XiaoYiWebSocketManager extends EventEmitter {
     private reconnectTimeout2?;
     private activeTasks;
     constructor(config: XiaoYiChannelConfig);
+    /**
+     * Check if URL is wss + IP format (skip certificate verification)
+     */
+    private isWssWithIp;
     /**
      * Resolve configuration with defaults and backward compatibility
      */

package/dist/websocket.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XiaoYiWebSocketManager = void 0;
 const ws_1 = __importDefault(require("ws"));
 const events_1 = require("events");
+const url_1 = require("url");
 const auth_1 = require("./auth");
 const types_1 = require("./types");
 class XiaoYiWebSocketManager extends events_1.EventEmitter {
@@ -38,6 +39,47 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
         console.log(`  Server 1: ${this.config.wsUrl1}`);
         console.log(`  Server 2: ${this.config.wsUrl2}`);
     }
+    /**
+     * Check if URL is wss + IP format (skip certificate verification)
+     */
+    isWssWithIp(urlString) {
+        try {
+            const url = new url_1.URL(urlString);
+            // Check if protocol is wss
+            if (url.protocol !== 'wss:') {
+                return false;
+            }
+            const hostname = url.hostname;
+            // Check for IPv4 address (e.g., 192.168.1.1)
+            const ipv4Regex = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/;
+            if (ipv4Regex.test(hostname)) {
+                // Validate each octet is 0-255
+                const octets = hostname.split('.');
+                return octets.every(octet => {
+                    const num = parseInt(octet, 10);
+                    return num >= 0 && num <= 255;
+                });
+            }
+            // Check for IPv6 address (e.g., [::1] or 2001:db8::1)
+            // IPv6 in URL might be wrapped in brackets
+            const ipv6Regex = /^[\[::0-9a-fA-F]+$/;
+            const ipv6WithoutBrackets = hostname.replace(/[\[\]]/g, '');
+            // Simple check for IPv6: contains colons and valid hex characters
+            if (hostname.includes('[') && hostname.includes(']')) {
+                return ipv6Regex.test(hostname);
+            }
+            // Check for plain IPv6 format
+            if (hostname.includes(':')) {
+                const ipv6RegexPlain = /^([0-9a-fA-F]{0,4}:){2,7}[0-9a-fA-F]{0,4}$/;
+                return ipv6RegexPlain.test(ipv6WithoutBrackets);
+            }
+            return false;
+        }
+        catch (error) {
+            console.warn(`[WS Manager] Invalid URL format: ${urlString}`);
+            return false;
+        }
+    }
     /**
      * Resolve configuration with defaults and backward compatibility
      */
@@ -96,8 +138,14 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
         console.log(`[Server1] Connecting to ${this.config.wsUrl1}...`);
         try {
             const authHeaders = this.auth.generateAuthHeaders();
+            // Check if URL is wss + IP format, skip certificate verification
+            const skipCertVerify = this.isWssWithIp(this.config.wsUrl1);
+            if (skipCertVerify) {
+                console.log(`[Server1] WSS + IP detected, skipping certificate verification`);
+            }
             this.ws1 = new ws_1.default(this.config.wsUrl1, {
                 headers: authHeaders,
+                rejectUnauthorized: !skipCertVerify,
             });
             this.setupWebSocketHandlers(this.ws1, 'server1');
             await new Promise((resolve, reject) => {
@@ -136,8 +184,14 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
         console.log(`[Server2] Connecting to ${this.config.wsUrl2}...`);
         try {
             const authHeaders = this.auth.generateAuthHeaders();
+            // Check if URL is wss + IP format, skip certificate verification
+            const skipCertVerify = this.isWssWithIp(this.config.wsUrl2);
+            if (skipCertVerify) {
+                console.log(`[Server2] WSS + IP detected, skipping certificate verification`);
+            }
             this.ws2 = new ws_1.default(this.config.wsUrl2, {
                 headers: authHeaders,
+                rejectUnauthorized: !skipCertVerify,
             });
             this.setupWebSocketHandlers(this.ws2, 'server2');
             await new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "description": "XiaoYi channel plugin for OpenClaw",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",