@searchfe/openclaw-baiduapp 0.1.8-beta.1 → 0.1.8-beta.2

package/dist/index.js

@@ -4534,15 +4534,18 @@ async function dispatchBaiduAppMessage(params) {
   await channel.reply.dispatchReplyWithBufferedBlockDispatcher({
     ctx: ctxPayload,
     cfg: safeCfg,
+    replyOptions: {
+      disableBlockStreaming: false
+    },
     dispatcherOptions: {
-      deliver: async (payload) => {
+      deliver: async (payload, info) => {
         const rawText = payload.text ?? "";
         if (!rawText.trim()) {
           logger3.debug("deliver callback: empty text, skipping");
           return;
         }
         const converted = channel.text?.convertMarkdownTables && tableMode ? channel.text.convertMarkdownTables(rawText, tableMode) : rawText;
-        logger3.debug(`deliver callback: textLen=${converted.length}`);
+        logger3.debug(`deliver callback: kind=${info.kind} textLen=${converted.length}`);
         hooks.onChunk(converted);
       },
       onError: (err, info) => {
@@ -5126,11 +5129,6 @@ function tryGetBaiduAppRuntime() {
 
 // src/monitor.ts
 var webhookTargets = /* @__PURE__ */ new Map();
-var streams = /* @__PURE__ */ new Map();
-var msgidToStreamId = /* @__PURE__ */ new Map();
-var STREAM_TTL_MS = 10 * 60 * 1e3;
-var STREAM_MAX_BYTES = 512e3;
-var MAX_MESSAGE_BYTES = 2048;
 var tempPruneInFlight = null;
 function normalizeWebhookPath(raw) {
   const trimmed = raw.trim();
@@ -5143,47 +5141,6 @@ function normalizeWebhookPath(raw) {
   }
   return withSlash;
 }
-function pruneStreams() {
-  const cutoff = Date.now() - STREAM_TTL_MS;
-  for (const [id, state] of streams.entries()) {
-    if (state.updatedAt < cutoff) {
-      streams.delete(id);
-    }
-  }
-  for (const [msgid, id] of msgidToStreamId.entries()) {
-    if (!streams.has(id)) {
-      msgidToStreamId.delete(msgid);
-    }
-  }
-}
-function truncateUtf8Bytes(text, maxBytes) {
-  const buf = Buffer.from(text, "utf8");
-  if (buf.length <= maxBytes) {
-    return text;
-  }
-  const slice = buf.subarray(buf.length - maxBytes);
-  return slice.toString("utf8");
-}
-function splitMessageByBytes(text, maxBytes = MAX_MESSAGE_BYTES) {
-  const result = [];
-  let current = "";
-  let currentBytes = 0;
-  for (const char of text) {
-    const charBytes = Buffer.byteLength(char, "utf8");
-    if (currentBytes + charBytes > maxBytes && current.length > 0) {
-      result.push(current);
-      current = char;
-      currentBytes = charBytes;
-    } else {
-      current += char;
-      currentBytes += charBytes;
-    }
-  }
-  if (current.length > 0) {
-    result.push(current);
-  }
-  return result;
-}
 function jsonOk(res, body) {
   res.statusCode = 200;
   res.setHeader("Content-Type", "application/json; charset=utf-8");
@@ -5276,93 +5233,6 @@ function resolvePath(req) {
 function resolveSignatureParam(params) {
   return params.get("msg_signature") ?? params.get("msgsignature") ?? params.get("signature") ?? "";
 }
-function buildStreamPlaceholderReply(streamId) {
-  return {
-    msgtype: "stream",
-    stream: {
-      id: streamId,
-      finish: false,
-      content: "\u7A0D\u7B49~"
-    }
-  };
-}
-function buildStreamReplyFromState(state) {
-  const content = truncateUtf8Bytes(state.content, STREAM_MAX_BYTES);
-  return {
-    msgtype: "stream",
-    stream: {
-      id: state.streamId,
-      finish: state.finished,
-      content
-    }
-  };
-}
-function createStreamId() {
-  return crypto3.randomBytes(16).toString("hex");
-}
-function parseBaiduAppPlainMessage(raw) {
-  const trimmed = raw.trim();
-  if (trimmed.startsWith("<") && trimmed.endsWith(">")) {
-    const xmlData = parseXmlBody(trimmed);
-    return {
-      msgtype: xmlData.MsgType,
-      MsgType: xmlData.MsgType,
-      msgid: xmlData.MsgId,
-      MsgId: xmlData.MsgId,
-      content: xmlData.Content,
-      Content: xmlData.Content,
-      from: xmlData.FromUserName ? { appkey: xmlData.FromUserName } : void 0,
-      ToUserName: xmlData.ToUserName,
-      CreateTime: xmlData.CreateTime ? Number(xmlData.CreateTime) : void 0,
-      BotID: xmlData.BotID ? Number(xmlData.BotID) : void 0,
-      Event: xmlData.Event
-    };
-  }
-  try {
-    const parsed = JSON.parse(trimmed);
-    if (!parsed || typeof parsed !== "object") {
-      return {};
-    }
-    return parsed;
-  } catch {
-    return {};
-  }
-}
-function decryptBaiduAppCandidates(params) {
-  const results = [];
-  for (const candidate of params.candidates) {
-    if (!candidate.account.encodingAESKey) {
-      continue;
-    }
-    try {
-      const plaintext = decryptBaiduAppEncrypted({
-        encodingAESKey: candidate.account.encodingAESKey,
-        encrypt: params.encrypt
-      });
-      const msg = parseBaiduAppPlainMessage(plaintext);
-      results.push({ target: candidate, plaintext, msg });
-    } catch {
-    }
-  }
-  return results;
-}
-function selectDecryptedTarget(params) {
-  if (params.candidates.length === 1) {
-    return params.candidates[0];
-  }
-  const accountIds = params.candidates.map((candidate) => candidate.target.account.accountId).join(", ");
-  params.logger.warn(
-    `multiple openclaw-baiduapp accounts matched signature; using first match (accounts: ${accountIds})`
-  );
-  return params.candidates[0];
-}
-function appendStreamContent(state, nextText) {
-  const content = state.content ? `${state.content}
-
-${nextText}`.trim() : nextText.trim();
-  state.content = truncateUtf8Bytes(content, STREAM_MAX_BYTES);
-  state.updatedAt = Date.now();
-}
 function buildLogger(target) {
   return createLogger("openclaw-baiduapp", {
     log: target.runtime.log,
@@ -5429,6 +5299,62 @@ async function downloadInboundFiles(params) {
     }
   };
 }
+function parseBaiduAppPlainMessage(raw) {
+  const trimmed = raw.trim();
+  if (trimmed.startsWith("<") && trimmed.endsWith(">")) {
+    const xmlData = parseXmlBody(trimmed);
+    return {
+      msgtype: xmlData.MsgType,
+      MsgType: xmlData.MsgType,
+      msgid: xmlData.MsgId,
+      MsgId: xmlData.MsgId,
+      content: xmlData.Content,
+      Content: xmlData.Content,
+      from: xmlData.FromUserName ? { appkey: xmlData.FromUserName } : void 0,
+      ToUserName: xmlData.ToUserName,
+      CreateTime: xmlData.CreateTime ? Number(xmlData.CreateTime) : void 0,
+      BotID: xmlData.BotID ? Number(xmlData.BotID) : void 0,
+      Event: xmlData.Event
+    };
+  }
+  try {
+    const parsed = JSON.parse(trimmed);
+    if (!parsed || typeof parsed !== "object") {
+      return {};
+    }
+    return parsed;
+  } catch {
+    return {};
+  }
+}
+function decryptBaiduAppCandidates(params) {
+  const results = [];
+  for (const candidate of params.candidates) {
+    if (!candidate.account.encodingAESKey) {
+      continue;
+    }
+    try {
+      const plaintext = decryptBaiduAppEncrypted({
+        encodingAESKey: candidate.account.encodingAESKey,
+        encrypt: params.encrypt
+      });
+      const msg = parseBaiduAppPlainMessage(plaintext);
+      results.push({ target: candidate, plaintext, msg });
+    } catch {
+    }
+  }
+  return results;
+}
+function selectDecryptedTarget(params) {
+  if (params.candidates.length === 1) {
+    return params.candidates[0];
+  }
+  const accountIds = params.candidates.map((candidate) => candidate.target.account.accountId).join(", ");
+  params.logger.warn(
+    `multiple openclaw-baiduapp accounts matched signature; using first match (accounts: ${accountIds})`
+  );
+  return params.candidates[0];
+}
 async function processBaiduAppInboundMessage(params) {
   const { target, msg } = params;
   const logger3 = buildLogger(target);
@@ -5436,70 +5362,43 @@ async function processBaiduAppInboundMessage(params) {
   const msgtype = String(msg.msgtype ?? msg.MsgType ?? "").toLowerCase();
   const msgid = msg.msgid ?? msg.MsgId ? String(msg.msgid ?? msg.MsgId) : void 0;
   logger3.info(`inbound: type=${msgtype || "unknown"} msgid=${msgid ?? "none"} account=${target.account.accountId}`);
-  if (msgtype === "stream") {
-    const streamId2 = String(msg.stream?.id ?? "").trim();
-    const state = streamId2 ? streams.get(streamId2) : void 0;
-    logger3.info(
-      `[REPLY-MODE:STREAM-POLL] stream poll request: streamId=${streamId2 || "none"} found=${Boolean(state)} finished=${state?.finished ?? "n/a"} contentLen=${state?.content.length ?? 0}`
-    );
-    return state ? buildStreamReplyFromState(state) : buildStreamReplyFromState({
-      streamId: streamId2 || "unknown",
-      finished: true,
-      content: ""
-    });
-  }
-  if (msgid && msgidToStreamId.has(msgid)) {
-    const streamId2 = msgidToStreamId.get(msgid) ?? "";
-    logger3.debug(`duplicate msgid detected: msgid=${msgid} streamId=${streamId2}, returning placeholder`);
-    return buildStreamPlaceholderReply(streamId2);
-  }
   if (!canDispatchBaiduAppInboundMessage(msg)) {
     logger3.warn(`inbound message skipped: type=${msgtype || "unknown"} reason=no-dispatchable-content`);
     return {};
   }
   const inboundFileResult = msgtype === "text" ? await downloadInboundFiles({ msg, logger: logger3, runtime: target.runtime }) : { localFiles: [], diagnostic: {} };
   const inboundMediaFiles = inboundFileResult.localFiles;
-  const streamId = createStreamId();
-  if (msgid) {
-    msgidToStreamId.set(msgid, streamId);
-  }
-  streams.set(streamId, {
-    streamId,
-    msgid,
-    createdAt: Date.now(),
-    updatedAt: Date.now(),
-    started: false,
-    finished: false,
-    content: ""
-  });
-  logger3.info(`stream created: streamId=${streamId} msgid=${msgid ?? "none"}`);
   const core = tryGetBaiduAppRuntime();
   if (core) {
-    const state = streams.get(streamId);
-    if (state) {
-      state.started = true;
-    }
-    logger3.info(`agent dispatch started: streamId=${streamId} canSendActive=${target.account.canSendActive}`);
+    logger3.info(`agent dispatch started: canSendActive=${target.account.canSendActive}`);
+    let chunkKey = 0;
     const hooks = {
       onChunk: (text) => {
-        const current = streams.get(streamId);
-        if (!current) {
-          return;
-        }
-        appendStreamContent(current, text);
+        const currentChunkKey = chunkKey++;
         logger3.debug(
-          `chunk received: streamId=${streamId} chunkLen=${text.length} totalLen=${current.content.length}`
+          `chunk received: chunkKey=${currentChunkKey} chunkLen=${text.length}`
         );
         target.statusSink?.({ lastOutboundAt: Date.now() });
+        if (target.account.canSendActive) {
+          sendBaiduAppMessage(target.account, text, {
+            msgid,
+            chunkKey: currentChunkKey
+          }).then((result) => {
+            if (!result.ok) {
+              logger3.error(
+                `chunk send failed: chunkKey=${currentChunkKey} error=${result.errmsg ?? "unknown"}`
+              );
+            } else {
+              logger3.debug(`chunk sent: chunkKey=${currentChunkKey}`);
+            }
+          }).catch((err) => {
+            logger3.error(
+              `chunk send error: chunkKey=${currentChunkKey} error=${String(err)}`
+            );
+          });
+        }
       },
       onError: (err) => {
-        const current = streams.get(streamId);
-        if (current) {
-          current.error = err instanceof Error ? err.message : String(err);
-          current.content = current.content || `Error: ${current.error}`;
-          current.finished = true;
-          current.updatedAt = Date.now();
-        }
         logger3.error(`openclaw-baiduapp agent failed: ${String(err)}`);
       }
     };
@@ -5513,65 +5412,15 @@ async function processBaiduAppInboundMessage(params) {
       inboundFileDiagnostic: inboundFileResult.diagnostic,
       log: target.runtime.log,
       error: target.runtime.error
-    }).then(async () => {
-      const current = streams.get(streamId);
-      if (current) {
-        current.finished = true;
-        current.updatedAt = Date.now();
-        const contentLen = current.content.trim().length;
-        logger3.info(
-          `agent dispatch done: streamId=${streamId} contentLen=${contentLen} canSendActive=${target.account.canSendActive}`
-        );
-        if (!target.account.canSendActive) {
-          logger3.warn(
-            `active send skipped: appKey/appSecret not configured for account ${target.account.accountId}`
-          );
-        } else if (!contentLen) {
-          logger3.warn(`active send skipped: agent produced no content`);
-        }
-        if (target.account.canSendActive && current.content.trim()) {
-          try {
-            const chunks = splitMessageByBytes(current.content, MAX_MESSAGE_BYTES);
-            logger3.info(
-              `[REPLY-MODE:ACTIVE-SEND] active send starting: streamId=${streamId} chunks=${chunks.length} contentLen=${contentLen}`
-            );
-            for (let i = 0; i < chunks.length; i++) {
-              await sendBaiduAppMessage(target.account, chunks[i], {
-                msgid,
-                streamId,
-                chunkKey: i
-              });
-              logger3.debug(`active send chunk ${i + 1}/${chunks.length} sent: streamId=${streamId}`);
-            }
-            logger3.info(
-              `[REPLY-MODE:ACTIVE-SEND] active send complete: streamId=${streamId} chunks=${chunks.length}`
-            );
-          } catch (err) {
-            logger3.error(`active send failed: streamId=${streamId} error=${String(err)}`);
-          }
-        }
-      }
+    }).then(() => {
+      logger3.info(`agent dispatch done: totalChunks=${chunkKey}`);
     }).catch((err) => {
-      const current = streams.get(streamId);
-      if (current) {
-        current.error = err instanceof Error ? err.message : String(err);
-        current.content = current.content || `Error: ${current.error}`;
-        current.finished = true;
-        current.updatedAt = Date.now();
-      }
-      logger3.error(`agent dispatch failed: streamId=${streamId} error=${String(err)}`);
+      logger3.error(`agent dispatch failed: error=${String(err)}`);
     });
   } else {
-    logger3.warn(`runtime not available: streamId=${streamId} \u2014 agent dispatch skipped, no reply will be generated`);
-    const state = streams.get(streamId);
-    if (state) {
-      state.finished = true;
-      state.updatedAt = Date.now();
-    }
+    logger3.warn(`runtime not available \u2014 agent dispatch skipped, no reply will be generated`);
   }
-  const placeholderReply = buildStreamPlaceholderReply(streamId);
-  logger3.debug(`stream placeholder reply sent: streamId=${streamId}`);
-  return placeholderReply;
+  return {};
 }
 function registerBaiduAppWebhookTarget(target) {
   const key = normalizeWebhookPath(target.path);
@@ -5589,7 +5438,6 @@ function registerBaiduAppWebhookTarget(target) {
   };
 }
 async function handleBaiduAppWebhookRequest(req, res) {
-  pruneStreams();
   const path4 = resolvePath(req);
   const targets = webhookTargets.get(path4);
   if (!targets || targets.length === 0) {
@@ -6509,6 +6357,15 @@ var plugin = {
     } else if (api.registerHttpHandler) {
       api.registerHttpHandler(handleBaiduAppWebhookRequest);
     }
+    const typedApi = api;
+    if (typeof typedApi.on === "function") {
+      typedApi.on("before_tool_call", (event) => {
+        console.log(`[openclaw-baiduapp] before_tool_call raw:`, JSON.stringify(event));
+      });
+      typedApi.on("after_tool_call", (event) => {
+        console.log(`[openclaw-baiduapp] after_tool_call raw:`, JSON.stringify(event));
+      });
+    }
   }
 };
 var index_default = plugin;