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

package/dist/index.d.ts

@@ -7,7 +7,6 @@ interface BaiduAppAccountConfig {
     webhookPath?: string;
     token?: string;
     encodingAESKey?: string;
-    receiveId?: string;
     appKey?: string;
     appSecret?: string;
     apiBase?: string;
@@ -26,7 +25,6 @@ interface ResolvedBaiduAppAccount {
     configured: boolean;
     token?: string;
     encodingAESKey?: string;
-    receiveId: string;
     appKey?: string;
     appSecret?: string;
     apiBase: string;
@@ -130,9 +128,6 @@ declare const baiduAppPlugin: {
                 encodingAESKey: {
                     type: string;
                 };
-                receiveId: {
-                    type: string;
-                };
                 appKey: {
                     type: string;
                 };
@@ -179,9 +174,6 @@ declare const baiduAppPlugin: {
                             encodingAESKey: {
                                 type: string;
                             };
-                            receiveId: {
-                                type: string;
-                            };
                             appKey: {
                                 type: string;
                             };

package/dist/index.js

@@ -4055,7 +4055,6 @@ var BaiduAppAccountSchema = external_exports.object({
   webhookPath: external_exports.string().optional(),
   token: external_exports.string().optional(),
   encodingAESKey: external_exports.string().optional(),
-  receiveId: external_exports.string().optional(),
   appKey: external_exports.string().optional(),
   appSecret: external_exports.string().optional(),
   apiBase: external_exports.string().optional(),
@@ -4077,7 +4076,6 @@ var BaiduAppConfigJsonSchema = {
       webhookPath: { type: "string" },
       token: { type: "string" },
       encodingAESKey: { type: "string" },
-      receiveId: { type: "string" },
       appKey: { type: "string" },
       appSecret: { type: "string" },
       apiBase: { type: "string" },
@@ -4096,7 +4094,6 @@ var BaiduAppConfigJsonSchema = {
             webhookPath: { type: "string" },
             token: { type: "string" },
             encodingAESKey: { type: "string" },
-            receiveId: { type: "string" },
             appKey: { type: "string" },
             appSecret: { type: "string" },
             apiBase: { type: "string" },
@@ -4159,7 +4156,6 @@ function resolveBaiduAppAccount(params) {
   const isDefaultAccount = accountId === DEFAULT_ACCOUNT_ID;
   const token = merged.token?.trim() || (isDefaultAccount ? process.env.BAIDU_APP_TOKEN?.trim() : void 0) || void 0;
   const encodingAESKey = merged.encodingAESKey?.trim() || (isDefaultAccount ? process.env.BAIDU_APP_ENCODING_AES_KEY?.trim() : void 0) || void 0;
-  const receiveId = merged.receiveId?.trim() ?? "";
   const appKey = merged.appKey?.trim() || (isDefaultAccount ? process.env.BAIDU_APP_KEY?.trim() : void 0) || void 0;
   const appSecret = merged.appSecret?.trim() || (isDefaultAccount ? process.env.BAIDU_APP_SECRET?.trim() : void 0) || void 0;
   const configured = Boolean(token && encodingAESKey);
@@ -4173,7 +4169,6 @@ function resolveBaiduAppAccount(params) {
     configured,
     token,
     encodingAESKey,
-    receiveId,
     appKey,
     appSecret,
     apiBase,
@@ -4525,15 +4520,7 @@ function decryptBaiduAppEncrypted(params) {
   if (msgEnd > decrypted.length) {
     throw new Error(`invalid decrypted msg length (msgEnd=${msgEnd}, payloadLength=${decrypted.length})`);
   }
-  const msg = decrypted.subarray(msgStart, msgEnd).toString("utf8");
-  const receiveId = params.receiveId ?? "";
-  if (receiveId) {
-    const trailing = decrypted.subarray(msgEnd).toString("utf8");
-    if (trailing !== receiveId) {
-      throw new Error(`receiveId mismatch (expected "${receiveId}", got "${trailing}")`);
-    }
-  }
-  return msg;
+  return decrypted.subarray(msgStart, msgEnd).toString("utf8");
 }
 function encryptBaiduAppPlaintext(params) {
   const aesKey = decodeEncodingAESKey(params.encodingAESKey);
@@ -4542,8 +4529,7 @@ function encryptBaiduAppPlaintext(params) {
   const msg = Buffer.from(params.plaintext ?? "", "utf8");
   const msgLen = Buffer.alloc(4);
   msgLen.writeUInt32BE(msg.length, 0);
-  const receiveId = Buffer.from(params.receiveId ?? "", "utf8");
-  const raw = Buffer.concat([random16, msgLen, msg, receiveId]);
+  const raw = Buffer.concat([random16, msgLen, msg]);
   const padded = pkcs7Pad(raw, PKCS7_BLOCK_SIZE);
   const cipher = crypto.createCipheriv("aes-256-cbc", aesKey, iv);
   cipher.setAutoPadding(false);
@@ -4627,8 +4613,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 = [];
@@ -4685,7 +4676,6 @@ function buildEncryptedJsonReply(params) {
   const plaintext = JSON.stringify(params.plaintextJson ?? {});
   const encrypt = encryptBaiduAppPlaintext({
     encodingAESKey: params.account.encodingAESKey ?? "",
-    receiveId: params.account.receiveId ?? "",
     plaintext
   });
   const msgsignature = computeBaiduAppMsgSignature({
@@ -4774,7 +4764,6 @@ function decryptBaiduAppCandidates(params) {
     try {
       const plaintext = decryptBaiduAppEncrypted({
         encodingAESKey: candidate.account.encodingAESKey,
-        receiveId: candidate.account.receiveId,
         encrypt: params.encrypt
       });
       const msg = parseBaiduAppPlainMessage(plaintext);
@@ -4836,8 +4825,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 +4841,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 +4854,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 +4893,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 +4915,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 +4931,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;