@napuketto/adapter 0.4.1 → 0.5.0

package/dist/onebot11/index.mjs

@@ -1,6 +1,6 @@
 import { i as BaseAction, o as ActionRegistry, r as BaseProtocolAdapter, t as ensureSilk } from "../core-DyXyDUcU.mjs";
 import { n as createHttpServerSchema, r as createWsServerSchema, t as collectGrayTipUids } from "../gray-tip-B80z9KR4.mjs";
-import { t as forEachRawMessage } from "../raw-message-6KdlG8kR.mjs";
+import { n as subscribeRawMessages } from "../raw-message-D_ecJy4C.mjs";
 import { ChatType, GrayTipSubType, GroupApi, GroupNotifyMsgStatus, GroupNotifyMsgType, NTGroupMemberRole, NTGroupRequestOperateTypes, TicketApi, TipGroupElementType, WebHonorType, kernelError, toCanonicalElements } from "@napuketto/kernel";
 import { downloadUrl, inferExtension } from "@napuketto/media";
 import { z } from "zod";
@@ -1901,7 +1901,7 @@ function toOb11MessageInfo(msg, unique, ctx = {}) {
 	if (msg.chatType === ChatType.GROUP) {
 		info.group_id = Number(msg.peerUid);
 		const { sender } = info;
-		sender.role = "member";
+		sender.role = ctx.senderRole ?? "member";
 		if (msg.sendMemberName !== void 0) sender.card = msg.sendMemberName;
 	} else info.user_id = Number(msg.senderUin);
 	return info;
@@ -2258,6 +2258,7 @@ function resolveStartMsgId(messageSeq, messageUnique) {
 /**
 * 拉取历史消息并翻译为 OB11 消息信息数组。
 * 收集全部消息 at uid → 一次批量 uidToUin → 上下文注入（P2-19）。
+* 群聊另取发送者角色表（GroupCache 一次整表读取，失败回退缺省 member）。
 */
 async function fetchAndTranslateHistory(peer, messageSeq, count, deps) {
 	const startMsgId = resolveStartMsgId(messageSeq, deps.messageUnique);
@@ -2278,7 +2279,15 @@ async function fetchAndTranslateHistory(peer, messageSeq, count, deps) {
 		...uidToUin !== void 0 ? { uidToUin } : {},
 		msgIdToOb11Id: (m) => deps.messageUnique.getMessageId(m)
 	};
-	return { messages: msgs.map((msg) => toOb11MessageInfo(msg, deps.messageUnique, ctx)) };
+	let senderRoles;
+	if (peer.chatType === ChatType.GROUP) senderRoles = await deps.groupMemberRoles(peer.peerUid);
+	return { messages: msgs.map((msg) => {
+		const role = senderRoles?.get(msg.senderUid);
+		return toOb11MessageInfo(msg, deps.messageUnique, {
+			...ctx,
+			...role !== void 0 ? { senderRole: role } : {}
+		});
+	}) };
 }
 //#endregion
 //#region src/onebot11/action/message/get-friend-msg-history.ts
@@ -2508,8 +2517,10 @@ var GetMsgAction = class extends BaseAction {
 		if (atUids.length > 0) try {
 			uidToUin = await this.deps.uidToUin(atUids);
 		} catch {}
+		const senderRole = msg.chatType === ChatType.GROUP ? await this.deps.groupMemberRole(msg.peerUid, msg.senderUid) : void 0;
 		const ctx = {
 			...uidToUin !== void 0 ? { uidToUin } : {},
+			...senderRole !== void 0 ? { senderRole } : {},
 			msgIdToOb11Id: (m) => this.deps.messageUnique.getMessageId(m)
 		};
 		return toOb11MessageInfo(msg, this.deps.messageUnique, ctx);
@@ -3571,6 +3582,34 @@ var OneBotApi = class {
 	uidToUin(uids) {
 		return this.groupApi.uidToUin(uids);
 	}
+	/**
+	* 群成员角色（GroupCache 缓存优先，缺失惰性回填；sender.role 判定用）。
+	* 未装配缓存 / 成员不在群 / 查询失败 → undefined（调用方回退缺省 "member"，
+	* 不阻塞消息上报）。
+	*/
+	async groupMemberRole(groupCode, uid) {
+		if (this.groupCache === void 0) return;
+		try {
+			const member = await this.groupCache.getMember(groupCode, uid);
+			return member === void 0 ? void 0 : GroupApi.roleToString(member.role);
+		} catch {
+			return;
+		}
+	}
+	/**
+	* 群成员角色表（历史消息批量用：一次整表读取，uid → role）。
+	* 失败语义同 groupMemberRole。
+	*/
+	async groupMemberRoles(groupCode) {
+		if (this.groupCache === void 0) return;
+		try {
+			const out = /* @__PURE__ */ new Map();
+			for (const member of await this.groupCache.getMembers(groupCode)) out.set(member.uid, GroupApi.roleToString(member.role));
+			return out;
+		} catch {
+			return;
+		}
+	}
 };
 //#endregion
 //#region src/onebot11/helper/message-event.ts
@@ -3601,7 +3640,7 @@ function toOb11MessageEvent(msg, selfUin, unique, messageFormat = "array", ctx =
 		const sender = {
 			user_id: userId,
 			nickname: msg.sendNickName,
-			role: "member"
+			role: ctx.senderRole ?? "member"
 		};
 		if (msg.sendMemberName !== void 0) sender.card = msg.sendMemberName;
 		return {
@@ -4230,22 +4269,20 @@ var NapukettoOneBot11Adapter = class extends BaseProtocolAdapter {
 	/** 订阅 kernel 事件（消息 + 群通知 + 好友请求，幂等）。 */
 	subscribe() {
 		if (this.unsubscribes.length > 0) return;
-		this.unsubscribes.push(this.msgChannel.on("Msg/onRecvMsg", (msgs) => {
-			forEachRawMessage(msgs, (msg) => {
-				if (hasGrayTip(msg)) {
-					this.broadcastNotice(msg).catch(() => {});
+		this.unsubscribes.push(subscribeRawMessages(this.msgChannel, (msg) => {
+			if (hasGrayTip(msg)) {
+				this.broadcastNotice(msg).catch(() => {});
+				return;
+			}
+			if (!this.reportSelfMessage && String(msg.senderUin) === this.selfUin) return;
+			if (this.groupUploadAsNotice && msg.chatType === ChatType.GROUP && hasFileElement(msg)) {
+				const notice = toGroupUpload(msg, this.selfUin);
+				if (notice !== null) {
+					this.broadcastEvent(notice);
 					return;
 				}
-				if (!this.reportSelfMessage && String(msg.senderUin) === this.selfUin) return;
-				if (this.groupUploadAsNotice && msg.chatType === ChatType.GROUP && hasFileElement(msg)) {
-					const notice = toGroupUpload(msg, this.selfUin);
-					if (notice !== null) {
-						this.broadcastEvent(notice);
-						return;
-					}
-				}
-				this.broadcastMessageEvent(msg);
-			});
+			}
+			this.broadcastMessageEvent(msg);
 		}));
 		this.unsubscribes.push(this.msgChannel.on("Msg/onRecvOfflineFileMsg", (arg) => {
 			const items = narrowOfflineFiles(arg);
@@ -4345,6 +4382,7 @@ var NapukettoOneBot11Adapter = class extends BaseProtocolAdapter {
 	/**
 	* 广播消息事件（P2-19：接收方向 ID 转换）。
 	* 收集 at uid → 一次批量 uidToUin → 构造上下文 → 翻译广播。
+	* 群消息另查发送者角色（GroupCache 缓存优先，失败回退缺省 member）。
 	* 翻译失败退化为原样（不阻塞上报）。
 	*/
 	async broadcastMessageEvent(msg) {
@@ -4353,8 +4391,10 @@ var NapukettoOneBot11Adapter = class extends BaseProtocolAdapter {
 		if (atUids.length > 0) try {
 			uidToUin = await this.oneBotApi.uidToUin(atUids);
 		} catch {}
+		const senderRole = msg.chatType === ChatType.GROUP ? await this.oneBotApi.groupMemberRole(msg.peerUid, msg.senderUid) : void 0;
 		const ctx = {
 			...uidToUin !== void 0 ? { uidToUin } : {},
+			...senderRole !== void 0 ? { senderRole } : {},
 			msgIdToOb11Id: (msgId) => this.oneBotApi.messageUnique.getMessageId(msgId)
 		};
 		this.broadcastEvent(toOb11MessageEvent(msg, this.selfUin, this.oneBotApi.messageUnique, this.messageFormat, ctx));
@@ -4373,11 +4413,7 @@ var NapukettoOneBot11Adapter = class extends BaseProtocolAdapter {
 	}
 	/** 广播群系统通知 → OB11 group request 事件（批量 uidToUin 后翻译，纯函数）。 */
 	async broadcastGroupRequests(notifies) {
-		const uids = [];
-		for (const n of notifies) {
-			const notify = n;
-			for (const u of [notify.user1, notify.user2]) if (typeof u?.uid === "string" && u.uid !== "") uids.push(u.uid);
-		}
+		const uids = collectGroupNotifyUids(notifies);
 		let uidToUin = /* @__PURE__ */ new Map();
 		if (uids.length > 0) try {
 			uidToUin = await this.oneBotApi.uidToUin(uids);
@@ -4444,6 +4480,15 @@ var NapukettoOneBot11Adapter = class extends BaseProtocolAdapter {
 		respond(result);
 	}
 };
+/** 收集群系统通知涉及的 uid（user1/user2 双方，空 uid 跳过）。 */
+function collectGroupNotifyUids(notifies) {
+	const uids = [];
+	for (const n of notifies) {
+		const notify = n;
+		for (const u of [notify.user1, notify.user2]) if (typeof u?.uid === "string" && u.uid !== "") uids.push(u.uid);
+	}
+	return uids;
+}
 //#endregion
 export { MessageUnique, NapukettoOneBot11Adapter, OneBotApi, assembleOb11Transports, canonicalToCqMessage, canonicalToSegments, cqMessageToCanonical, cqMessageToSegments, createOb11ActionRegistry, encodeCqCode, escapeCqParam, escapeCqText, ob11ConfigSchema, ob11ErrorCodeMap, parseCqMessage, segmentsToCanonical, segmentsToCqMessage, serializeCqParts, unescapeCqText };