@wu529778790/open-im 1.5.3 → 1.5.4

package/dist/wework/message-sender.js

@@ -8,6 +8,8 @@ import { splitLongContent, getAIToolDisplayName } from '../shared/utils.js';
 import { MAX_WEWORK_MESSAGE_LENGTH } from '../constants.js';
 import { randomBytes } from 'node:crypto';
 const log = createLogger('WeWorkSender');
+const STREAM_SEND_INTERVAL_MS = 900;
+const STREAM_SAFE_TTL_MS = 5 * 60 * 1000;
 /** 当前同步处理中的 req_id（仅用于 commandHandler 等同步调用） */
 let currentReqId = null;
 export function setCurrentReqId(reqId) {
@@ -61,11 +63,61 @@ function formatWeWorkMessage(title, content, status, note) {
     }
     return message;
 }
-/**
- * Local tracking for stream states
- * WeWork doesn't support message editing, so we track stream IDs locally
- */
 const streamStates = new Map();
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function getOrCreateStreamState(streamId, chatId) {
+    const existing = streamStates.get(streamId);
+    if (existing)
+        return existing;
+    const state = {
+        chatId,
+        content: '',
+        createdAt: Date.now(),
+        lastSentAt: 0,
+        closed: false,
+        expired: false,
+        flushing: false,
+        expireLogged: false,
+    };
+    streamStates.set(streamId, state);
+    return state;
+}
+function markExpired(state, streamId) {
+    state.expired = true;
+    if (!state.expireLogged) {
+        state.expireLogged = true;
+        log.warn(`Stream expired locally, switching to text fallback: streamId=${streamId}`);
+    }
+}
+async function flushStreamUpdate(streamId, state) {
+    if (state.flushing || state.closed || state.expired)
+        return;
+    state.flushing = true;
+    try {
+        while (state.pendingUpdate && !state.closed && !state.expired) {
+            const queued = state.pendingUpdate;
+            state.pendingUpdate = undefined;
+            if (Date.now() - state.createdAt >= STREAM_SAFE_TTL_MS) {
+                markExpired(state, streamId);
+                break;
+            }
+            const elapsed = Date.now() - state.lastSentAt;
+            if (elapsed < STREAM_SEND_INTERVAL_MS) {
+                await sleep(STREAM_SEND_INTERVAL_MS - elapsed);
+            }
+            if (state.closed || state.expired)
+                break;
+            sendStream(getReqId(queued.reqId), streamId, queued.message, false);
+            state.lastSentAt = Date.now();
+            log.info(`Message updated: ${queued.status}, streamId=${streamId}`);
+        }
+    }
+    finally {
+        state.flushing = false;
+    }
+}
 /**
  * Send thinking message to WeWork
  * Returns a stream ID that can be used for updates
@@ -78,7 +130,7 @@ export async function sendThinkingMessage(chatId, _replyToMessageId, toolId = 'c
     try {
         log.info(`Sending thinking message to user ${chatId}, streamId=${streamId}`);
         // Store initial stream state
-        streamStates.set(streamId, { content: '', chatId });
+        getOrCreateStreamState(streamId, chatId);
         // Send initial stream message (not finished)
         sendStream(getReqId(reqId), streamId, content, false);
         log.info(`Thinking message sent: ${streamId}`);
@@ -96,12 +148,18 @@ export async function sendThinkingMessage(chatId, _replyToMessageId, toolId = 'c
 export async function updateMessage(chatId, streamId, content, status, note, toolId = 'claude', reqId) {
     const title = getToolTitle(toolId, status);
     const message = formatWeWorkMessage(title, content, status, note);
+    const state = getOrCreateStreamState(streamId, chatId);
     try {
-        // Update stream state
-        streamStates.set(streamId, { content, chatId });
-        // Send stream update (not finished yet)
-        sendStream(getReqId(reqId), streamId, message, false);
-        log.info(`Message updated: ${status}, streamId=${streamId}`);
+        state.chatId = chatId;
+        state.content = content;
+        if (state.closed)
+            return;
+        if (Date.now() - state.createdAt >= STREAM_SAFE_TTL_MS) {
+            markExpired(state, streamId);
+            return;
+        }
+        state.pendingUpdate = { message, status, reqId };
+        await flushStreamUpdate(streamId, state);
     }
     catch (err) {
         log.error('Failed to update message:', err);
@@ -117,9 +175,26 @@ export async function sendFinalMessages(chatId, streamId, fullContent, note, too
     // Send final stream message to finish the stream
     const finalMessage = formatWeWorkMessage(title, parts[0], 'done', parts.length > 1 ? `内容较长，已分段发送 (1/${parts.length})` : note);
     try {
-        sendStream(getReqId(reqId), streamId, finalMessage, true);
-        log.info(`Final stream message sent, streamId=${streamId}`);
-        // Clean up stream state
+        const state = streamStates.get(streamId);
+        const shouldFallbackToText = !!state && (state.expired || Date.now() - state.createdAt >= STREAM_SAFE_TTL_MS);
+        if (state) {
+            state.closed = true;
+            state.pendingUpdate = undefined;
+        }
+        if (!shouldFallbackToText) {
+            if (state) {
+                const elapsed = Date.now() - state.lastSentAt;
+                if (elapsed < STREAM_SEND_INTERVAL_MS) {
+                    await sleep(STREAM_SEND_INTERVAL_MS - elapsed);
+                }
+            }
+            sendStream(getReqId(reqId), streamId, finalMessage, true);
+            log.info(`Final stream message sent, streamId=${streamId}`);
+        }
+        else {
+            sendText(getReqId(reqId), finalMessage);
+            log.info(`Final stream expired, sent text fallback instead: streamId=${streamId}`);
+        }
         streamStates.delete(streamId);
         // Send remaining parts as separate messages
         for (let i = 1; i < parts.length; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, Cursor)",
   "type": "module",
   "main": "dist/index.js",