@ynhcj/xiaoyi-channel 0.0.39-beta → 0.0.41-beta

package/dist/src/utils/pushid-manager.js

@@ -0,0 +1,105 @@
+// pushId 持久化管理器
+import { promises as fs } from "fs";
+import * as path from "path";
+import { logger } from "./logger.js";
+const PUSHID_LIST_FILE = "/home/sandbox/.openclaw/pushIdList.json";
+/**
+ * 确保目录存在
+ */
+async function ensureDirectoryExists(filePath) {
+    const dir = path.dirname(filePath);
+    try {
+        await fs.mkdir(dir, { recursive: true });
+    }
+    catch (error) {
+        logger.error(`[PushIdManager] Failed to create directory ${dir}:`, error);
+    }
+}
+/**
+ * 读取 pushId 列表
+ */
+async function readPushIdList() {
+    try {
+        await ensureDirectoryExists(PUSHID_LIST_FILE);
+        const content = await fs.readFile(PUSHID_LIST_FILE, "utf-8");
+        const list = JSON.parse(content);
+        if (!Array.isArray(list)) {
+            logger.warn(`[PushIdManager] pushIdList.json is not an array, returning empty array`);
+            return [];
+        }
+        return list;
+    }
+    catch (error) {
+        if (error.code === "ENOENT") {
+            // 文件不存在，返回空数组
+            return [];
+        }
+        logger.error(`[PushIdManager] Failed to read pushIdList:`, error);
+        return [];
+    }
+}
+/**
+ * 写入 pushId 列表
+ */
+async function writePushIdList(list) {
+    try {
+        await ensureDirectoryExists(PUSHID_LIST_FILE);
+        await fs.writeFile(PUSHID_LIST_FILE, JSON.stringify(list, null, 2), "utf-8");
+    }
+    catch (error) {
+        logger.error(`[PushIdManager] Failed to write pushIdList:`, error);
+        throw error;
+    }
+}
+/**
+ * 添加新的 pushId（去重）
+ */
+export async function addPushId(pushId) {
+    if (!pushId || typeof pushId !== "string") {
+        logger.warn(`[PushIdManager] Invalid pushId: ${pushId}`);
+        return;
+    }
+    try {
+        const list = await readPushIdList();
+        // 检查是否已存在
+        if (list.includes(pushId)) {
+            logger.log(`[PushIdManager] pushId already exists: ${pushId.substring(0, 20)}...`);
+            return;
+        }
+        // 添加新 pushId
+        list.push(pushId);
+        await writePushIdList(list);
+        logger.log(`[PushIdManager] ✅ Added new pushId: ${pushId.substring(0, 20)}...`);
+        logger.log(`[PushIdManager]   - Total pushIds: ${list.length}`);
+    }
+    catch (error) {
+        logger.error(`[PushIdManager] Failed to add pushId:`, error);
+        // 不抛出异常，避免影响主流程
+    }
+}
+/**
+ * 获取所有 pushId
+ */
+export async function getAllPushIds() {
+    try {
+        const list = await readPushIdList();
+        logger.log(`[PushIdManager] Retrieved ${list.length} pushIds`);
+        return list;
+    }
+    catch (error) {
+        logger.error(`[PushIdManager] Failed to get all pushIds:`, error);
+        return [];
+    }
+}
+/**
+ * 清空所有 pushId（用于测试或重置）
+ */
+export async function clearAllPushIds() {
+    try {
+        await writePushIdList([]);
+        logger.log(`[PushIdManager] Cleared all pushIds`);
+    }
+    catch (error) {
+        logger.error(`[PushIdManager] Failed to clear pushIds:`, error);
+    }
+}

package/dist/src/websocket.d.ts

@@ -2,7 +2,7 @@ import { EventEmitter } from "events";
 import type { RuntimeEnv } from "openclaw/plugin-sdk";
 import type { XYChannelConfig, OutboundWebSocketMessage } from "./types.js";
 /**
- * Diagnostics for a single WebSocket connection
+ * Diagnostics for WebSocket connection
  */
 export interface ConnectionDiagnostic {
     exists: boolean;
@@ -21,35 +21,30 @@ export interface ConnectionDiagnostic {
  */
 export interface ManagerDiagnostics {
     cacheKey: string;
-    server1: ConnectionDiagnostic;
-    server2: ConnectionDiagnostic;
+    connection: ConnectionDiagnostic;
     isShuttingDown: boolean;
     totalEventListeners: number;
 }
 /**
- * Manages dual WebSocket connections to XY servers.
- * Implements session-to-server binding for message routing.
+ * Manages single WebSocket connection to XY server.
  *
  * Events:
- * - 'message': (message: A2AJsonRpcRequest, sessionId: string, serverId: ServerIdentifier) => void
+ * - 'message': (message: A2AJsonRpcRequest, sessionId: string) => void
  * - 'data-event': (event: A2ADataEvent) => void
  * - 'gui-agent-response': (event: any) => void
- * - 'connected': (serverId: ServerIdentifier) => void
- * - 'disconnected': (serverId: ServerIdentifier) => void
- * - 'error': (error: Error, serverId: ServerIdentifier) => void
- * - 'ready': (serverId: ServerIdentifier) => void
+ * - 'trigger-event': (event: any) => void
+ * - 'connected': () => void
+ * - 'disconnected': () => void
+ * - 'error': (error: Error) => void
+ * - 'ready': () => void
  */
 export declare class XYWebSocketManager extends EventEmitter {
     private config;
     private runtime?;
-    private ws1;
-    private ws2;
-    private state1;
-    private state2;
-    private heartbeat1;
-    private heartbeat2;
-    private reconnectTimer1;
-    private reconnectTimer2;
+    private ws;
+    private state;
+    private heartbeat;
+    private reconnectTimer;
     private isShuttingDown;
     private log;
     private error;
@@ -64,45 +59,44 @@ export declare class XYWebSocketManager extends EventEmitter {
      */
     isConfigMatch(config: XYChannelConfig): boolean;
     /**
-     * Connect to both WebSocket servers.
+     * Connect to WebSocket server.
      * Does not throw error if connection fails - logs warning instead.
      */
     connect(): Promise<void>;
     /**
-     * Disconnect from both WebSocket servers.
+     * Disconnect from WebSocket server.
      */
     disconnect(): void;
     /**
-     * Send a message to the appropriate server based on session binding.
+     * Send a message to the server.
      */
     sendMessage(sessionId: string, message: OutboundWebSocketMessage): Promise<void>;
     /**
-     * Check if at least one server is ready.
+     * Check if server is ready.
      */
     isReady(): boolean;
     /**
      * Get detailed connection diagnostics for monitoring and debugging.
-     * Helps identify orphan connections and connection leaks.
      */
     getConnectionDiagnostics(): ManagerDiagnostics;
     /**
-     * Get diagnostic info for a single server connection.
+     * Get diagnostic info for the connection.
      */
-    private getServerDiagnostic;
+    private getConnectionDiagnostic;
     /**
-     * Connect to a specific server.
+     * Clean up connection without triggering reconnection.
      */
-    private connectServer;
+    private cleanupConnection;
     /**
-     * Disconnect from a specific server.
+     * Connect to server.
      */
-    private disconnectServer;
+    private connectServer;
     /**
      * Send init message to server.
      */
     private sendInitMessage;
     /**
-     * Start heartbeat for a server.
+     * Start heartbeat.
      */
     private startHeartbeat;
     /**
@@ -118,7 +112,7 @@ export declare class XYWebSocketManager extends EventEmitter {
      */
     private handleError;
     /**
-     * Reconnect to a server with exponential backoff.
+     * Reconnect with exponential backoff.
      */
     private reconnectServer;
 }