@searchfe/openclaw-baiduapp 0.1.6 → 0.1.7-beta.2

package/dist/index.d.ts

@@ -96,6 +96,13 @@ declare const baiduAppPlugin: {
         polls: boolean;
         activeSend: boolean;
     };
+    messaging: {
+        normalizeTarget: (raw: string) => string | undefined;
+        targetResolver: {
+            looksLikeId: () => boolean;
+            hint: string;
+        };
+    };
     configSchema: {
         schema: {
             type: string;
@@ -387,7 +394,14 @@ interface MoltbotPluginApi {
     registerChannel: (opts: {
         plugin: unknown;
     }) => void;
-    registerHttpHandler?: (handler: (req: IncomingMessage, res: ServerResponse) => Promise<boolean> | boolean) => void;
+    registerHttpRoute: (params: {
+        path: string;
+        handler: (req: IncomingMessage, res: ServerResponse) => Promise<boolean | void> | boolean | void;
+        auth: 'plugin' | 'gateway';
+        match?: 'exact' | 'prefix';
+        replaceExisting?: boolean;
+    }) => void;
+    registerHttpHandler: any;
     runtime?: unknown;
     [key: string]: unknown;
 }

package/dist/index.js

@@ -4331,11 +4331,7 @@ async function sendBaiduAppMessage(account, message, options) {
     invaliduser: data.invaliduser,
     msgid: data.msgid
   };
-  if (result.ok) {
-    logger.info(`request succeeded: msgid=${result.msgid ?? "unknown"}`);
-  } else {
-    logger.error(`request failed: errcode=${result.errcode} errmsg=${result.errmsg ?? "unknown"}`);
-  }
+  logger.info(`request succeeded: msgid=${result.msgid ?? "unknown"}`);
   return result;
 }
 
@@ -4448,6 +4444,7 @@ async function dispatchBaiduAppMessage(params) {
     cfg: safeCfg,
     dispatcherOptions: {
       deliver: async (payload) => {
+        console.log("DELIVER123", payload);
         const rawText = payload.text ?? "";
         if (!rawText.trim()) {
           logger2.debug("deliver callback: empty text, skipping");
@@ -4487,7 +4484,6 @@ 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;
 function normalizeWebhookPath(raw) {
   const trimmed = raw.trim();
   if (!trimmed) {
@@ -4520,26 +4516,6 @@ function truncateUtf8Bytes(text, maxBytes) {
   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");
@@ -4962,6 +4938,8 @@ async function handleBaiduAppWebhookRequest(req, res) {
     finished: false,
     content: ""
   });
+  let nextChunkKey = 0;
+  let activeSendQueue = Promise.resolve();
   logger2.info(`stream created: streamId=${streamId} msgid=${msgid ?? "none"}`);
   const core = tryGetBaiduAppRuntime();
   if (core) {
@@ -4972,6 +4950,7 @@ async function handleBaiduAppWebhookRequest(req, res) {
     logger2.info(`agent dispatch started: streamId=${streamId} canSendActive=${target.account.canSendActive}`);
     const hooks = {
       onChunk: (text) => {
+        console.log("CHUNK123", text);
         const current = streams.get(streamId);
         if (!current) {
           return;
@@ -4981,6 +4960,32 @@ async function handleBaiduAppWebhookRequest(req, res) {
           `chunk received: streamId=${streamId} chunkLen=${text.length} totalLen=${current.content.length}`
         );
         target.statusSink?.({ lastOutboundAt: Date.now() });
+        if (!target.account.canSendActive) {
+          return;
+        }
+        const chunkKey = nextChunkKey;
+        nextChunkKey += 1;
+        activeSendQueue = activeSendQueue.then(async () => {
+          try {
+            await sendBaiduAppMessage(target.account, text, {
+              msgid,
+              streamId,
+              chunkKey
+            });
+            logger2.debug(
+              `active send chunk ${chunkKey + 1} sent: streamId=${streamId} chunkLen=${text.length}`
+            );
+          } catch (err) {
+            const latest = streams.get(streamId);
+            if (latest) {
+              latest.error = err instanceof Error ? err.message : String(err);
+              latest.updatedAt = Date.now();
+            }
+            logger2.error(
+              `active send chunk failed: streamId=${streamId} chunkKey=${chunkKey} error=${String(err)}`
+            );
+          }
+        });
       },
       onError: (err) => {
         const current = streams.get(streamId);
@@ -5002,6 +5007,7 @@ async function handleBaiduAppWebhookRequest(req, res) {
       log: target.runtime.log,
       error: target.runtime.error
     }).then(async () => {
+      await activeSendQueue;
       const current = streams.get(streamId);
       if (current) {
         current.finished = true;
@@ -5015,28 +5021,13 @@ async function handleBaiduAppWebhookRequest(req, res) {
             `active send skipped: appKey/appSecret not configured for account ${target.account.accountId}`
           );
         } else if (!contentLen) {
-          logger2.warn(`active send skipped: agent produced no content`);
-        }
-        if (target.account.canSendActive && current.content.trim()) {
-          try {
-            const chunks = splitMessageByBytes(current.content, MAX_MESSAGE_BYTES);
-            logger2.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
-              });
-              logger2.debug(`active send chunk ${i + 1}/${chunks.length} sent: streamId=${streamId}`);
-            }
-            logger2.info(
-              `[REPLY-MODE:ACTIVE-SEND] active send complete: streamId=${streamId} chunks=${chunks.length}`
-            );
-          } catch (err) {
-            logger2.error(`active send failed: streamId=${streamId} error=${String(err)}`);
-          }
+          logger2.warn(
+            "active send skipped: no additional text available for Baidu App active send (reply may already have been sent via messaging tool)"
+          );
+        } else {
+          logger2.info(
+            `[REPLY-MODE:ACTIVE-SEND] active send complete: streamId=${streamId} chunks=${nextChunkKey}`
+          );
         }
       }
     }).catch((err) => {
@@ -5098,6 +5089,19 @@ var baiduAppPlugin = {
     polls: false,
     activeSend: true
   },
+  messaging: {
+    normalizeTarget: (raw) => {
+      const trimmed = raw.trim();
+      if (!trimmed) {
+        return void 0;
+      }
+      return trimmed.replace(/^openclaw-baiduapp:/i, "").trim() || void 0;
+    },
+    targetResolver: {
+      looksLikeId: () => true,
+      hint: "<user|openclaw-baiduapp:userId>"
+    }
+  },
   configSchema: BaiduAppConfigJsonSchema,
   reload: { configPrefixes: ["channels.openclaw-baiduapp"] },
   config: {
@@ -5413,7 +5417,14 @@ var plugin = {
       setBaiduAppRuntime(api.runtime);
     }
     api.registerChannel({ plugin: baiduAppPlugin });
-    if (api.registerHttpHandler) {
+    if (api.registerHttpRoute) {
+      api.registerHttpRoute({
+        path: "/openclaw-baiduapp",
+        auth: "plugin",
+        match: "prefix",
+        handler: handleBaiduAppWebhookRequest
+      });
+    } else if (api.registerHttpHandler) {
       api.registerHttpHandler(handleBaiduAppWebhookRequest);
     }
   }