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

package/dist/index.d.ts

@@ -10,6 +10,7 @@ interface BaiduAppAccountConfig {
     receiveId?: string;
     appKey?: string;
     appSecret?: string;
+    apiBase?: string;
     welcomeText?: string;
     dmPolicy?: BaiduAppDmPolicy;
     allowFrom?: string[];
@@ -28,6 +29,7 @@ interface ResolvedBaiduAppAccount {
     receiveId: string;
     appKey?: string;
     appSecret?: string;
+    apiBase: string;
     canSendActive: boolean;
     config: BaiduAppAccountConfig;
 }
@@ -137,6 +139,9 @@ declare const baiduAppPlugin: {
                 appSecret: {
                     type: string;
                 };
+                apiBase: {
+                    type: string;
+                };
                 welcomeText: {
                     type: string;
                 };
@@ -183,6 +188,9 @@ declare const baiduAppPlugin: {
                             appSecret: {
                                 type: string;
                             };
+                            apiBase: {
+                                type: string;
+                            };
                             welcomeText: {
                                 type: string;
                             };

package/dist/index.js

@@ -4048,6 +4048,7 @@ var NEVER = INVALID;
 
 // src/config.ts
 var DEFAULT_ACCOUNT_ID = "default";
+var DEFAULT_API_BASE = "https://claw.baidu.com";
 var BaiduAppAccountSchema = external_exports.object({
   name: external_exports.string().optional(),
   enabled: external_exports.boolean().optional(),
@@ -4057,6 +4058,7 @@ var BaiduAppAccountSchema = external_exports.object({
   receiveId: external_exports.string().optional(),
   appKey: external_exports.string().optional(),
   appSecret: external_exports.string().optional(),
+  apiBase: external_exports.string().optional(),
   welcomeText: external_exports.string().optional(),
   dmPolicy: external_exports.enum(["open", "pairing", "allowlist", "disabled"]).optional(),
   allowFrom: external_exports.array(external_exports.string()).optional()
@@ -4078,6 +4080,7 @@ var BaiduAppConfigJsonSchema = {
       receiveId: { type: "string" },
       appKey: { type: "string" },
       appSecret: { type: "string" },
+      apiBase: { type: "string" },
       welcomeText: { type: "string" },
       dmPolicy: { type: "string", enum: ["open", "pairing", "allowlist", "disabled"] },
       allowFrom: { type: "array", items: { type: "string" } },
@@ -4096,6 +4099,7 @@ var BaiduAppConfigJsonSchema = {
             receiveId: { type: "string" },
             appKey: { type: "string" },
             appSecret: { type: "string" },
+            apiBase: { type: "string" },
             welcomeText: { type: "string" },
             dmPolicy: { type: "string", enum: ["open", "pairing", "allowlist", "disabled"] },
             allowFrom: { type: "array", items: { type: "string" } }
@@ -4160,6 +4164,8 @@ function resolveBaiduAppAccount(params) {
   const appSecret = merged.appSecret?.trim() || (isDefaultAccount ? process.env.BAIDU_APP_SECRET?.trim() : void 0) || void 0;
   const configured = Boolean(token && encodingAESKey);
   const canSendActive = Boolean(appKey && appSecret);
+  const rawApiBase = merged.apiBase?.trim() || (isDefaultAccount ? process.env.BAIDU_API_BASE?.trim() : void 0) || void 0;
+  const apiBase = (rawApiBase || DEFAULT_API_BASE).replace(/\/+$/, "");
   return {
     accountId,
     name: merged.name?.trim() || void 0,
@@ -4170,6 +4176,7 @@ function resolveBaiduAppAccount(params) {
     receiveId,
     appKey,
     appSecret,
+    apiBase,
     canSendActive,
     config: merged
   };
@@ -4215,9 +4222,6 @@ function checkDmPolicy(params) {
 }
 
 // src/api.ts
-var BAIDU_API_BASE = process.env.BAIDU_API_BASE?.replace(/\/+$/, "") || "https://openapi.baidu.com";
-var TOKEN_URL = `${BAIDU_API_BASE}/auth/token`;
-var SEND_MESSAGE_URL = `${BAIDU_API_BASE}/chat/openclaw/callback`;
 var accessTokenCache = /* @__PURE__ */ new Map();
 var ACCESS_TOKEN_TTL_MS = 7200 * 1e3 - 5 * 60 * 1e3;
 async function getAccessToken(account) {
@@ -4229,7 +4233,8 @@ async function getAccessToken(account) {
   if (cached && Date.now() < cached.expiresAt) {
     return cached.token;
   }
-  const url = `${TOKEN_URL}?appKey=${encodeURIComponent(account.appKey)}&appSecret=${encodeURIComponent(account.appSecret)}`;
+  const tokenUrl = `${account.apiBase}/auth/token`;
+  const url = `${tokenUrl}?appKey=${encodeURIComponent(account.appKey)}&appSecret=${encodeURIComponent(account.appSecret)}`;
   const resp = await fetch(url);
   const text = await resp.text();
   if (!text) {
@@ -4274,7 +4279,8 @@ async function sendBaiduAppMessage(account, target, message) {
     text: { content: message },
     touser: target.userId
   };
-  const resp = await fetch(`${SEND_MESSAGE_URL}?access_token=${encodeURIComponent(token)}`, {
+  const sendMessageUrl = `${account.apiBase}/chat/openclaw/callback`;
+  const resp = await fetch(`${sendMessageUrl}?access_token=${encodeURIComponent(token)}`, {
     method: "POST",
     body: JSON.stringify(payload),
     headers: { "Content-Type": "application/json" }
@@ -4621,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 = [];
@@ -4830,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) => {
@@ -4847,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({
@@ -4862,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;
@@ -4908,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) => {
@@ -4932,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({
@@ -4950,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;