@ynhcj/xiaoyi-channel 0.0.70-next → 0.0.71-next

package/dist/src/message-queue.d.ts

@@ -0,0 +1,17 @@
+import type { OutboundWebSocketMessage } from "./types.js";
+/**
+ * Simple message queue for buffering outbound WebSocket messages
+ * during disconnection and reconnection stabilization period.
+ */
+export declare class MessageQueue {
+    private items;
+    private log;
+    constructor(log?: (msg: string, ...args: any[]) => void);
+    /** Enqueue a message. Drops oldest if over limit. */
+    enqueue(message: OutboundWebSocketMessage): void;
+    /** Flush all queued messages by calling sendFn for each, then clear. */
+    flush(sendFn: (message: OutboundWebSocketMessage) => void): void;
+    /** Clear all queued messages without sending. */
+    clear(): void;
+    get size(): number;
+}

package/dist/src/message-queue.js

@@ -0,0 +1,51 @@
+const MAX_QUEUE_SIZE = 1000;
+/**
+ * Simple message queue for buffering outbound WebSocket messages
+ * during disconnection and reconnection stabilization period.
+ */
+export class MessageQueue {
+    items = [];
+    log;
+    constructor(log) {
+        this.log = log ?? console.log;
+    }
+    /** Enqueue a message. Drops oldest if over limit. */
+    enqueue(message) {
+        if (this.items.length >= MAX_QUEUE_SIZE) {
+            this.log(`[MessageQueue] Queue full (${MAX_QUEUE_SIZE}), dropping oldest message`);
+            this.items.shift();
+        }
+        this.items.push(message);
+        this.log(`[MessageQueue] Enqueued message, queue size: ${this.items.length}`);
+    }
+    /** Flush all queued messages by calling sendFn for each, then clear. */
+    flush(sendFn) {
+        const count = this.items.length;
+        if (count === 0) {
+            this.log("[MessageQueue] Queue empty, nothing to flush");
+            return;
+        }
+        this.log(`[MessageQueue] Flushing ${count} queued messages`);
+        for (const msg of this.items) {
+            try {
+                sendFn(msg);
+            }
+            catch (err) {
+                this.log(`[MessageQueue] Error flushing message: ${err}`);
+            }
+        }
+        this.items = [];
+        this.log(`[MessageQueue] Flush complete`);
+    }
+    /** Clear all queued messages without sending. */
+    clear() {
+        const count = this.items.length;
+        this.items = [];
+        if (count > 0) {
+            this.log(`[MessageQueue] Cleared ${count} messages`);
+        }
+    }
+    get size() {
+        return this.items.length;
+    }
+}

package/dist/src/monitor.js

@@ -2,7 +2,8 @@ import { resolveXYConfig } from "./config.js";
 import { getXYWebSocketManager, diagnoseAllManagers, cleanupOrphanConnections, removeXYWebSocketManager } from "./client.js";
 import { handleXYMessage } from "./bot.js";
 import { parseA2AMessage } from "./parser.js";
-import { hasActiveTask } from "./task-manager.js";
+import { hasActiveTask, getAllActiveTaskBindings } from "./task-manager.js";
+import { sendA2AResponse } from "./formatter.js";
 import { handleTriggerEvent } from "./trigger-handler.js";
 import { handleSelfEvolutionEvent, handleSelfEvolutionStateGetEvent } from "./self-evolution-handler.js";
 import { handleLoginTokenEvent } from "./login-token-handler.js";
@@ -204,8 +205,36 @@ export async function monitorXYProvider(opts = {}) {
             console.log("🔍 [DIAGNOSTICS] Checking WebSocket managers after cleanup...");
             diagnoseAllManagers();
         };
-        const handleAbort = () => {
-            log("XY gateway: abort signal received, stopping");
+        const handleAbort = async () => {
+            log("XY gateway: abort signal received, sending notifications before stopping");
+            // 📤 Send restart notification to all active sessions before disconnecting
+            try {
+                const activeBindings = getAllActiveTaskBindings();
+                if (activeBindings.length > 0) {
+                    const config = resolveXYConfig(cfg);
+                    const notificationText = "Gateway即将重启，重启期间可能短暂出现\u201c环境异常\u201d提示，请稍候并耐心重试~";
+                    log(`[MONITOR] 📤 Sending restart notifications to ${activeBindings.length} active session(s)`);
+                    const sendPromises = activeBindings.map(binding => sendA2AResponse({
+                        config,
+                        sessionId: binding.sessionId,
+                        taskId: binding.currentTaskId,
+                        messageId: binding.currentMessageId,
+                        text: notificationText,
+                        append: false,
+                        final: true,
+                    }).catch(err => {
+                        error(`[MONITOR] Failed to send restart notification to session ${binding.sessionId}: ${String(err)}`);
+                    }));
+                    await Promise.all(sendPromises);
+                    log(`[MONITOR] ✅ Restart notifications sent to ${activeBindings.length} session(s)`);
+                }
+                else {
+                    log(`[MONITOR] No active sessions, skipping restart notifications`);
+                }
+            }
+            catch (err) {
+                error(`[MONITOR] Error sending restart notifications: ${String(err)}`);
+            }
             cleanup();
             log("XY gateway stopped");
             resolve();

package/dist/src/task-manager.d.ts

@@ -48,6 +48,10 @@ export declare function hasActiveTask(sessionId: string): boolean;
  * 获取完整的binding信息（用于调试）
  */
 export declare function getTaskIdBinding(sessionId: string): TaskIdBinding | null;
+/**
+ * 获取所有活跃的 task bindings（用于 gateway_stop 通知等场景）
+ */
+export declare function getAllActiveTaskBindings(): TaskIdBinding[];
 /**
  * 强制清理（错误恢复用）
  */

package/dist/src/task-manager.js

@@ -127,6 +127,12 @@ export function hasActiveTask(sessionId) {
 export function getTaskIdBinding(sessionId) {
     return activeTaskIds.get(sessionId) ?? null;
 }
+/**
+ * 获取所有活跃的 task bindings（用于 gateway_stop 通知等场景）
+ */
+export function getAllActiveTaskBindings() {
+    return Array.from(activeTaskIds.values());
+}
 /**
  * 强制清理（错误恢复用）
  */

package/dist/src/websocket.d.ts

@@ -46,6 +46,9 @@ export declare class XYWebSocketManager extends EventEmitter {
     private heartbeat;
     private reconnectTimer;
     private isShuttingDown;
+    private messageQueue;
+    private isBuffering;
+    private reconnectBufferTimer;
     private log;
     private error;
     private onHealthEvent?;

package/dist/src/websocket.js

@@ -2,6 +2,7 @@
 import WebSocket from "ws";
 import { EventEmitter } from "events";
 import { HeartbeatManager } from "./heartbeat.js";
+import { MessageQueue } from "./message-queue.js";
 /**
  * Manages single WebSocket connection to XY server.
  *
@@ -28,6 +29,10 @@ export class XYWebSocketManager extends EventEmitter {
     heartbeat = null;
     reconnectTimer = null;
     isShuttingDown = false;
+    // Message queue for buffering during disconnection/reconnection
+    messageQueue;
+    isBuffering = false;
+    reconnectBufferTimer = null;
     // Logging functions
     log;
     error;
@@ -39,6 +44,7 @@ export class XYWebSocketManager extends EventEmitter {
         this.runtime = runtime;
         this.log = runtime?.log ?? console.log;
         this.error = runtime?.error ?? console.error;
+        this.messageQueue = new MessageQueue(this.log);
     }
     /**
      * Set health event callback to report activity to OpenClaw framework.
@@ -85,6 +91,13 @@ export class XYWebSocketManager extends EventEmitter {
             clearTimeout(this.reconnectTimer);
             this.reconnectTimer = null;
         }
+        // Clear message queue on explicit disconnect (not during reconnection)
+        if (this.reconnectBufferTimer) {
+            clearTimeout(this.reconnectBufferTimer);
+            this.reconnectBufferTimer = null;
+        }
+        this.messageQueue.clear();
+        this.isBuffering = false;
         this.cleanupConnection();
         this.log("Disconnected from XY WebSocket server");
     }
@@ -92,6 +105,10 @@ export class XYWebSocketManager extends EventEmitter {
      * Send a message to the server.
      */
     async sendMessage(sessionId, message) {
+        if (this.isBuffering) {
+            this.messageQueue.enqueue(message);
+            return;
+        }
         if (!this.ws || !this.state.ready || this.ws.readyState !== WebSocket.OPEN) {
             throw new Error("WebSocket not ready");
         }
@@ -185,6 +202,11 @@ export class XYWebSocketManager extends EventEmitter {
             clearTimeout(this.reconnectTimer);
             this.reconnectTimer = null;
         }
+        // Clear reconnect buffer timer (but keep message queue for reconnection)
+        if (this.reconnectBufferTimer) {
+            clearTimeout(this.reconnectBufferTimer);
+            this.reconnectBufferTimer = null;
+        }
         // Clean up WebSocket
         if (this.ws) {
             // Remove all event listeners
@@ -282,6 +304,24 @@ export class XYWebSocketManager extends EventEmitter {
         // Mark as ready after init
         this.state.ready = true;
         this.emit("ready");
+        // Start 10-second buffer period after reconnection
+        if (this.isBuffering) {
+            this.log("[MessageQueue] Reconnected, starting 10s buffer period before flushing queue");
+            // Clear any existing buffer timer
+            if (this.reconnectBufferTimer) {
+                clearTimeout(this.reconnectBufferTimer);
+            }
+            this.reconnectBufferTimer = setTimeout(() => {
+                this.reconnectBufferTimer = null;
+                this.messageQueue.flush((msg) => {
+                    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+                        this.ws.send(JSON.stringify(msg));
+                    }
+                });
+                this.isBuffering = false;
+                this.log("[MessageQueue] Buffer period ended, resumed direct sending");
+            }, 10000);
+        }
         // Start heartbeat
         this.startHeartbeat();
     }
@@ -509,6 +549,8 @@ export class XYWebSocketManager extends EventEmitter {
         }
         this.state.connected = false;
         this.state.ready = false;
+        // Start buffering messages during disconnection
+        this.isBuffering = true;
         this.emit("disconnected");
         // Clean up
         if (this.heartbeat) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.70-next",
+  "version": "0.0.71-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",