@alemonjs/qq-bot 2.1.36 → 2.1.38

package/lib/register.js

@@ -1,6 +1,9 @@
 import { getIdentity, getMaster, getQQBotConfig, platform } from "./config.js";
-import { chunkedUpload } from "./upload.js";
+import { sanitizeQQText } from "./text-sanitizer.js";
 import { AT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, GROUP_AT_MESSAGE_CREATE, MESSAGE_CREATE } from "./sends.js";
+import { normalizeFrameworkEvent, normalizeMessageUser } from "./framework-events.js";
+import { handleFrameworkAction } from "./framework-actions.js";
+import { chunkedUpload } from "./upload.js";
 import { FormatEvent, ResultCode, cbpPlatform, createResult, logger } from "alemonjs";
 import { createHash } from "node:crypto";
 import { basename } from "node:path";
@@ -40,11 +43,19 @@ const C2C_NOTICE_TAGS = /* @__PURE__ */ new Set([
 	"FRIEND_DEL"
 ]);
 const register = (client, options) => {
-	const MAX_MEDIA_SIZE = 104857600;
+	const MAX_MEDIA_SIZE = 209715200;
 	const config = getQQBotConfig();
 	const botId = String(options?.botId ?? config?.app_id ?? "");
 	const url = `ws://127.0.0.1:${process.env?.port || config?.port || 17117}`;
 	const cbp = options?.cbp ?? cbpPlatform(url);
+	const emit = (event, acknowledged = false) => {
+		const normalized = normalizeFrameworkEvent(event, acknowledged);
+		if (config.textSanitizer && (normalized.name === "message.create" || normalized.name === "private.message.create") && typeof normalized.value?.content === "string") {
+			normalized.RawMessageText = normalized.value.content;
+			normalized.MessageText = sanitizeQQText(normalized.value.content, botId, config.textSanitizer);
+		}
+		cbp.send(normalized);
+	};
 	/**
 	* group
 	*
@@ -56,9 +67,9 @@ const register = (client, options) => {
 	};
 	const getGroupMessageMeta = (event) => {
 		const author = event?.author;
-		const UserId = author?.id ?? "";
+		const UserId = author?.member_openid || author?.id || "";
 		const memberOpenId = author?.member_openid ?? "";
-		const groupId = event?.group_id ?? event?.group_openid ?? "";
+		const groupId = event?.group_openid || event?.group_id || "";
 		const messageId = event?.id ?? "";
 		const [isMaster, UserKey] = UserId ? getMaster(UserId) : [false, ""];
 		return {
@@ -72,9 +83,10 @@ const register = (client, options) => {
 			openId: memberOpenId ? `C2C:${memberOpenId}` : ""
 		};
 	};
-	const getGroupAuditMeta = (event) => {
+	const getAuditMeta = (event) => {
 		return {
-			groupId: event?.group_openid ?? "",
+			guildId: event?.guild_id ?? event?.group_openid ?? "",
+			channelId: event?.channel_id ?? event?.group_openid ?? "",
 			messageId: event?.message_id ?? event?.audit_id ?? "",
 			auditTime: event?.audit_time ?? ""
 		};
@@ -84,7 +96,7 @@ const register = (client, options) => {
 			if (!attachment?.url) return [];
 			const mimeType = attachment.content_type || "";
 			return [{
-				Type: mimeType.startsWith("image/") ? "image" : mimeType.startsWith("audio/") ? "audio" : mimeType.startsWith("video/") ? "video" : "file",
+				Type: mimeType.startsWith("image/") ? "image" : mimeType === "voice" || mimeType.startsWith("audio/") ? "audio" : mimeType.startsWith("video/") ? "video" : "file",
 				Url: attachment.url,
 				...attachment.filename && { FileName: attachment.filename },
 				...typeof attachment.size === "number" && { FileSize: attachment.size },
@@ -122,7 +134,7 @@ const register = (client, options) => {
 		if (params.filePath) {
 			const metadata = await stat(String(params.filePath));
 			if (!metadata.isFile()) throw new Error("media filePath must point to a regular file");
-			if (metadata.size > MAX_MEDIA_SIZE) throw new Error("QQ media files must not exceed 100 MiB");
+			if (metadata.size > MAX_MEDIA_SIZE) throw new Error("QQ media files must not exceed 200 MiB");
 			filePath = String(params.filePath);
 			fileSize = metadata.size;
 			hashes = await client.getMediaFileHashes(filePath);
@@ -136,22 +148,23 @@ const register = (client, options) => {
 			hashSource = data;
 			const value = data.replace(/^base64:\/\//, "");
 			buffer = Buffer.from(value, "base64");
-			if (buffer.length > MAX_MEDIA_SIZE) throw new Error("QQ media files must not exceed 100 MiB");
+			if (buffer.length > MAX_MEDIA_SIZE) throw new Error("QQ media files must not exceed 200 MiB");
 		}
-		const key = [
+		const key = JSON.stringify([
 			botId,
 			target.scope,
 			target.targetId,
 			params.type,
+			name ?? "",
 			createHash("sha256").update(hashSource).digest("hex")
-		].join(":");
+		]);
 		const cached = mediaCache.get(key);
-		if (cached && (!cached.expiresAt || cached.expiresAt > Date.now())) return {
-			fileId: cached.fileId,
-			expiresAt: cached.expiresAt,
+		if (!params.send && cached && cached.expiresAt && cached.expiresAt > Date.now()) return {
+			...cached,
 			reused: true
 		};
 		return {
+			fileId: void 0,
 			key,
 			url: params.url,
 			data,
@@ -167,7 +180,22 @@ const register = (client, options) => {
 		if (!validateTargetBot(target)) throw new Error(`BotId ${target.BotId} is not active`);
 		if (target.scope !== "group" && target.scope !== "c2c") throw new Error("QQ media upload only supports group and c2c targets");
 		const prepared = await prepareMedia(target, params);
-		if (prepared.fileId) return prepared;
+		if (prepared.fileId) {
+			if (params.send) {
+				const sent = target.scope === "group" ? await client.groupOpenMessages(target.targetId, {
+					msg_type: 7,
+					media: { file_info: prepared.fileId }
+				}) : await client.usersOpenMessages(target.targetId, {
+					msg_type: 7,
+					media: { file_info: prepared.fileId }
+				});
+				return {
+					...prepared,
+					messageId: sent.id
+				};
+			}
+			return prepared;
+		}
 		const fileType = mediaType(params.type);
 		const value = prepared.filePath && prepared.fileSize && prepared.fileSize >= 5242880 ? await client.postChunkedRichMedia({
 			scope: target.scope,
@@ -187,20 +215,37 @@ const register = (client, options) => {
 			file_type: fileType,
 			url: prepared.url,
 			file_data: prepared.data,
-			srv_send_msg: false
+			file_name: prepared.name,
+			srv_send_msg: params.send ?? false
 		}) : await client.postRichMediaByUser(target.targetId, {
 			file_type: fileType,
 			url: prepared.url,
 			file_data: prepared.data,
-			srv_send_msg: false
+			file_name: prepared.name,
+			srv_send_msg: params.send ?? false
 		});
+		let messageId = "id" in value ? value.id : void 0;
+		if (params.send && !messageId && ((prepared.fileSize ?? 0) >= 5242880 || (prepared.buffer?.length ?? 0) >= 5242880)) messageId = (target.scope === "group" ? await client.groupOpenMessages(target.targetId, {
+			msg_type: 7,
+			media: { file_info: value.file_info }
+		}) : await client.usersOpenMessages(target.targetId, {
+			msg_type: 7,
+			media: { file_info: value.file_info }
+		})).id;
 		const expiresAt = value.ttl ? Date.now() + value.ttl * 1e3 : void 0;
-		if (prepared.key) mediaCache.set(prepared.key, {
+		if (prepared.key && expiresAt) mediaCache.set(prepared.key, {
 			fileId: value.file_info,
+			uuid: value.file_uuid,
+			ttl: value.ttl,
+			url: value.raw_url,
 			expiresAt
 		});
 		return {
 			fileId: value.file_info,
+			uuid: value.file_uuid,
+			ttl: value.ttl,
+			messageId,
+			url: "raw_url" in value ? value.raw_url : void 0,
 			expiresAt,
 			reused: false
 		};
@@ -216,7 +261,7 @@ const register = (client, options) => {
 		};
 	};
 	client.on("GROUP_ADD_ROBOT", (event) => {
-		cbp.send(FormatEvent.create("guild.join").addPlatform({
+		emit(FormatEvent.create("guild.join").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -226,7 +271,7 @@ const register = (client, options) => {
 		}).addChannel({ ChannelId: event.group_openid }).addUser(createUserMeta(event.op_member_openid, { UserAvatar: createUserAvatarURL(event.op_member_openid) })).addMessage({ MessageId: event.id }).add({ tag: "GROUP_ADD_ROBOT" }).value);
 	});
 	client.on("GROUP_DEL_ROBOT", (event) => {
-		cbp.send(FormatEvent.create("guild.exit").addPlatform({
+		emit(FormatEvent.create("guild.exit").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -239,7 +284,7 @@ const register = (client, options) => {
 		if (event?.author?.bot) return;
 		const msg = getMessageContent(event);
 		const meta = getGroupMessageMeta(event);
-		cbp.send(FormatEvent.create("message.create").addPlatform({
+		emit(FormatEvent.create("message.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId,
@@ -258,9 +303,9 @@ const register = (client, options) => {
 		}).addMessage({ MessageId: meta.messageId }).addText({ MessageText: msg?.trim() }).addMedia({ MessageMedia: getMediaItems(event.attachments) }).addOpen({ OpenId: meta.openId }).add({ tag: "GROUP_MESSAGE_CREATE" }).value);
 	});
 	client.on("GROUP_MEMBER_ADD", (event) => {
-		const UserId = event.op_member_openid ?? event.member_openid ?? "";
+		const UserId = event.member_openid || event.op_member_openid || "";
 		const [isMaster, UserKey] = getMaster(UserId);
-		cbp.send(FormatEvent.create("member.add").addPlatform({
+		emit(FormatEvent.create("member.add").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -277,9 +322,9 @@ const register = (client, options) => {
 		}).add({ tag: "GROUP_MEMBER_ADD" }).value);
 	});
 	client.on("GROUP_MEMBER_REMOVE", (event) => {
-		const UserId = event.op_member_openid ?? event.member_openid ?? "";
+		const UserId = event.member_openid || event.op_member_openid || "";
 		const [isMaster, UserKey] = getMaster(UserId);
-		cbp.send(FormatEvent.create("member.remove").addPlatform({
+		emit(FormatEvent.create("member.remove").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -298,7 +343,7 @@ const register = (client, options) => {
 	client.on("GROUP_JOIN_REQUEST", (event) => {
 		const UserId = event.member_openid ?? "";
 		const [isMaster, UserKey] = getMaster(UserId);
-		cbp.send(FormatEvent.create("notice.create").addPlatform({
+		emit(FormatEvent.create("notice.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -318,7 +363,7 @@ const register = (client, options) => {
 		if (event?.author?.bot) return;
 		const msg = getMessageContent(event);
 		const meta = getGroupMessageMeta(event);
-		cbp.send(FormatEvent.create("message.create").addPlatform({
+		emit(FormatEvent.create("message.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId,
@@ -337,23 +382,23 @@ const register = (client, options) => {
 		}).addMessage({ MessageId: meta.messageId }).addText({ MessageText: msg?.trim() }).addMedia({ MessageMedia: getMediaItems(event.attachments) }).addOpen({ OpenId: meta.openId }).add({ tag: "GROUP_AT_MESSAGE_CREATE" }).value);
 	});
 	client.on("C2C_MESSAGE_CREATE", (event) => {
-		const UserId = event.author.id;
+		const UserId = event.author.user_openid || event.author.id;
 		const [isMaster, UserKey] = getMaster(UserId);
-		const UserAvatar = createUserAvatarURL(event.author.id);
-		cbp.send(FormatEvent.create("private.message.create").addPlatform({
+		const UserAvatar = createUserAvatarURL(UserId);
+		emit(FormatEvent.create("private.message.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId,
 			IsAtMe: false,
 			IsPrivate: true
 		}).addUser({
-			UserId: event.author.id,
+			UserId,
 			UserKey,
 			UserAvatar,
 			UserName: event?.author?.username,
 			IsMaster: isMaster,
 			IsBot: false
-		}).addMessage({ MessageId: event.id }).addText({ MessageText: event.content?.trim() }).addMedia({ MessageMedia: getMediaItems(event.attachments) }).addOpen({ OpenId: `C2C:${event.author.user_openid}` }).add({ tag: "C2C_MESSAGE_CREATE" }).value);
+		}).addMessage({ MessageId: event.id }).addText({ MessageText: event.content?.trim() }).addMedia({ MessageMedia: getMediaItems(event.attachments) }).addOpen({ OpenId: `C2C:${UserId}` }).add({ tag: "C2C_MESSAGE_CREATE" }).value);
 	});
 	/**
 	* guild
@@ -364,7 +409,7 @@ const register = (client, options) => {
 		const UserAvatar = event?.author?.avatar;
 		const UserId = event.author.id;
 		const [isMaster, UserKey] = getMaster(UserId);
-		cbp.send(FormatEvent.create("private.message.create").addPlatform({
+		emit(FormatEvent.create("private.message.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId,
@@ -385,7 +430,7 @@ const register = (client, options) => {
 		const UserAvatar = event?.author?.avatar;
 		const UserId = event.author.id;
 		const [isMaster, UserKey] = getMaster(UserId);
-		cbp.send(FormatEvent.create("message.create").addPlatform({
+		emit(FormatEvent.create("message.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId,
@@ -421,12 +466,11 @@ const register = (client, options) => {
 	};
 	client.on("MESSAGE_CREATE", (event) => {
 		if (event.author?.bot) return;
-		if ((/* @__PURE__ */ new RegExp(/DELETE$/)).test(event.eventType)) return;
 		const UserId = event.author.id;
 		const msg = getMessageContent(event);
 		const UserAvatar = event?.author?.avatar;
 		const [isMaster, UserKey] = getMaster(UserId);
-		cbp.send(FormatEvent.create("message.create").addPlatform({
+		emit(FormatEvent.create("message.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId,
@@ -445,16 +489,18 @@ const register = (client, options) => {
 		}).addMessage({ MessageId: event.id }).addText({ MessageText: msg?.trim() }).addMedia({ MessageMedia: getMediaItems(event.attachments) }).addOpen({ OpenId: `DIRECT:${event.guild_id}` }).add({ tag: "MESSAGE_CREATE" }).value);
 	});
 	client.on("INTERACTION_CREATE", async (event) => {
-		try {
+		let acknowledged = false;
+		if ((options?.autoInteractionAck ?? config.autoInteractionAck ?? true) && (event.type === 11 || event.type === 12)) try {
 			await client.interactionResponse("group", event.id, 0);
+			acknowledged = true;
 		} catch (err) {
-			createResult(ResultCode.Fail, "interactionResponse failed", err?.response?.data ?? err?.message ?? err);
+			logger.warn("interactionResponse failed", err?.response?.data ?? err?.message ?? err);
 		}
 		if (event.scene === "group") {
 			const UserAvatar = createUserAvatarURL(event.group_member_openid);
 			const UserId = event.group_member_openid;
 			const [isMaster, UserKey] = getMaster(UserId);
-			const MessageText = event.data.resolved.button_data?.trim() || "";
+			const MessageText = event.data?.resolved?.button_data?.trim() || "";
 			const e = FormatEvent.create("interaction.create").addPlatform({
 				Platform: platform,
 				value: event,
@@ -470,21 +516,21 @@ const register = (client, options) => {
 				UserAvatar,
 				IsMaster: isMaster,
 				IsBot: false
-			}).addMessage({ MessageId: event.id }).addText({ MessageText }).addInteraction({
+			}).addMessage({ MessageId: event.event_id || event.id }).addText({ MessageText }).addInteraction({
 				InteractionId: event.id,
-				InteractionData: JSON.stringify(event.data.resolved),
+				InteractionData: JSON.stringify(event.data?.resolved ?? {}),
 				Target: {
 					scope: "group",
 					targetId: event.group_openid,
 					BotId: botId
 				}
 			}).addOpen({ OpenId: `C2C:${event.group_member_openid}` }).add({ tag: "INTERACTION_CREATE_GROUP" }).value;
-			cbp.send(e);
+			emit(e, acknowledged);
 		} else if (event.scene === "c2c") {
 			const UserAvatar = createUserAvatarURL(event.user_openid);
 			const UserId = event.user_openid;
 			const [isMaster, UserKey] = getMaster(UserId);
-			const MessageText = event.data.resolved.button_data?.trim() || "";
+			const MessageText = event.data?.resolved?.button_data?.trim() || "";
 			const e = FormatEvent.create("private.interaction.create").addPlatform({
 				Platform: platform,
 				value: event,
@@ -497,21 +543,21 @@ const register = (client, options) => {
 				UserAvatar,
 				IsMaster: isMaster,
 				IsBot: false
-			}).addMessage({ MessageId: event.id }).addText({ MessageText }).addInteraction({
+			}).addMessage({ MessageId: event.event_id || event.id }).addText({ MessageText }).addInteraction({
 				InteractionId: event.id,
-				InteractionData: JSON.stringify(event.data.resolved),
+				InteractionData: JSON.stringify(event.data?.resolved ?? {}),
 				Target: {
 					scope: "c2c",
 					targetId: event.user_openid,
 					BotId: botId
 				}
 			}).addOpen({ OpenId: `C2C:${event.user_openid}` }).add({ tag: "INTERACTION_CREATE_C2C" }).value;
-			cbp.send(e);
+			emit(e, acknowledged);
 		} else if (event.scene === "guild") {
 			const UserAvatar = createUserAvatarURL(event.data.resolved.user_id);
 			const UserId = event.data.resolved.user_id;
 			const [isMaster, UserKey] = getMaster(UserId);
-			const MessageText = event.data.resolved.button_data?.trim() || "";
+			const MessageText = event.data?.resolved?.button_data?.trim() || "";
 			const e = FormatEvent.create("interaction.create").addPlatform({
 				Platform: platform,
 				value: event,
@@ -529,14 +575,14 @@ const register = (client, options) => {
 				IsBot: false
 			}).addMessage({ MessageId: event.data.resolved.message_id }).addText({ MessageText }).addInteraction({
 				InteractionId: event.id,
-				InteractionData: JSON.stringify(event.data.resolved),
+				InteractionData: JSON.stringify(event.data?.resolved ?? {}),
 				Target: {
 					scope: "channel",
 					targetId: event.channel_id,
 					BotId: botId
 				}
 			}).addOpen({ OpenId: `DIRECT:${event.guild_id}` }).add({ tag: "INTERACTION_CREATE_GUILD" }).value;
-			cbp.send(e);
+			emit(e, acknowledged);
 		} else logger.warn({
 			code: ResultCode.Fail,
 			message: "暂未更新支持此类型的交互事件",
@@ -544,8 +590,8 @@ const register = (client, options) => {
 		});
 	});
 	client.on("MESSAGE_DELETE", (event) => {
-		const msg = event?.message ?? event;
-		cbp.send(FormatEvent.create("message.delete").addPlatform({
+		const msg = event.message;
+		emit(FormatEvent.create("message.delete").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -556,7 +602,7 @@ const register = (client, options) => {
 	});
 	client.on("PUBLIC_MESSAGE_DELETE", (event) => {
 		const msg = event.message;
-		cbp.send(FormatEvent.create("message.delete").addPlatform({
+		emit(FormatEvent.create("message.delete").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -567,14 +613,14 @@ const register = (client, options) => {
 	});
 	client.on("DIRECT_MESSAGE_DELETE", (event) => {
 		const msg = event.message;
-		cbp.send(FormatEvent.create("private.message.delete").addPlatform({
+		emit(FormatEvent.create("private.message.delete").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
 		}).addMessage({ MessageId: msg.id ?? "" }).add({ tag: "DIRECT_MESSAGE_DELETE" }).value);
 	});
 	client.on("MESSAGE_REACTION_ADD", (event) => {
-		cbp.send(FormatEvent.create("message.reaction.add").addPlatform({
+		emit(FormatEvent.create("message.reaction.add").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -584,7 +630,7 @@ const register = (client, options) => {
 		}).addChannel({ ChannelId: event.channel_id ?? "" }).addMessage({ MessageId: event.target?.id ?? "" }).add({ tag: "MESSAGE_REACTION_ADD" }).value);
 	});
 	client.on("MESSAGE_REACTION_REMOVE", (event) => {
-		cbp.send(FormatEvent.create("message.reaction.remove").addPlatform({
+		emit(FormatEvent.create("message.reaction.remove").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -594,7 +640,7 @@ const register = (client, options) => {
 		}).addChannel({ ChannelId: event.channel_id ?? "" }).addMessage({ MessageId: event.target?.id ?? "" }).add({ tag: "MESSAGE_REACTION_REMOVE" }).value);
 	});
 	client.on("CHANNEL_CREATE", (event) => {
-		cbp.send(FormatEvent.create("channel.create").addPlatform({
+		emit(FormatEvent.create("channel.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -604,7 +650,7 @@ const register = (client, options) => {
 		}).addChannel({ ChannelId: event.id ?? "" }).add({ tag: "CHANNEL_CREATE" }).value);
 	});
 	client.on("CHANNEL_DELETE", (event) => {
-		cbp.send(FormatEvent.create("channel.delete").addPlatform({
+		emit(FormatEvent.create("channel.delete").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -614,7 +660,7 @@ const register = (client, options) => {
 		}).addChannel({ ChannelId: event.id ?? "" }).add({ tag: "CHANNEL_DELETE" }).value);
 	});
 	client.on("GUILD_CREATE", (event) => {
-		cbp.send(FormatEvent.create("guild.join").addPlatform({
+		emit(FormatEvent.create("guild.join").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -629,7 +675,7 @@ const register = (client, options) => {
 		}).add({ tag: "GUILD_CREATE" }).value);
 	});
 	client.on("GUILD_DELETE", (event) => {
-		cbp.send(FormatEvent.create("guild.exit").addPlatform({
+		emit(FormatEvent.create("guild.exit").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -646,7 +692,7 @@ const register = (client, options) => {
 	client.on("GUILD_MEMBER_ADD", (event) => {
 		const UserId = event.user?.id ?? "";
 		const [isMaster, UserKey] = getMaster(UserId);
-		cbp.send(FormatEvent.create("member.add").addPlatform({
+		emit(FormatEvent.create("member.add").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -665,7 +711,7 @@ const register = (client, options) => {
 	client.on("GUILD_MEMBER_REMOVE", (event) => {
 		const UserId = event.user?.id ?? "";
 		const [isMaster, UserKey] = getMaster(UserId);
-		cbp.send(FormatEvent.create("member.remove").addPlatform({
+		emit(FormatEvent.create("member.remove").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -684,7 +730,7 @@ const register = (client, options) => {
 	client.on("GUILD_MEMBER_UPDATE", (event) => {
 		const UserId = event.user?.id ?? "";
 		const [isMaster, UserKey] = getMaster(UserId);
-		cbp.send(FormatEvent.create("member.update").addPlatform({
+		emit(FormatEvent.create("member.update").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -701,21 +747,21 @@ const register = (client, options) => {
 		}).add({ tag: "GUILD_MEMBER_UPDATE" }).value);
 	});
 	client.on("FRIEND_ADD", (event) => {
-		cbp.send(FormatEvent.create("private.friend.add").addPlatform({
+		emit(FormatEvent.create("private.friend.add").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
 		}).addUser(createUserMeta(event.openid ?? "")).addMessage({ MessageId: event.id }).add({ tag: "FRIEND_ADD" }).value);
 	});
 	client.on("FRIEND_DEL", (event) => {
-		cbp.send(FormatEvent.create("private.friend.remove").addPlatform({
+		emit(FormatEvent.create("private.friend.remove").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
 		}).addUser(createUserMeta(event.openid ?? "")).add({ tag: "FRIEND_DEL" }).value);
 	});
 	client.on("CHANNEL_UPDATE", (event) => {
-		cbp.send(FormatEvent.create("channel.update").addPlatform({
+		emit(FormatEvent.create("channel.update").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -725,7 +771,7 @@ const register = (client, options) => {
 		}).addChannel({ ChannelId: event.id ?? "" }).add({ tag: "CHANNEL_UPDATE" }).value);
 	});
 	client.on("GUILD_UPDATE", (event) => {
-		cbp.send(FormatEvent.create("guild.update").addPlatform({
+		emit(FormatEvent.create("guild.update").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -735,7 +781,7 @@ const register = (client, options) => {
 		}).add({ tag: "GUILD_UPDATE" }).value);
 	});
 	client.on("GROUP_MSG_RECEIVE", (event) => {
-		cbp.send(FormatEvent.create("notice.create").addPlatform({
+		emit(FormatEvent.create("notice.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -745,7 +791,7 @@ const register = (client, options) => {
 		}).addChannel({ ChannelId: event.group_openid }).addUser(createUserMeta(event.op_member_openid)).addMessage({ MessageId: event.id }).add({ tag: "GROUP_MSG_RECEIVE" }).value);
 	});
 	client.on("GROUP_MSG_REJECT", (event) => {
-		cbp.send(FormatEvent.create("notice.create").addPlatform({
+		emit(FormatEvent.create("notice.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
@@ -755,41 +801,99 @@ const register = (client, options) => {
 		}).addChannel({ ChannelId: event.group_openid }).addUser(createUserMeta(event.op_member_openid)).addMessage({ MessageId: `group_msg_reject_${event.group_openid}_${event.timestamp}` }).add({ tag: "GROUP_MSG_REJECT" }).value);
 	});
 	client.on("MESSAGE_AUDIT_PASS", (event) => {
-		const meta = getGroupAuditMeta(event);
-		cbp.send(FormatEvent.create("notice.create").addPlatform({
+		const meta = getAuditMeta(event);
+		emit(FormatEvent.create("notice.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
 		}).addGuild({
-			GuildId: meta.groupId,
-			SpaceId: `GROUP:${meta.groupId}`
-		}).addChannel({ ChannelId: meta.groupId }).addMessage({ MessageId: meta.messageId }).add({ tag: "MESSAGE_AUDIT_PASS" }).value);
+			GuildId: meta.guildId,
+			SpaceId: `${event.guild_id ? "GUILD" : "GROUP"}:${meta.channelId}`
+		}).addChannel({ ChannelId: meta.channelId }).addMessage({ MessageId: meta.messageId }).add({ tag: "MESSAGE_AUDIT_PASS" }).value);
 	});
 	client.on("MESSAGE_AUDIT_REJECT", (event) => {
-		const meta = getGroupAuditMeta(event);
-		cbp.send(FormatEvent.create("notice.create").addPlatform({
+		const meta = getAuditMeta(event);
+		emit(FormatEvent.create("notice.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
 		}).addGuild({
-			GuildId: meta.groupId,
-			SpaceId: `GROUP:${meta.groupId}`
-		}).addChannel({ ChannelId: meta.groupId }).addMessage({ MessageId: meta.messageId }).add({ tag: "MESSAGE_AUDIT_REJECT" }).value);
+			GuildId: meta.guildId,
+			SpaceId: `${event.guild_id ? "GUILD" : "GROUP"}:${meta.channelId}`
+		}).addChannel({ ChannelId: meta.channelId }).addMessage({ MessageId: meta.messageId }).add({ tag: "MESSAGE_AUDIT_REJECT" }).value);
+	});
+	client.on("READY", (event) => {
+		emit(FormatEvent.create("notice.create").addPlatform({
+			Platform: platform,
+			value: event,
+			BotId: botId
+		}).addUser({
+			UserId: event.user?.id ?? "",
+			UserName: event.user?.name ?? "",
+			UserKey: "",
+			IsMaster: false,
+			IsBot: true
+		}).add({ tag: "READY" }).value);
 	});
+	const emitGuildNotice = (tag, event, authorId) => {
+		const guildId = event.guild_id ?? "";
+		const channelId = event.channel_id ?? "";
+		emit(FormatEvent.create("notice.create").addPlatform({
+			Platform: platform,
+			value: event,
+			BotId: botId
+		}).addGuild({
+			GuildId: guildId,
+			SpaceId: `GUILD:${channelId}`
+		}).addChannel({ ChannelId: channelId }).addUser(createUserMeta(authorId ?? event.author_id ?? "")).add({ tag }).value);
+	};
+	for (const tag of [
+		"FORUM_THREAD_CREATE",
+		"FORUM_THREAD_UPDATE",
+		"FORUM_THREAD_DELETE",
+		"FORUM_POST_CREATE",
+		"FORUM_POST_DELETE",
+		"FORUM_REPLY_CREATE",
+		"FORUM_REPLY_DELETE",
+		"FORUM_PUBLISH_AUDIT_RESULT",
+		"AUDIO_START",
+		"AUDIO_FINISH",
+		"AUDIO_ON_MIC",
+		"AUDIO_OFF_MIC",
+		"AUDIO_OR_LIVE_CHANNEL_MEMBER_ENTER",
+		"AUDIO_OR_LIVE_CHANNEL_MEMBER_EXIT"
+	]) client.on(tag, (event) => emitGuildNotice(tag, event, ("author_id" in event ? event.author_id : void 0) ?? ("user_id" in event ? event.user_id : void 0)));
 	client.on("C2C_MSG_RECEIVE", (event) => {
-		cbp.send(FormatEvent.create("private.notice.create").addPlatform({
+		emit(FormatEvent.create("private.notice.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
 		}).addUser(createUserMeta(event.openid ?? "")).addMessage({ MessageId: event.id }).add({ tag: "C2C_MSG_RECEIVE" }).value);
 	});
 	client.on("C2C_MSG_REJECT", (event) => {
-		cbp.send(FormatEvent.create("private.notice.create").addPlatform({
+		emit(FormatEvent.create("private.notice.create").addPlatform({
 			Platform: platform,
 			value: event,
 			BotId: botId
 		}).addUser(createUserMeta(event.openid ?? "")).addMessage({ MessageId: `c2c_msg_reject_${event.openid}_${event.timestamp}` }).add({ tag: "C2C_MSG_REJECT" }).value);
 	});
+	client.on("SUBSCRIBE_MESSAGE_STATUS", (event) => {
+		if (event.group_openid) emit(FormatEvent.create("notice.create").addPlatform({
+			Platform: platform,
+			value: event,
+			BotId: botId,
+			IsPrivate: false
+		}).addGuild({
+			GuildId: event.group_openid,
+			SpaceId: `GROUP:${event.group_openid}`
+		}).addChannel({ ChannelId: event.group_openid }).add({ tag: "SUBSCRIBE_MESSAGE_STATUS" }).value);
+		else emit(FormatEvent.create("private.notice.create").addPlatform({
+			Platform: platform,
+			value: event,
+			BotId: botId,
+			IsPrivate: true
+		}).addUser(createUserMeta(event.openid || "")).add({ tag: "SUBSCRIBE_MESSAGE_STATUS" }).value);
+	});
 	client.on("ERROR", console.error);
 	const api = {
 		active: { send: {
@@ -861,17 +965,9 @@ const register = (client, options) => {
 				const value = event.value || {};
 				const Metions = [];
 				if (value.mentions) {
-					const MessageMention = (event.value["mentions"] || []).map((item) => {
-						const UserId = item.id;
-						const [isMaster, UserKey] = getMaster(UserId);
-						return {
-							UserId: item.id,
-							IsMaster: isMaster,
-							UserName: item.username,
-							IsBot: item.bot ?? false,
-							UserKey
-						};
-					});
+					const mentions = event.value["mentions"] || [];
+					const scope = event.SpaceId?.startsWith("GROUP:") ? "group" : event.IsPrivate ? "c2c" : "channel";
+					const MessageMention = mentions.map((item) => normalizeMessageUser(item, scope));
 					return new Promise((resolve) => resolve(MessageMention));
 				} else return new Promise((resolve) => resolve(Metions));
 			}
@@ -879,12 +975,39 @@ const register = (client, options) => {
 	};
 	const onactions = async (data, consume) => {
 		const event = data.payload.event ?? {};
+		const requestedBot = data.payload.params?.target?.BotId ?? data.payload.target?.BotId ?? data.payload.BotId ?? event.BotId;
+		if (requestedBot && requestedBot !== botId) {
+			consume([createResult(ResultCode.FailParams, "BotId does not match this adapter", null)]);
+			return;
+		}
 		const getGroupOpenId = () => data.payload.ChannelId ?? data.payload.params?.groupOpenId ?? data.payload.GuildId ?? event.ChannelId ?? event.GuildId ?? "";
 		const getMemberOpenId = () => data.payload.params?.memberOpenId ?? data.payload.UserId ?? event.UserId ?? "";
 		const getGuildId = () => data.payload.GuildId ?? event.GuildId ?? "";
 		const getUserId = () => data.payload.UserId ?? event.UserId ?? "";
 		const getChannelId = () => data.payload.ChannelId ?? event.ChannelId ?? "";
 		try {
+			if (data.action === "media.send.user" || data.action === "media.send.channel") {
+				const scope = data.payload.target?.scope;
+				if (data.action === "media.send.user" && (!scope || scope === "group" || scope === "c2c") || data.action === "media.send.channel" && scope === "group") {
+					await onactions({
+						action: "media.send",
+						payload: {
+							...data.payload,
+							target: {
+								scope: data.action === "media.send.user" ? "c2c" : "group",
+								targetId: data.action === "media.send.user" ? getUserId() : getChannelId(),
+								BotId: data.payload.BotId ?? data.payload.target?.BotId ?? event.BotId
+							}
+						}
+					}, consume);
+					return;
+				}
+			}
+			const handled = await handleFrameworkAction(client, data, botId);
+			if (handled) {
+				consume(handled);
+				return;
+			}
 			if (data.action === "me.info") {
 				const res = await client.usersMe();
 				const UserId = res.id;
@@ -892,7 +1015,11 @@ const register = (client, options) => {
 				const botInfo = {
 					UserId: res?.id,
 					UserName: res?.username,
-					UserAvatar: createUserAvatarURL(res?.id),
+					UserAvatar: res?.avatar || createUserAvatarURL(res?.id),
+					UnionId: res?.union_openid,
+					AccountId: res?.union_user_account,
+					ShareUrl: res?.share_url,
+					WelcomeMessage: res?.welcome_msg,
 					IsBot: true,
 					IsMaster: isMaster,
 					UserKey
@@ -940,11 +1067,34 @@ const register = (client, options) => {
 					consume([createResult(ResultCode.Fail, "interaction.ack 缺少 InteractionId", null)]);
 					return;
 				}
-				const res = await client.interactionResponse(mode, interactionId, params.code).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err));
-				consume([res]);
-				consume([res]);
+				consume([await client.interactionResponse(mode, interactionId, params.code).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err?.response?.data ?? err?.message ?? err))]);
 			} else if (data.action === "message.pin") consume([await client.channelsPinsPut(getChannelId(), data.payload.MessageId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
 			else if (data.action === "message.unpin") consume([await client.channelsPinsDelete(getChannelId(), data.payload.MessageId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "schedule.list") consume([await client.channelsSchedules(getChannelId(), data.payload.params).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "schedule.get") consume([await client.channelsSchedulesSchedule(getChannelId(), data.payload.ScheduleId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "schedule.create") consume([await client.channelsSchedulesPost(getChannelId(), { schedule: data.payload.params.schedule }).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "schedule.update") consume([await client.channelsSchedulesSchedulePatch(getChannelId(), data.payload.ScheduleId, { schedule: data.payload.params.schedule }).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "schedule.delete") consume([await client.channelsSchedulesScheduleDelete(getChannelId(), data.payload.ScheduleId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "forum.list") consume([await client.channelsThreads(getChannelId()).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "forum.get") consume([await client.channelsThreadsThread(getChannelId(), data.payload.ThreadId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "forum.create") {
+				const params = data.payload.params;
+				consume([await client.channelsThreadsPut(getChannelId(), {
+					title: params.title,
+					content: params.content,
+					format: params.format
+				}).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			} else if (data.action === "forum.delete") consume([await client.channelsThreadsDelete(getChannelId(), data.payload.ThreadId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "audio.control") {
+				const params = data.payload.params;
+				consume([await client.channelsAudioPost(getChannelId(), {
+					status: params.status,
+					audio_url: params.audioUrl,
+					text: params.text
+				}).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			} else if (data.action === "audio.join") consume([await client.channelsMicPut(getChannelId()).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "audio.leave") consume([await client.channelsMicDelete(getChannelId()).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "audio.online") consume([await client.channelsChannelOnlineNums(getChannelId()).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
 			else if (data.action === "reaction.add") consume([await client.channelsMessagesReactionsPut(getChannelId(), data.payload.MessageId, 1, data.payload.EmojiId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
 			else if (data.action === "reaction.remove") consume([await client.channelsMessagesReactionsDelete(getChannelId(), data.payload.MessageId, 1, data.payload.EmojiId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
 			else if (data.action === "message.get") consume([await client.channelsMessagesById(getChannelId(), data.payload.MessageId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
@@ -1072,8 +1222,8 @@ const register = (client, options) => {
 					color: params.color
 				}).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
 			} else if (data.action === "role.delete") consume([await client.guildsRolesDelete(getGuildId(), data.payload.RoleId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
-			else if (data.action === "role.assign") consume([await client.guildsRolesMembersPut(getGuildId(), "", getUserId(), data.payload.RoleId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
-			else if (data.action === "role.remove") consume([await client.guildsRolesMembersDelete(getGuildId(), "", getUserId(), data.payload.RoleId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "role.assign") consume([await client.guildsRolesMembersPut(getGuildId(), getChannelId(), getUserId(), data.payload.RoleId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "role.remove") consume([await client.guildsRolesMembersDelete(getGuildId(), getChannelId(), getUserId(), data.payload.RoleId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
 			else if (data.action === "file.send.channel") consume([await client.postRichMediaByGroup(getGroupOpenId(), {
 				file_type: data.payload.params?.file_type ?? 1,
 				url: data.payload.params?.url,
@@ -1120,23 +1270,25 @@ const register = (client, options) => {
 				}
 				const params = data.payload.params || {};
 				if (params.fileId) {
-					const send = target.scope === "group" ? client.groupOpenMessages(target.targetId, {
-						msg_type: 7,
-						content: params.content || "",
-						media: { file_info: params.fileId }
-					}) : target.scope === "c2c" ? client.usersOpenMessages(target.targetId, {
-						msg_type: 7,
-						content: params.content || "",
-						media: { file_info: params.fileId }
-					}) : null;
-					if (!send) {
-						consume([createResult(ResultCode.Warn, "QQ media.send only supports group and c2c targets", null)]);
-						return;
-					}
-					consume([await send.then((value) => createResult(ResultCode.Ok, data.action, { id: value.id })).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+					consume(await handleFrameworkAction(client, {
+						action: "message.send",
+						payload: {
+							...data.payload,
+							params: {
+								...params,
+								content: {
+									text: params.content,
+									media: { fileId: params.fileId }
+								}
+							}
+						}
+					}, botId) ?? [createResult(ResultCode.FailParams, "Unsupported media target", null)]);
 					return;
 				}
-				const upload = await uploadMedia(target, params).then((value) => value.fileId).catch((error) => {
+				const upload = await uploadMedia(target, {
+					...params,
+					send: false
+				}).then((value) => value.fileId).catch((error) => {
 					consume([createResult(ResultCode.Fail, data.action, error)]);
 					return null;
 				});
@@ -1144,6 +1296,7 @@ const register = (client, options) => {
 				await onactions({
 					action: "media.send",
 					payload: {
+						...data.payload,
 						target,
 						params: {
 							...params,
@@ -1197,6 +1350,10 @@ const register = (client, options) => {
 			else if (data.action === "permission.set") {
 				const params = data.payload.params;
 				consume([await client.channelsPermissionsPut(getChannelId(), getUserId(), params?.allow ?? "0", params?.deny ?? "0").then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			} else if (data.action === "permission.role.get") consume([await client.channelsRolePermissions(getChannelId(), data.payload.RoleId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "permission.role.set") {
+				const params = data.payload.params ?? {};
+				consume([await client.channelsRolePermissionsPut(getChannelId(), data.payload.RoleId, params.allow ?? "0", params.deny ?? "0").then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
 			} else if (data.action === "reaction.list") consume([await client.channelsMessagesReactionsUsers(getChannelId(), data.payload.MessageId, 1, data.payload.EmojiId, { limit: data.payload.params?.limit ?? 20 }).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
 			else if (data.action === "channel.announce") {
 				const guildId = getGuildId();
@@ -1206,9 +1363,24 @@ const register = (client, options) => {
 					message_id: params?.messageId,
 					channel_id: params?.channelId
 				}).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
-			} else consume([createResult(ResultCode.Fail, "未知请求，请尝试升级版本", null)]);
+			} else if (data.action === "channel.message-rate.get") consume([await client.guildsMessageSetting(getGuildId()).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "channel.api-permission.list") consume([await client.guildApiPermission(getGuildId()).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "channel.api-permission.request") {
+				const params = data.payload.params;
+				consume([await client.guildsApiPermissionDemand(getGuildId(), {
+					channel_id: getChannelId(),
+					api_identify: {
+						path: params.path,
+						method: params.method
+					},
+					desc: params.description
+				}).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			} else if (data.action === "channel.direct-session.open") consume([await client.usersMeDms(data.payload.UserId, getGuildId()).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "channel.legacy-announcement.set") consume([await client.channelsAnnounces(getChannelId(), data.payload.MessageId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else if (data.action === "channel.legacy-announcement.remove") consume([await client.channelsAnnouncesDelete(getChannelId(), data.payload.MessageId).then((r) => createResult(ResultCode.Ok, data.action, r)).catch((err) => createResult(ResultCode.Fail, data.action, err))]);
+			else consume([createResult(ResultCode.Fail, "未知请求，请尝试升级版本", null)]);
 		} catch (error) {
-			consume([createResult(ResultCode.Fail, "请求失败", error)]);
+			consume([createResult(ResultCode.Fail, "请求失败", error?.response?.data ?? error?.message ?? error)]);
 		}
 	};
 	const onapis = async (data, consume) => {
@@ -1233,7 +1405,7 @@ const register = (client, options) => {
 			const res = await target.call(parent, ...params);
 			consume([createResult(ResultCode.Ok, "请求完成", res)]);
 		} catch (error) {
-			consume([createResult(ResultCode.Fail, "请求失败", error)]);
+			consume([createResult(ResultCode.Fail, "请求失败", error?.response?.data ?? error?.message ?? error)]);
 		}
 	};
 	if (options?.bindActions !== false) {