@openclaw-china/wecom 0.1.28 → 2026.3.2

package/dist/index.js

@@ -6112,14 +6112,6 @@ async function configureQQBot(prompter, cfg) {
     existingValue: toTrimmedString(existing.clientSecret),
     required: true
   });
-  Ve(
-    "QQ \u7684 Markdown \u4F53\u9A8C\u5F88\u597D\uFF0C\u4F46\u9700\u8981\u5148\u7533\u8BF7\u5F00\u901A\uFF0C\u8BE6\u60C5\u8BF7\u67E5\u770B\u914D\u7F6E\u6587\u6863\u3002",
-    "\u63D0\u793A"
-  );
-  const markdownSupport = await prompter.askConfirm(
-    "\u542F\u7528 Markdown \u652F\u6301",
-    toBoolean(existing.markdownSupport, false)
-  );
   const asrEnabled = await prompter.askConfirm(
     "\u542F\u7528 ASR\uFF08\u652F\u6301\u5165\u7AD9\u8BED\u97F3\u81EA\u52A8\u8F6C\u6587\u5B57\uFF09",
     toBoolean(existingAsr.enabled, false)
@@ -6148,7 +6140,6 @@ async function configureQQBot(prompter, cfg) {
   return mergeChannelConfig(cfg, "qqbot", {
     appId,
     clientSecret,
-    markdownSupport,
     asr
   });
 }
@@ -7344,7 +7335,156 @@ function jsonOk(res, body) {
   res.setHeader("Content-Type", "text/plain; charset=utf-8");
   res.end(JSON.stringify(body));
 }
-async function readJsonBody(req, maxBytes) {
+function extractXmlTag(xml, tag) {
+  if (!xml || !tag) return void 0;
+  const escapedTag = tag.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const re = new RegExp(`<${escapedTag}(?:\\s[^>]*)?>([\\s\\S]*?)</${escapedTag}>`, "i");
+  const m = re.exec(xml);
+  if (!m) return void 0;
+  const body = m[1] ?? "";
+  const cdata = /^<!\[CDATA\[([\s\S]*?)\]\]>$/i.exec(body.trim());
+  if (cdata) return cdata[1] ?? "";
+  return body;
+}
+function extractXmlTagAll(xml, tag) {
+  if (!xml || !tag) return [];
+  const escapedTag = tag.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const re = new RegExp(`<${escapedTag}(?:\\s[^>]*)?>([\\s\\S]*?)</${escapedTag}>`, "gi");
+  const out = [];
+  let m;
+  while ((m = re.exec(xml)) !== null) {
+    const body = m[1] ?? "";
+    const cdata = /^<!\[CDATA\[([\s\S]*?)\]\]>$/i.exec(body.trim());
+    out.push(cdata ? cdata[1] ?? "" : body);
+  }
+  return out;
+}
+function pickFirstNonEmpty(...values) {
+  for (const value of values) {
+    const trimmed = value?.trim();
+    if (trimmed) return trimmed;
+  }
+  return "";
+}
+function parseXmlTextPayload(xml) {
+  const textBlock = extractXmlTag(xml, "Text") ?? "";
+  const content = pickFirstNonEmpty(
+    extractXmlTag(textBlock, "Content"),
+    extractXmlTag(xml, "Content")
+  );
+  if (!content) return void 0;
+  return { content };
+}
+function parseXmlVoicePayload(xml) {
+  const voiceBlock = extractXmlTag(xml, "Voice") ?? "";
+  const content = pickFirstNonEmpty(
+    extractXmlTag(voiceBlock, "Content"),
+    extractXmlTag(voiceBlock, "Recognition"),
+    extractXmlTag(xml, "Recognition"),
+    extractXmlTag(xml, "Content")
+  );
+  const url = pickFirstNonEmpty(
+    extractXmlTag(voiceBlock, "Url"),
+    extractXmlTag(voiceBlock, "VoiceUrl"),
+    extractXmlTag(xml, "VoiceUrl")
+  );
+  const mediaId = pickFirstNonEmpty(
+    extractXmlTag(voiceBlock, "MediaId"),
+    extractXmlTag(xml, "MediaId")
+  );
+  if (!content && !url && !mediaId) return void 0;
+  const voice = {};
+  if (content) voice.content = content;
+  if (url) voice.url = url;
+  if (mediaId) voice.media_id = mediaId;
+  return voice;
+}
+function parseXmlImagePayload(xml) {
+  const imageBlock = extractXmlTag(xml, "Image") ?? "";
+  const url = pickFirstNonEmpty(
+    extractXmlTag(imageBlock, "Url"),
+    extractXmlTag(imageBlock, "PicUrl"),
+    extractXmlTag(xml, "PicUrl"),
+    extractXmlTag(xml, "Url")
+  );
+  const mediaId = pickFirstNonEmpty(
+    extractXmlTag(imageBlock, "MediaId"),
+    extractXmlTag(xml, "MediaId")
+  );
+  if (!url && !mediaId) return void 0;
+  const image = {};
+  if (url) image.url = url;
+  if (mediaId) image.media_id = mediaId;
+  return image;
+}
+function parseXmlFilePayload(xml) {
+  const fileBlock = extractXmlTag(xml, "File") ?? "";
+  const url = pickFirstNonEmpty(
+    extractXmlTag(fileBlock, "Url"),
+    extractXmlTag(fileBlock, "FileUrl"),
+    extractXmlTag(xml, "FileUrl"),
+    extractXmlTag(xml, "Url")
+  );
+  const fileName = pickFirstNonEmpty(
+    extractXmlTag(fileBlock, "FileName"),
+    extractXmlTag(fileBlock, "Name"),
+    extractXmlTag(xml, "FileName")
+  );
+  const mediaId = pickFirstNonEmpty(
+    extractXmlTag(fileBlock, "MediaId"),
+    extractXmlTag(xml, "MediaId")
+  );
+  if (!url && !fileName && !mediaId) return void 0;
+  const file = {};
+  if (url) file.url = url;
+  if (fileName) file.filename = fileName;
+  if (mediaId) file.media_id = mediaId;
+  return file;
+}
+function parseXmlMixedItems(xml) {
+  const mixedBlock = extractXmlTag(xml, "Mixed");
+  if (!mixedBlock) return [];
+  const itemBlocks = [
+    ...extractXmlTagAll(mixedBlock, "MsgItem"),
+    ...extractXmlTagAll(mixedBlock, "msg_item")
+  ];
+  if (itemBlocks.length === 0) return [];
+  const items = [];
+  for (const itemBlock of itemBlocks) {
+    const itemType = pickFirstNonEmpty(
+      extractXmlTag(itemBlock, "MsgType"),
+      extractXmlTag(itemBlock, "msgtype"),
+      extractXmlTag(itemBlock, "Type")
+    ).toLowerCase();
+    if (!itemType) continue;
+    if (itemType === "text") {
+      const text = parseXmlTextPayload(itemBlock);
+      items.push({ msgtype: "text", text: text ?? { content: "" } });
+      continue;
+    }
+    if (itemType === "image") {
+      const image = parseXmlImagePayload(itemBlock);
+      if (image) items.push({ msgtype: "image", image });
+      else items.push({ msgtype: "image" });
+      continue;
+    }
+    if (itemType === "file") {
+      const file = parseXmlFilePayload(itemBlock);
+      if (file) items.push({ msgtype: "file", file });
+      else items.push({ msgtype: "file" });
+      continue;
+    }
+    if (itemType === "voice") {
+      const voice = parseXmlVoicePayload(itemBlock);
+      if (voice) items.push({ msgtype: "voice", voice });
+      else items.push({ msgtype: "voice" });
+      continue;
+    }
+    items.push({ msgtype: itemType });
+  }
+  return items;
+}
+async function readRequestBody(req, maxBytes) {
   const chunks = [];
   let total = 0;
   return await new Promise((resolve3) => {
@@ -7364,7 +7504,17 @@ async function readJsonBody(req, maxBytes) {
           resolve3({ ok: false, error: "empty payload" });
           return;
         }
-        resolve3({ ok: true, value: JSON.parse(raw) });
+        const trimmed = raw.trim();
+        if (trimmed.startsWith("<")) {
+          const encrypt = pickFirstNonEmpty(extractXmlTag(trimmed, "Encrypt"));
+          if (encrypt) {
+            resolve3({ ok: true, value: { Encrypt: encrypt }, raw });
+          } else {
+            resolve3({ ok: false, raw, error: "xml body missing Encrypt tag" });
+          }
+          return;
+        }
+        resolve3({ ok: true, value: JSON.parse(raw), raw });
       } catch (err) {
         resolve3({ ok: false, error: err instanceof Error ? err.message : String(err) });
       }
@@ -7433,11 +7583,94 @@ function createStreamId() {
   return crypto.randomBytes(16).toString("hex");
 }
 function parseWecomPlainMessage(raw) {
-  const parsed = JSON.parse(raw);
-  if (!parsed || typeof parsed !== "object") {
-    return {};
+  const trimmed = raw.trim();
+  if (trimmed.startsWith("<")) {
+    return parseWecomXmlMessage(trimmed);
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object") {
+      return {};
+    }
+    return parsed;
+  } catch {
+    return parseWecomXmlMessage(trimmed);
+  }
+}
+function parseWecomXmlMessage(xml) {
+  const msgtype = pickFirstNonEmpty(
+    extractXmlTag(xml, "MsgType"),
+    extractXmlTag(xml, "msgtype")
+  ).toLowerCase();
+  const chattype = pickFirstNonEmpty(
+    extractXmlTag(xml, "ChatType"),
+    extractXmlTag(xml, "chattype")
+  ).toLowerCase();
+  const chatid = pickFirstNonEmpty(
+    extractXmlTag(xml, "ChatId"),
+    extractXmlTag(xml, "chatid")
+  );
+  const msgid = pickFirstNonEmpty(
+    extractXmlTag(xml, "MsgId"),
+    extractXmlTag(xml, "msgid")
+  );
+  const webhookUrl = pickFirstNonEmpty(
+    extractXmlTag(xml, "WebhookUrl"),
+    extractXmlTag(xml, "response_url")
+  );
+  const fromBlock = extractXmlTag(xml, "From") ?? "";
+  const userid = pickFirstNonEmpty(
+    extractXmlTag(fromBlock, "UserId"),
+    extractXmlTag(xml, "FromUserName"),
+    extractXmlTag(xml, "UserId")
+  );
+  const result = {
+    msgtype,
+    chattype: chattype === "group" ? "group" : "single",
+    chatid,
+    msgid,
+    from: { userid }
+  };
+  if (webhookUrl) {
+    result.response_url = webhookUrl;
   }
-  return parsed;
+  if (msgtype === "text") {
+    result.text = parseXmlTextPayload(xml) ?? { content: "" };
+  } else if (msgtype === "voice") {
+    result.voice = parseXmlVoicePayload(xml) ?? { content: "" };
+  } else if (msgtype === "image") {
+    const image = parseXmlImagePayload(xml);
+    if (image) result.image = image;
+  } else if (msgtype === "file") {
+    const file = parseXmlFilePayload(xml);
+    if (file) result.file = file;
+  } else if (msgtype === "stream") {
+    const streamBlock = extractXmlTag(xml, "Stream") ?? "";
+    const id = pickFirstNonEmpty(
+      extractXmlTag(streamBlock, "Id"),
+      extractXmlTag(xml, "StreamId"),
+      extractXmlTag(xml, "Id")
+    );
+    result.stream = { id };
+  } else if (msgtype === "event") {
+    const eventBlock = extractXmlTag(xml, "Event") ?? "";
+    const eventtype = pickFirstNonEmpty(
+      extractXmlTag(eventBlock, "EventType"),
+      extractXmlTag(xml, "EventType"),
+      extractXmlTag(xml, "Event")
+    );
+    result.event = { eventtype };
+  } else if (msgtype === "mixed") {
+    const mixedItems = parseXmlMixedItems(xml);
+    if (mixedItems.length > 0) {
+      result.mixed = { msg_item: mixedItems };
+    }
+    const text = parseXmlTextPayload(xml);
+    if (text) {
+      result.text = text;
+    }
+  }
+  return result;
 }
 async function waitForStreamContent(streamId, maxWaitMs) {
   const startedAt = Date.now();
@@ -7618,14 +7851,17 @@ async function handleWecomWebhookRequest(req, res) {
       return true;
     }
     const target2 = targets.find((candidate) => {
-      if (!candidate.account.configured || !candidate.account.token) return false;
-      return verifyWecomSignature({
+      if (!candidate.account.configured || !candidate.account.token) {
+        return false;
+      }
+      const ok = verifyWecomSignature({
         token: candidate.account.token,
         timestamp,
         nonce,
         encrypt: echostr,
         signature
       });
+      return ok;
     });
     if (!target2 || !target2.account.encodingAESKey) {
       res.statusCode = 401;
@@ -7661,7 +7897,7 @@ async function handleWecomWebhookRequest(req, res) {
     res.end("missing query params");
     return true;
   }
-  const body = await readJsonBody(req, 1024 * 1024);
+  const body = await readRequestBody(req, 1024 * 1024);
   if (!body.ok) {
     res.statusCode = body.error === "payload too large" ? 413 : 400;
     res.end(body.error ?? "invalid payload");
@@ -7675,14 +7911,17 @@ async function handleWecomWebhookRequest(req, res) {
     return true;
   }
   const target = targets.find((candidate) => {
-    if (!candidate.account.token) return false;
-    return verifyWecomSignature({
+    if (!candidate.account.token) {
+      return false;
+    }
+    const ok = verifyWecomSignature({
       token: candidate.account.token,
       timestamp,
       nonce,
       encrypt,
       signature
     });
+    return ok;
   });
   if (!target) {
     res.statusCode = 401;
@@ -7720,15 +7959,13 @@ async function handleWecomWebhookRequest(req, res) {
       finished: true,
       content: ""
     });
-    jsonOk(
-      res,
-      buildEncryptedJsonReply({
-        account: target.account,
-        plaintextJson: reply,
-        nonce,
-        timestamp
-      })
-    );
+    const encReply2 = buildEncryptedJsonReply({
+      account: target.account,
+      plaintextJson: reply,
+      nonce,
+      timestamp
+    });
+    jsonOk(res, encReply2);
     return true;
   }
   if (msgid && msgidToStreamId.has(msgid)) {
@@ -7876,15 +8113,13 @@ async function handleWecomWebhookRequest(req, res) {
   await waitForStreamContent(streamId, INITIAL_STREAM_WAIT_MS);
   const state = streams.get(streamId);
   const initialReply = state && (state.content.trim() || state.error) ? buildStreamReplyFromState(state) : buildStreamPlaceholderReply(streamId);
-  jsonOk(
-    res,
-    buildEncryptedJsonReply({
-      account: target.account,
-      plaintextJson: initialReply,
-      nonce,
-      timestamp
-    })
-  );
+  const encReply = buildEncryptedJsonReply({
+    account: target.account,
+    plaintextJson: initialReply,
+    nonce,
+    timestamp
+  });
+  jsonOk(res, encReply);
   return true;
 }