@alemonjs/qq-bot 2.1.36 → 2.1.38

package/lib/sends.js

@@ -335,6 +335,15 @@ const resolveMediaUrl = async (media, uploadMedia) => {
 const stripMediaPlaceholders = (text) => text.replace(/\[附件[^\]]*\]/g, "").replace(/\[音频\]/g, "").replace(/\[视频\]/g, "").trim();
 /** Open API 通用发送逻辑（群组 / C2C） */
 const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMessage, label, options) => {
+	if (options?.wakeup && (options.replyId || options.eventId) || options?.replyId && options?.eventId) return [createResult(ResultCode.FailParams, "wakeup, replyId and eventId are mutually exclusive", null)];
+	if (options?.wakeup || options?.replyId || options?.eventId) {
+		baseParams = {};
+		if (options.wakeup) baseParams.is_wakeup = true;
+		else if (options.eventId) baseParams.event_id = options.eventId;
+		else baseParams.msg_id = options.replyId;
+	}
+	if (options?.sequence !== void 0) baseParams.msg_seq = options.sequence;
+	if (options?.referenceId) baseParams.message_reference = { message_id: options.referenceId };
 	const config = getQQBotConfig();
 	const mdToText = config.markdownToText === true;
 	const media = filterMedia(val);
@@ -347,7 +356,11 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
 			msg_type: 7,
 			...baseParams
 		});
-		return [createResult(ResultCode.Ok, label, { id: res.id })];
+		return [createResult(ResultCode.Ok, label, {
+			id: res.id,
+			...res.timestamp !== void 0 && { timestamp: res.timestamp },
+			...res.ext_info?.ref_idx !== void 0 && { referenceId: res.ext_info.ref_idx }
+		})];
 	}
 	if (config.hideUnsupported === true && !content && !buildMdAndButtonsParams(val) && !buildArkParams(val)) {
 		logger.info("[qq-bot] hideUnsupported: 消息内容转换后为空，跳过发送");
@@ -361,21 +374,28 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
 				msg_type: 0,
 				...baseParams
 			});
-			return [createResult(ResultCode.Ok, label, { id: res.id })];
+			return [createResult(ResultCode.Ok, label, {
+				id: res.id,
+				...res.timestamp !== void 0 && { timestamp: res.timestamp },
+				...res.ext_info?.ref_idx !== void 0 && { referenceId: res.ext_info.ref_idx }
+			})];
 		}
 		return [];
 	}
 	const mdParams = buildMdAndButtonsParams(val);
 	if (mdParams) {
 		if (mdParams.markdown?.content) mdParams.markdown.content = formatQQContent(val, (item) => extractContent([item], "group"));
+		if (mdParams.markdown && options?.forceVerifyImageResource !== void 0) mdParams.markdown.force_verify_image_resource = options.forceVerifyImageResource;
 		const res = await sendMessage({
-			content,
 			msg_type: 2,
 			...mdParams,
-			...baseParams,
-			force_verify_image_resource: options?.forceVerifyImageResource
+			...baseParams
 		});
-		return [createResult(ResultCode.Ok, label, { id: res.id })];
+		return [createResult(ResultCode.Ok, label, {
+			id: res.id,
+			...res.timestamp !== void 0 && { timestamp: res.timestamp },
+			...res.ext_info?.ref_idx !== void 0 && { referenceId: res.ext_info.ref_idx }
+		})];
 	}
 	const arkParams = buildArkParams(val);
 	if (arkParams) {
@@ -385,7 +405,11 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
 			...arkParams,
 			...baseParams
 		});
-		return [createResult(ResultCode.Ok, label, { id: res.id })];
+		return [createResult(ResultCode.Ok, label, {
+			id: res.id,
+			...res.timestamp !== void 0 && { timestamp: res.timestamp },
+			...res.ext_info?.ref_idx !== void 0 && { referenceId: res.ext_info.ref_idx }
+		})];
 	}
 	if (content) {
 		const res = await sendMessage({
@@ -393,7 +417,11 @@ const sendOpenApiMessage = async (content, val, baseParams, uploadMedia, sendMes
 			msg_type: 0,
 			...baseParams
 		});
-		return [createResult(ResultCode.Ok, label, { id: res.id })];
+		return [createResult(ResultCode.Ok, label, {
+			id: res.id,
+			...res.timestamp !== void 0 && { timestamp: res.timestamp },
+			...res.ext_info?.ref_idx !== void 0 && { referenceId: res.ext_info.ref_idx }
+		})];
 	}
 	return [];
 };
@@ -448,7 +476,11 @@ const sendGuildMessage = async (content, val, baseParams, sendMessage, label, mo
 			...mdParams,
 			...baseParams
 		});
-		return [createResult(ResultCode.Ok, label, { id: res.id })];
+		return [createResult(ResultCode.Ok, label, {
+			id: res.id,
+			...res.timestamp !== void 0 && { timestamp: res.timestamp },
+			...res.ext_info?.ref_idx !== void 0 && { referenceId: res.ext_info.ref_idx }
+		})];
 	}
 	const arkParams = buildArkParams(val);
 	if (arkParams) {
@@ -457,7 +489,11 @@ const sendGuildMessage = async (content, val, baseParams, sendMessage, label, mo
 			...arkParams,
 			...baseParams
 		});
-		return [createResult(ResultCode.Ok, label, { id: res.id })];
+		return [createResult(ResultCode.Ok, label, {
+			id: res.id,
+			...res.timestamp !== void 0 && { timestamp: res.timestamp },
+			...res.ext_info?.ref_idx !== void 0 && { referenceId: res.ext_info.ref_idx }
+		})];
 	}
 	if (content) {
 		const res = await sendMessage({

package/lib/text-sanitizer.d.ts

@@ -0,0 +1,13 @@
+//#region src/text-sanitizer.d.ts
+type QQTextSanitizerOptions = {
+  /** Strip only this bot by default. Other users' mentions retain meaning. */
+  botMention?: 'remove' | 'preserve';
+  otherMentions?: 'remove' | 'preserve';
+  faces?: 'preserve' | 'remove' | 'label';
+  /** Disabled by default to preserve paragraphs and code indentation. */
+  collapseWhitespace?: boolean;
+};
+/** Converts QQ protocol markup, never HTML. Raw event content is preserved. */
+declare const sanitizeQQText: (text: string, botId: string, options?: QQTextSanitizerOptions) => string;
+//#endregion
+export { QQTextSanitizerOptions, sanitizeQQText };

package/lib/text-sanitizer.js

@@ -0,0 +1,26 @@
+//#region src/text-sanitizer.ts
+/** Converts QQ protocol markup, never HTML. Raw event content is preserved. */
+const sanitizeQQText = (text, botId, options = {}) => {
+	let result = text.replace(/<@!?([^>\s]+)>/g, (marker, id) => {
+		return (id === botId ? options.botMention !== "preserve" : options.otherMentions === "remove") ? "" : marker;
+	});
+	const faces = options.faces ?? "preserve";
+	if (faces !== "preserve") {
+		result = result.replace(/\[<face,id=(\d+)\/?>\]/g, (_marker, id) => faces === "label" ? `[表情:${id}]` : "");
+		result = result.replace(/<faceType=\d+,faceId="([^"]*)",ext="([^"]*)">/g, (_marker, id, ext) => {
+			if (faces === "remove") return "";
+			try {
+				if (ext.length <= 1e4) {
+					const data = JSON.parse(Buffer.from(ext, "base64").toString("utf8"));
+					if (typeof data?.text === "string" && data.text) return `[表情:${data.text.slice(0, 100)}]`;
+				}
+			} catch {}
+			return `[表情:${id}]`;
+		});
+	}
+	if (options.collapseWhitespace) result = result.replace(/\s+/g, " ");
+	return result.trim();
+};
+
+//#endregion
+export { sanitizeQQText };

package/lib/upload.js

@@ -1,4 +1,4 @@
-import { readFileSync } from "fs";
+import { readFileSync, statSync } from "fs";
 import { createHash } from "crypto";
 
 //#region src/upload.ts
@@ -47,42 +47,18 @@ const computeFileDigests = (filePath) => {
 * @param file 本地文件路径或文件内容
 * @param options 上传选项
 */
-const chunkedUpload = async (client, scope, openId, file, options) => {
-	const buffer = typeof file === "string" ? readFileSync(file) : file;
-	const md5 = createHash("md5").update(buffer).digest("hex");
-	const sha1 = createHash("sha1").update(buffer).digest("hex");
-	const md5_10m = createHash("md5").update(buffer.subarray(0, CHUNK_THRESHOLD)).digest("hex");
-	const file_name = options.file_name ?? (typeof file === "string" ? file.split(/[\\/]/).pop() ?? "file" : "file");
-	const prepareData = {
-		file_type: options.file_type,
-		file_name,
-		file_size: String(buffer.byteLength),
-		md5,
-		sha1,
-		md5_10m
-	};
-	const prepare = await (scope === "user" ? client.usersUploadPrepare(openId, prepareData) : client.groupUploadPrepare(openId, prepareData));
-	const blockSize = Number(prepare.block_size);
-	for (const part of prepare.parts) {
-		const start = part.index * blockSize;
-		const chunk = Buffer.from(buffer.subarray(start, start + Number(part.block_size)));
-		const partMd5 = createHash("md5").update(chunk).digest("hex");
-		await client.uploadPartDirect(part.presigned_url, chunk);
-		const finishData = {
-			upload_id: prepare.upload_id,
-			part_index: part.index,
-			block_size: part.block_size,
-			md5: partMd5
-		};
-		await (scope === "user" ? client.usersUploadPartFinish(openId, finishData) : client.groupUploadPartFinish(openId, finishData));
-	}
-	const merge = {
-		file_type: options.file_type,
-		upload_id: prepare.upload_id,
-		file_name,
-		srv_send_msg: options.srv_send_msg
-	};
-	return scope === "user" ? client.postRichMediaByUser(openId, merge) : client.postRichMediaByGroup(openId, merge);
+const chunkedUpload = (client, scope, openId, file, options) => {
+	return client.postChunkedRichMedia({
+		scope: scope === "user" ? "c2c" : "group",
+		targetId: openId,
+		fileType: options.file_type,
+		...typeof file === "string" ? {
+			filePath: file,
+			size: statSync(file).size
+		} : { data: file },
+		name: options.file_name ?? (typeof file === "string" ? file.split(/[\\/]/).pop() : void 0),
+		send: options.srv_send_msg
+	});
 };
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.36",
+  "version": "2.1.38",
   "description": "QQ官方平台",
   "author": "lemonade",
   "license": "MIT",
@@ -10,7 +10,12 @@
     "build": "lvy build",
     "test:ws": "yarn build && node tests/websocket.integration.mjs",
     "test:send": "yarn build && node tests/use-send.notice.mjs",
-    "test:qr": "yarn build && node tests/qr-auth.mjs"
+    "test:channel": "yarn --cwd ../alemonjs build && yarn build && node tests/channel.contract.mjs",
+    "test:qr": "yarn build && node tests/qr-auth.mjs",
+    "test:non-channel": "yarn build && node tests/non-channel.contract.mjs && node tests/framework.contract.mjs && node tests/non-channel.transport.mjs && node tests/media-upload.contract.mjs && node tests/routing.contract.mjs && node tests/lifecycle.contract.mjs && node tests/http-diagnostics.contract.mjs && node tests/webhook-ingress.contract.mjs && node tests/text-sanitizer.contract.mjs && tsc -p tests/tsconfig.non-channel.json",
+    "docs:snapshot": "python3 scripts/snapshot-official.py",
+    "test:http": "yarn build && node tests/http-diagnostics.contract.mjs && node tests/webhook-ingress.contract.mjs",
+    "test:text": "yarn build && node tests/text-sanitizer.contract.mjs"
   },
   "dependencies": {
     "@noble/curves": "^1.7.0",
@@ -29,9 +34,6 @@
     "ws": "^8.13.0",
     "yaml": "^2.5.1"
   },
-  "peerDependencies": {
-    "alemonjs": "^2.1.108"
-  },
   "types": "lib",
   "exports": {
     ".": {
@@ -97,5 +99,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "a4d4fded0874b070e356e6a83b06bd3e474f9133"
+  "gitHead": "e736f4e180a8694f8c9eb1796a23fdfadcc48f3e"
 }