@alemonjs/qq-bot 2.1.36 → 2.1.37

package/lib/sdk/message.guild.d.ts

@@ -15,6 +15,9 @@ import { GUILD_UPDATE_TYPE } from "../message/GUILD_UPDATE.js";
 import { GUILD_MEMBER_ADD_TYPE } from "../message/GUILD_MEMBER_ADD.js";
 import { GUILD_MEMBER_REMOVE_TYPE } from "../message/GUILD_MEMBER_REMOVE.js";
 import { GUILD_MEMBER_UPDATE_TYPE } from "../message/GUILD_MEMBER_UPDATE.js";
+import { GUILD_AUDIT_TYPE } from "../message/GUILD_AUDIT.js";
+import { FORUM_EVENT_TYPE } from "../message/FORUM_EVENT.js";
+import { AUDIO_EVENT_TYPE, AUDIO_OR_LIVE_CHANNEL_MEMBER_EVENT_TYPE } from "../message/AUDIO_EVENT.js";
 import { READY_TYPE } from "../message/READY.js";
 //#region src/sdk/message.guild.d.ts
 type QQBotGuildEventMap = {
@@ -35,6 +38,22 @@ type QQBotGuildEventMap = {
   MESSAGE_REACTION_REMOVE: MESSAGE_REACTION_REMOVE_TYPE;
   AT_MESSAGE_CREATE: AT_MESSAGE_CREATE_TYPE;
   PUBLIC_MESSAGE_DELETE: PUBLIC_MESSAGE_DELETE_TYPE;
+  MESSAGE_AUDIT_PASS: GUILD_AUDIT_TYPE;
+  MESSAGE_AUDIT_REJECT: GUILD_AUDIT_TYPE;
+  FORUM_THREAD_CREATE: FORUM_EVENT_TYPE;
+  FORUM_THREAD_UPDATE: FORUM_EVENT_TYPE;
+  FORUM_THREAD_DELETE: FORUM_EVENT_TYPE;
+  FORUM_POST_CREATE: FORUM_EVENT_TYPE;
+  FORUM_POST_DELETE: FORUM_EVENT_TYPE;
+  FORUM_REPLY_CREATE: FORUM_EVENT_TYPE;
+  FORUM_REPLY_DELETE: FORUM_EVENT_TYPE;
+  FORUM_PUBLISH_AUDIT_RESULT: FORUM_EVENT_TYPE;
+  AUDIO_START: AUDIO_EVENT_TYPE;
+  AUDIO_FINISH: AUDIO_EVENT_TYPE;
+  AUDIO_ON_MIC: AUDIO_EVENT_TYPE;
+  AUDIO_OFF_MIC: AUDIO_EVENT_TYPE;
+  AUDIO_OR_LIVE_CHANNEL_MEMBER_ENTER: AUDIO_OR_LIVE_CHANNEL_MEMBER_EVENT_TYPE;
+  AUDIO_OR_LIVE_CHANNEL_MEMBER_EXIT: AUDIO_OR_LIVE_CHANNEL_MEMBER_EVENT_TYPE;
   READY: READY_TYPE;
 };
 //#endregion

package/lib/sdk/non-channel-types.d.ts

@@ -0,0 +1,138 @@
+//#region src/sdk/non-channel-types.d.ts
+/** 群聊、单聊服务端接口模型，依据 docs/official/non-channel 快照。 */
+type QQBotPage = {
+  cursor?: string;
+  limit?: number;
+};
+type QQBotMenuItem = {
+  name?: string;
+  type?: 'switch' | 'send_message' | 'link' | 'menu';
+  send_message?: string;
+  link?: string;
+  switch?: {
+    switch_id?: string;
+    default?: boolean;
+  };
+  sub_menu_items?: {
+    name?: string;
+    type?: 'send_message' | 'link';
+    send_message?: string;
+    link?: string;
+  }[];
+};
+type QQBotMenu = {
+  items?: QQBotMenuItem[];
+};
+type QQBotPanel = {
+  items?: {
+    name?: string;
+    desc?: string;
+    type?: 'command' | 'link';
+    only_admin?: boolean;
+    link?: string;
+  }[];
+  remark?: string;
+  version?: number;
+};
+/** 本次仅开放非频道场景。 */
+type QQBotPanelScope = 'c2c' | 'group';
+type QQBotPanelCreate = {
+  scope: QQBotPanelScope;
+  target_type?: 'all' | 'specific';
+  user_openids?: string[];
+  group_openids?: string[];
+  panel: QQBotPanel;
+};
+type QQBotPanelRecord = QQBotPanelCreate & {
+  panel_id: string;
+  created_at?: string;
+  updated_at?: string;
+  version?: number;
+};
+type QQBotGroupMember = {
+  member_openid: string;
+  username: string;
+  member_role: 'member' | 'owner' | 'admin';
+  bot: boolean;
+  joined_at: string;
+  union_openid?: string;
+};
+type QQBotBlacklistUser = {
+  member_openid: string;
+  username: string;
+  banned_at: string;
+  bot: boolean;
+  union_openid?: string;
+};
+type QQBotMessageResult = {
+  id: string;
+  timestamp: string;
+  ext_info?: {
+    ref_idx?: string;
+  };
+};
+type QQBotMessageUser = {
+  id: string;
+  username?: string;
+  bot?: boolean;
+  union_openid?: string;
+  union_user_account?: string;
+  user_openid?: string;
+  member_openid?: string;
+  member_role?: 'member' | 'admin' | 'owner';
+};
+type QQBotAttachment = {
+  id?: string;
+  url?: string;
+  filename?: string;
+  width?: number;
+  height?: number;
+  size?: number;
+  content_type?: string;
+  voice_wav_url?: string;
+  asr_refer_text?: string;
+};
+type QQBotArkData = {
+  prompt?: string;
+  ark_type?: string;
+  ark_name?: string;
+  fields?: Record<string, unknown>;
+};
+type QQBotMessageElement = {
+  msg_idx?: string;
+  author?: QQBotMessageUser;
+  message_type?: number;
+  content?: string;
+  attachments?: QQBotAttachment[];
+  ark_data?: QQBotArkData;
+  msg_elements?: QQBotMessageElement[];
+};
+type QQBotMessageContent = {
+  attachments?: QQBotAttachment[];
+  ark_data?: QQBotArkData;
+  msg_elements?: QQBotMessageElement[];
+  message_scene?: {
+    ext: string[];
+    source?: string;
+  };
+  message_type?: number;
+};
+type QQBotInteractionResolved = {
+  button_data?: string;
+  button_id?: string | number;
+  user_id?: string;
+  feature_id?: string;
+  message_id?: string;
+  feedback_opt?: 'LIKE' | 'UNLIKE';
+  checked?: number;
+  action?: string;
+  message_scene?: {
+    ext?: string[];
+  };
+  authorize_data?: {
+    opt_scene?: string;
+    scope?: string;
+  };
+};
+//#endregion
+export { QQBotArkData, QQBotAttachment, QQBotBlacklistUser, QQBotGroupMember, QQBotInteractionResolved, QQBotMenu, QQBotMenuItem, QQBotMessageContent, QQBotMessageElement, QQBotMessageResult, QQBotMessageUser, QQBotPage, QQBotPanel, QQBotPanelCreate, QQBotPanelRecord, QQBotPanelScope };

package/lib/sdk/non-channel-types.js

@@ -0,0 +1 @@
+export {  };

package/lib/sdk/registry.js

@@ -80,7 +80,7 @@ var QQBotRegistry = class {
 	}
 	#requestedBotId(data) {
 		const payload = data?.payload || {};
-		return payload.target?.BotId || payload.BotId || payload.event?.BotId || payload.event?.Platform?.BotId;
+		return payload.params?.target?.BotId ?? payload.target?.BotId ?? payload.BotId ?? payload.event?.BotId ?? payload.event?.Platform?.BotId;
 	}
 	#select(data) {
 		const requested = this.#requestedBotId(data);
@@ -94,7 +94,7 @@ var QQBotRegistry = class {
 	}
 	async #onAction(data, consume) {
 		if (data?.action === "connection.status") {
-			const botId = data?.payload?.BotId;
+			const botId = this.#requestedBotId(data);
 			const status = this.getConnectionStatus(botId);
 			if (botId && !status.bots.length) consume([createResult(ResultCode.FailParams, `BotId ${botId} is not configured`, null)]);
 			else consume([createResult(ResultCode.Ok, data.action, status)]);

package/lib/sdk/typing.d.ts

@@ -4,6 +4,7 @@ import { SessionStore } from "./session.js";
 type MessageType = 0 | 1 | 2 | 3 | 4 | 6 | 7;
 type FileType = 1 | 2 | 3 | 4;
 interface ButtonType {
+  group_id?: string;
   id: string;
   render_data: {
     label: string;
@@ -14,6 +15,15 @@ interface ButtonType {
     type: number;
     permission: {
       type: number;
+      specify_user_ids?: string[];
+      specify_role_ids?: string[];
+    };
+    anchor?: number;
+    click_limit?: number;
+    modal?: {
+      content?: string;
+      confirm_text?: string;
+      cancel_text?: string;
     };
     reply?: boolean;
     enter?: boolean;
@@ -35,6 +45,8 @@ interface KeyboardType {
   };
 }
 interface MarkdownType {
+  template_id?: number;
+  force_verify_image_resource?: boolean;
   /** markdown 模版id，申请模版后获得 */
   custom_template_id?: string;
   /** 原生 markdown 文本内容（内邀使用） */
@@ -60,7 +72,7 @@ interface ApiRequestData {
   msg_id?: string;
   msg_seq?: number;
   /**
-   * 互动召回消息，true 时不校验 msg_id/event_id 有效期
+   * 互动召回消息，与 msg_id/event_id 互斥
    */
   is_wakeup?: boolean;
   /**

package/lib/sends.d.ts

@@ -1,5 +1,5 @@
 import { QQBotAPI } from "./sdk/api.js";
-import { ClientAPIMessageResult, DataEnums } from "alemonjs";
+import { ClientAPIMessageResult, DataEnums, MessageDelivery } from "alemonjs";
 //#region src/sends.d.ts
 type Client = typeof QQBotAPI.prototype;
 /**
@@ -9,7 +9,7 @@ declare const GROUP_AT_MESSAGE_CREATE: (client: Client, event: {
   ChannelId: string;
   MessageId?: string;
   _tag?: string;
-}, val: DataEnums[], options?: {
+}, val: DataEnums[], options?: MessageDelivery & {
   forceVerifyImageResource?: boolean;
 }) => Promise<ClientAPIMessageResult[]>;
 /**
@@ -19,7 +19,7 @@ declare const C2C_MESSAGE_CREATE: (client: Client, event: {
   UserId: string;
   MessageId?: string;
   _tag?: string;
-}, val: DataEnums[], options?: {
+}, val: DataEnums[], options?: MessageDelivery & {
   forceVerifyImageResource?: boolean;
 }) => Promise<ClientAPIMessageResult[]>;
 /**

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/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.37",
   "description": "QQ官方平台",
   "author": "lemonade",
   "license": "MIT",
@@ -10,7 +10,10 @@
     "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 && tsc -p tests/tsconfig.non-channel.json",
+    "docs:snapshot": "python3 scripts/snapshot-official.py"
   },
   "dependencies": {
     "@noble/curves": "^1.7.0",
@@ -30,7 +33,7 @@
     "yaml": "^2.5.1"
   },
   "peerDependencies": {
-    "alemonjs": "^2.1.108"
+    "alemonjs": "^2.1.0"
   },
   "types": "lib",
   "exports": {
@@ -97,5 +100,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "a4d4fded0874b070e356e6a83b06bd3e474f9133"
+  "gitHead": "77aa1dad52568d709a460b1cdd32db6c36b6f0c2"
 }