@searchfe/openclaw-baiduapp 0.1.0-beta.4 → 0.1.0-beta.5

package/dist/index.js

@@ -4627,8 +4627,13 @@ function splitMessageByBytes(text, maxBytes = MAX_MESSAGE_BYTES) {
 }
 function jsonOk(res, body) {
   res.statusCode = 200;
-  res.setHeader("Content-Type", "text/plain; charset=utf-8");
-  res.end(JSON.stringify(body));
+  res.setHeader("Content-Type", "application/json; charset=utf-8");
+  res.end(JSON.stringify({ status: 0, data: body }));
+}
+function jsonError(res, message, statusCode = 200) {
+  res.statusCode = statusCode;
+  res.setHeader("Content-Type", "application/json; charset=utf-8");
+  res.end(JSON.stringify({ status: -1, message }));
 }
 async function readRawBody(req, maxBytes) {
   const chunks = [];
@@ -4836,8 +4841,7 @@ async function handleBaiduAppWebhookRequest(req, res) {
   if (req.method === "GET") {
     const echostr = query.get("echostr") ?? "";
     if (!timestamp || !nonce || !signature || !echostr) {
-      res.statusCode = 400;
-      res.end("missing query params");
+      jsonError(res, "missing query params", 400);
       return true;
     }
     const signatureMatched2 = targets.filter((candidate) => {
@@ -4853,14 +4857,12 @@ async function handleBaiduAppWebhookRequest(req, res) {
       });
     });
     if (signatureMatched2.length === 0) {
-      res.statusCode = 401;
-      res.end("unauthorized");
+      jsonError(res, "unauthorized");
       return true;
     }
     const decryptable2 = signatureMatched2.filter((candidate) => Boolean(candidate.account.encodingAESKey));
     if (decryptable2.length === 0) {
-      res.statusCode = 401;
-      res.end("unauthorized");
+      jsonError(res, "unauthorized");
       return true;
     }
     const decryptedCandidates2 = decryptBaiduAppCandidates({
@@ -4868,31 +4870,24 @@ async function handleBaiduAppWebhookRequest(req, res) {
       encrypt: echostr
     });
     if (decryptedCandidates2.length === 0) {
-      res.statusCode = 400;
-      res.end("decrypt failed");
+      jsonError(res, "decrypt failed");
       return true;
     }
     const selected2 = selectDecryptedTarget({ candidates: decryptedCandidates2, logger });
-    res.statusCode = 200;
-    res.setHeader("Content-Type", "text/plain; charset=utf-8");
-    res.end(selected2.plaintext);
+    jsonOk(res, selected2.plaintext);
     return true;
   }
   if (req.method !== "POST") {
-    res.statusCode = 405;
-    res.setHeader("Allow", "GET, POST");
-    res.end("Method Not Allowed");
+    jsonError(res, "Method Not Allowed", 405);
     return true;
   }
   if (!timestamp || !nonce || !signature) {
-    res.statusCode = 400;
-    res.end("missing query params");
+    jsonError(res, "missing query params");
     return true;
   }
   const body = await readRawBody(req, 1024 * 1024);
   if (!body.ok || !body.raw) {
-    res.statusCode = body.error === "payload too large" ? 413 : 400;
-    res.end(body.error ?? "invalid payload");
+    jsonError(res, body.error ?? "invalid payload");
     return true;
   }
   const rawBody = body.raw;
@@ -4914,14 +4909,12 @@ async function handleBaiduAppWebhookRequest(req, res) {
       logger.info(`inbound json parsed: hasEncrypt=${Boolean(encrypt)}`);
     } catch {
       logger.warn(`inbound payload parse failed: not valid xml or json`);
-      res.statusCode = 400;
-      res.end("invalid payload format");
+      jsonError(res, "invalid payload format");
       return true;
     }
   }
   if (!encrypt) {
-    res.statusCode = 400;
-    res.end("missing encrypt");
+    jsonError(res, "missing encrypt");
     return true;
   }
   const signatureMatched = targets.filter((candidate) => {
@@ -4938,16 +4931,14 @@ async function handleBaiduAppWebhookRequest(req, res) {
   });
   if (signatureMatched.length === 0) {
     logger.warn(`signature verification failed: checked ${targets.length} account(s), none matched`);
-    res.statusCode = 401;
-    res.end("unauthorized");
+    jsonError(res, "unauthorized");
     return true;
   }
   logger.debug(`signature verified: ${signatureMatched.length} account(s) matched`);
   const decryptable = signatureMatched.filter((candidate) => Boolean(candidate.account.encodingAESKey));
   if (decryptable.length === 0) {
     logger.warn(`no account has encodingAESKey configured`);
-    res.statusCode = 500;
-    res.end("baidu-app not configured");
+    jsonError(res, "baidu-app not configured");
     return true;
   }
   const decryptedCandidates = decryptBaiduAppCandidates({
@@ -4956,16 +4947,14 @@ async function handleBaiduAppWebhookRequest(req, res) {
   });
   if (decryptedCandidates.length === 0) {
     logger.warn(`decrypt failed for all ${decryptable.length} candidate account(s)`);
-    res.statusCode = 400;
-    res.end("decrypt failed");
+    jsonError(res, "decrypt failed");
     return true;
   }
   const selected = selectDecryptedTarget({ candidates: decryptedCandidates, logger });
   const target = selected.target;
   if (!target.account.configured || !target.account.token || !target.account.encodingAESKey) {
     logger.warn(`selected account ${target.account.accountId} not fully configured`);
-    res.statusCode = 500;
-    res.end("baidu-app not configured");
+    jsonError(res, "baidu-app not configured");
     return true;
   }
   const msg = selected.msg;