@alemonjs/qq-bot 2.1.35 → 2.1.36

package/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-present, Yuxi (Evan) You
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIdED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/README.md

@@ -131,13 +131,13 @@ export default async () => {
 
 ### 说明
 
-| 事项     | 说明                                                                                             |
-| -------- | ------------------------------------------------------------------------------------------------ |
-| 触发条件 | 配置中未填写 `app_id`/`secret`，且未配置 `bots`（WebSocket 模式）                                |
-| 二维码   | CBP 统一输出，过期自动刷新（最多 3 次），总超时 10 分钟 |
-| 凭证安全 | AppSecret 全程密文传输、本地解密，密钥仅存内存不落盘                                             |
-| 失败处理 | 超时 / 刷新次数用尽 / 授权取消时跳过连接并输出日志，可重启重试或手动配置                         |
-| Webhook  | Webhook 模式（配置 `route`/`port`/`ws`）不触发扫码流程，需自行填写完整配置                       |
+| 事项     | 说明                                                                       |
+| -------- | -------------------------------------------------------------------------- |
+| 触发条件 | 配置中未填写 `app_id`/`secret`，且未配置 `bots`（WebSocket 模式）          |
+| 二维码   | CBP 统一输出，过期自动刷新（最多 3 次），总超时 10 分钟                    |
+| 凭证安全 | AppSecret 全程密文传输、本地解密，密钥仅存内存不落盘                       |
+| 失败处理 | 超时 / 刷新次数用尽 / 授权取消时跳过连接并输出日志，可重启重试或手动配置   |
+| Webhook  | Webhook 模式（配置 `route`/`port`/`ws`）不触发扫码流程，需自行填写完整配置 |
 
 ---
 

package/lib/format.d.ts

@@ -1,5 +1,7 @@
 import { DataEnums, DataMarkDown } from "alemonjs";
 //#region src/format.d.ts
+/** 群聊、私聊和频道共用有序正文；提及等原生文本由发送上下文提供。 */
+declare const formatQQContent: (items: DataEnums[], renderNative: (item: DataEnums) => string, plain?: boolean, hideUnsupported?: boolean | number) => string;
 /**
  * 将结构化 Markdown 子元素数组转为可读纯文本
  */
@@ -22,5 +24,6 @@ declare const markdownRawToText: (raw: string, hideUnsupported?: boolean | numbe
  * 其余类型降级为文本
  */
 declare const dataEnumToText: (item: DataEnums, hideUnsupported?: boolean | number) => string;
+declare const createMarkdownText: (data: DataMarkDown['value']) => string;
 //#endregion
-export { buttonsToText, dataEnumToText, markdownRawToText, markdownToText };
+export { buttonsToText, createMarkdownText, dataEnumToText, formatQQContent, markdownRawToText, markdownToText };

package/lib/format.js

@@ -1,10 +1,32 @@
+import { joinMarkdownParts, renderMarkdownBlockquote } from "alemonjs/markdown";
+
 //#region src/format.ts
+/** 群聊、私聊和频道共用有序正文；提及等原生文本由发送上下文提供。 */
+const formatQQContent = (items, renderNative, plain = false, hideUnsupported) => {
+	return items.map((item) => {
+		if (item.type === "Markdown") return plain ? markdownToText(item.value, hideUnsupported) : createMarkdownText(item.value);
+		if (item.type === "MarkdownOriginal") {
+			const text = plain ? markdownRawToText(item.value, hideUnsupported) : item.value;
+			return text ? `\n\n${text}\n\n` : "";
+		}
+		if (item.type === "BT.group") {
+			if (!plain || Number(hideUnsupported) >= 4) return "";
+			const text = item.value.map((row) => row.value.map((button) => {
+				if (Number(hideUnsupported) >= 3) return "";
+				if (Number(hideUnsupported) >= 2) return button.options?.data || button.value;
+				return hideUnsupported ? button.value : `[${button.value}]`;
+			}).filter(Boolean).join(" ")).filter(Boolean).join("\n");
+			return text ? `\n\n${text}\n\n` : "";
+		}
+		return renderNative(item);
+	}).join("");
+};
 /**
 * 将结构化 Markdown 子元素数组转为可读纯文本
 */
 const markdownToText = (items, hideUnsupported) => {
 	if (Number(hideUnsupported) >= 4) return "";
-	return items.map((item) => {
+	return joinMarkdownParts(items, items.map((item) => {
 		switch (item.type) {
 			case "MD.text": return item.value;
 			case "MD.title": return hideUnsupported ? `${item.value}\n` : `【${item.value}】\n`;
@@ -16,6 +38,7 @@ const markdownToText = (items, hideUnsupported) => {
 			case "MD.link": {
 				const v = item.value;
 				if (Number(hideUnsupported) >= 3) return "";
+				if (!v.url) return v.text;
 				return Number(hideUnsupported) >= 2 ? v.url : `${v.text}( ${v.url} )`;
 			}
 			case "MD.image": return hideUnsupported ? "" : "[图片]";
@@ -23,7 +46,7 @@ const markdownToText = (items, hideUnsupported) => {
 				if (typeof li.value === "object") return `${li.value.index}. ${li.value.text ?? ""}`;
 				return `· ${li.value}`;
 			}).join("\n") + "\n";
-			case "MD.blockquote": return `> ${item.value}\n`;
+			case "MD.blockquote": return renderMarkdownBlockquote(item.value, (children) => markdownToText(children, hideUnsupported));
 			case "MD.divider": return hideUnsupported ? "" : "————————\n";
 			case "MD.newline": return "\n";
 			case "MD.code": return item.value;
@@ -37,7 +60,7 @@ const markdownToText = (items, hideUnsupported) => {
 				return hideUnsupported ? String(item.value) : `[${item.value}]`;
 			default: return String(item?.value ?? "");
 		}
-	}).join("");
+	}));
 };
 /**
 * 将按钮组转为可读纯文本
@@ -88,6 +111,47 @@ const dataEnumToText = (item, hideUnsupported) => {
 		default: return "";
 	}
 };
+const mdFormatters = {
+	"MD.title": (value) => `# ${value} `,
+	"MD.subtitle": (value) => `## ${value} `,
+	"MD.text": (value) => `${value} `,
+	"MD.bold": (value) => `**${value}** `,
+	"MD.divider": () => "\n***\n",
+	"MD.italic": (value) => `__${value}__ `,
+	"MD.italicStar": (value) => `*${value}* `,
+	"MD.strikethrough": (value) => `~~${value}~~ `,
+	"MD.blockquote": (value) => renderMarkdownBlockquote(value, createMarkdownText),
+	"MD.newline": () => "\n",
+	"MD.link": (value) => {
+		if (!value?.text && !value?.url) return "";
+		if (!value?.text || !value?.url) return `<${value?.url ?? value?.text}> `;
+		return `[🔗${value?.text}](${value?.url}) `;
+	},
+	"MD.image": (value, options) => `\n![text #${options?.width || 208}px #${options?.height || 320}px](${value})\n`,
+	"MD.mention": (value, options) => {
+		const { belong } = options || {};
+		if (belong === "channel") return "";
+		if (value === "everyone") return "<qqbot-at-everyone />";
+		if (belong === "user") return `<qqbot-at-user id="${value}" />`;
+		return `<qqbot-at-user id="${value}" />`;
+	},
+	"MD.content": (value) => `${value}`,
+	"MD.button": (title, options) => {
+		const { data, autoEnter } = options || {};
+		if (autoEnter) return `<qqbot-cmd-enter text="${data}" show="${title}" />`;
+		return `<qqbot-cmd-input text="${data}" show="${title}" />`;
+	}
+};
+const createMarkdownText = (data) => {
+	return joinMarkdownParts(data, data.map((mdItem) => {
+		if (mdFormatters[mdItem.type]) return mdFormatters[mdItem.type](mdItem?.value, mdItem?.options);
+		if (mdItem.type === "MD.list" && typeof mdItem.value !== "string") return `${mdItem.value.map((listItem) => {
+			return typeof listItem.value === "object" ? `\n${listItem.value.index}. ${listItem.value.text}` : `\n- ${listItem.value}`;
+		}).join("")}\n`;
+		if (mdItem.type === "MD.code") return `\n\`\`\`${mdItem?.options?.language || ""}\n${mdItem.value}\n\`\`\`\n`;
+		return String(mdItem["value"] || "");
+	}));
+};
 
 //#endregion
-export { buttonsToText, dataEnumToText, markdownRawToText, markdownToText };
+export { buttonsToText, createMarkdownText, dataEnumToText, formatQQContent, markdownRawToText, markdownToText };

package/lib/sends.js

@@ -1,5 +1,5 @@
 import { getQQBotConfig } from "./config.js";
-import { buttonsToText, dataEnumToText, markdownToText } from "./format.js";
+import { createMarkdownText, dataEnumToText, formatQQContent } from "./format.js";
 import { ResultCode, createResult, logger } from "alemonjs";
 import { readFileSync } from "fs";
 import axios from "axios";
@@ -172,47 +172,6 @@ const createArkListData = (value) => {
 		]
 	};
 };
-const mdFormatters = {
-	"MD.title": (value) => `# ${value} `,
-	"MD.subtitle": (value) => `## ${value} `,
-	"MD.text": (value) => `${value} `,
-	"MD.bold": (value) => `**${value}** `,
-	"MD.divider": () => "\n***\n",
-	"MD.italic": (value) => `__${value}__ `,
-	"MD.italicStar": (value) => `*${value}* `,
-	"MD.strikethrough": (value) => `~~${value}~~ `,
-	"MD.blockquote": (value) => `\n> ${value} `,
-	"MD.newline": () => "\n",
-	"MD.link": (value) => {
-		if (!value?.text && !value?.url) return "";
-		if (!value?.text || !value?.url) return `<${value?.url ?? value?.text}> `;
-		return `[🔗${value?.text}](${value?.url}) `;
-	},
-	"MD.image": (value, options) => `\n![text #${options?.width || 208}px #${options?.height || 320}px](${value})\n`,
-	"MD.mention": (value, options) => {
-		const { belong } = options || {};
-		if (belong === "channel") return "";
-		if (belong === "user") return `<qqbot-at-user id="${value}" />`;
-		if (value === "everyone") return "<qqbot-at-everyone />";
-		return `<qqbot-at-user id="${value}" />`;
-	},
-	"MD.content": (value) => `${value}`,
-	"MD.button": (title, options) => {
-		const { data, autoEnter } = options || {};
-		if (autoEnter) return `<qqbot-cmd-enter text="${data}" show="${title}" />`;
-		return `<qqbot-cmd-input text="${data}" show="${title}" />`;
-	}
-};
-const createMarkdownText = (data) => {
-	return data.map((mdItem) => {
-		if (mdFormatters[mdItem.type]) return mdFormatters[mdItem.type](mdItem?.value, mdItem?.options);
-		if (mdItem.type === "MD.list" && typeof mdItem.value !== "string") return `${mdItem.value.map((listItem) => {
-			return typeof listItem.value === "object" ? `\n${listItem.value.index}. ${listItem.value.text}` : `\n- ${listItem.value}`;
-		}).join("")}\n`;
-		if (mdItem.type === "MD.code") return `\n\`\`\`${mdItem?.options?.language || ""}\n${mdItem.value}\n\`\`\`\n`;
-		return String(mdItem["value"] || "");
-	}).join("");
-};
 const formatMention = (item, mode) => {
 	if (mode === "guild-direct") return "";
 	const value = item.value;
@@ -373,16 +332,7 @@ const resolveMediaUrl = async (media, uploadMedia) => {
 	}
 };
 /** 移除富媒体占位符（dataEnumToText 降级产生的 [视频]/[音频]/[附件]） */
-const stripMediaPlaceholders = (text) => text.replace(/\[附件[^\]]*\]/g, "").replace(/\[音频\]/g, "").replace(/\[视频\]/g, "").replace(/\n{2,}/g, "\n").trim();
-/** 当 markdownToText 选项开启时，将 Markdown 和按钮降级为纯文本并追加到 content */
-const flattenMdToText = (content, val) => {
-	const mdItems = val.filter((item) => item.type === "Markdown");
-	const btnItems = val.filter((item) => item.type === "BT.group");
-	const parts = [content];
-	for (const item of mdItems) if (item.type === "Markdown" && typeof item.value !== "string") parts.push(markdownToText(item.value));
-	for (const item of btnItems) if (item.type === "BT.group" && typeof item.value !== "string") parts.push(buttonsToText(item.value));
-	return parts.filter(Boolean).join("\n").replace(/^[^\S\n\r]+|[^\S\n\r]+$/g, "");
-};
+const stripMediaPlaceholders = (text) => text.replace(/\[附件[^\]]*\]/g, "").replace(/\[音频\]/g, "").replace(/\[视频\]/g, "").trim();
 /** Open API 通用发送逻辑（群组 / C2C） */
 const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMessage, label, options) => {
 	const config = getQQBotConfig();
@@ -392,7 +342,7 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
 		const fileInfo = await resolveMediaUrl(media, uploadMedia);
 		if (!fileInfo) return [createResult(ResultCode.Fail, "媒体上传失败", null)];
 		const res = await sendMessage({
-			content: stripMediaPlaceholders(flattenMdToText(content, val)),
+			content: stripMediaPlaceholders(formatQQContent(val, (item) => extractContent([item], "group"), true, config.hideUnsupported)),
 			media: { file_info: fileInfo },
 			msg_type: 7,
 			...baseParams
@@ -404,7 +354,7 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
 		return [];
 	}
 	if (mdToText) {
-		const textContent = flattenMdToText(content, val);
+		const textContent = formatQQContent(val, (item) => extractContent([item], "group"), true, config.hideUnsupported);
 		if (textContent) {
 			const res = await sendMessage({
 				content: textContent,
@@ -417,7 +367,7 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
 	}
 	const mdParams = buildMdAndButtonsParams(val);
 	if (mdParams) {
-		if (mdParams.markdown?.content && content) mdParams.markdown.content = content + "\n" + mdParams.markdown.content;
+		if (mdParams.markdown?.content) mdParams.markdown.content = formatQQContent(val, (item) => extractContent([item], "group"));
 		const res = await sendMessage({
 			content,
 			msg_type: 2,
@@ -463,14 +413,14 @@ const resolveImageBuffer = async (images) => {
 	return null;
 };
 /** Guild API 通用发送逻辑（频道公聊 / 频道私聊） */
-const sendGuildMessage = async (content, val, baseParams, sendMessage, label) => {
+const sendGuildMessage = async (content, val, baseParams, sendMessage, label, mode) => {
 	const config = getQQBotConfig();
 	const mdToText = config.markdownToText === true;
 	const images = filterImages(val);
 	if (images.length > 0) {
 		const imageBuffer = await resolveImageBuffer(images);
 		const res = await sendMessage({
-			content: flattenMdToText(content, val),
+			content: formatQQContent(val, (item) => extractContent([item], mode), true, config.hideUnsupported),
 			...baseParams
 		}, imageBuffer);
 		return [createResult(ResultCode.Ok, label, { id: res?.id })];
@@ -480,7 +430,7 @@ const sendGuildMessage = async (content, val, baseParams, sendMessage, label) =>
 		return [];
 	}
 	if (mdToText) {
-		const textContent = flattenMdToText(content, val);
+		const textContent = formatQQContent(val, (item) => extractContent([item], mode), true, config.hideUnsupported);
 		if (textContent) {
 			const res = await sendMessage({
 				content: textContent,
@@ -492,7 +442,7 @@ const sendGuildMessage = async (content, val, baseParams, sendMessage, label) =>
 	}
 	const mdParams = buildMdAndButtonsParams(val);
 	if (mdParams) {
-		if (mdParams.markdown?.content && content) mdParams.markdown.content = content + "\n" + mdParams.markdown.content;
+		if (mdParams.markdown?.content) mdParams.markdown.content = formatQQContent(val, (item) => extractContent([item], mode));
 		const res = await sendMessage({
 			content: "",
 			...mdParams,
@@ -549,7 +499,7 @@ const DIRECT_MESSAGE_CREATE = async (client, event, val) => {
 	const baseParams = buildBaseParams(event._tag, event.MessageId, "INTERACTION_CREATE_GUILD");
 	const content = extractContent(val, "guild-direct");
 	try {
-		return await sendGuildMessage(content, val, baseParams, (data, buf) => client.dmsMessages(event.UserId, data, buf), "client.dmsMessage");
+		return await sendGuildMessage(content, val, baseParams, (data, buf) => client.dmsMessages(event.UserId, data, buf), "client.dmsMessage", "guild-direct");
 	} catch (err) {
 		return [createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)];
 	}
@@ -561,7 +511,7 @@ const MESSAGE_CREATE = async (client, event, val) => {
 	const baseParams = buildBaseParams(event._tag, event.MessageId, "INTERACTION_CREATE_GUILD");
 	const content = extractContent(val, "guild-public");
 	try {
-		return await sendGuildMessage(content, val, baseParams, (data, buf) => client.channelsMessages(event.ChannelId, data, buf), "client.channelsMessagesPost");
+		return await sendGuildMessage(content, val, baseParams, (data, buf) => client.channelsMessages(event.ChannelId, data, buf), "client.channelsMessagesPost", "guild-public");
 	} catch (err) {
 		return [createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)];
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.35",
+  "version": "2.1.36",
   "description": "QQ官方平台",
   "author": "lemonade",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "yaml": "^2.5.1"
   },
   "peerDependencies": {
-    "alemonjs": "^2.1.0-alpha.15"
+    "alemonjs": "^2.1.108"
   },
   "types": "lib",
   "exports": {
@@ -97,5 +97,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "c6aa5616afe091a37610dad22fbb2d2618d943b8"
-}
+  "gitHead": "a4d4fded0874b070e356e6a83b06bd3e474f9133"
+}