@napuketto/adapter 0.4.2 → 0.6.0

package/dist/onebot11/index.mjs

@@ -1,6 +1,8 @@
 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 createWsServerSchema, t as createHttpServerSchema } from "../transport-schema-CpPxyRK0.mjs";
+import { n as firstUntranslatedGrayTip, t as collectGrayTipUids } from "../gray-tip-LwBee5mo.mjs";
+import { n as MS_TO_SEC$5, r as resolveUin, t as narrowBuddyReqs } from "../buddy-req-Q7Q4bVuz.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";
@@ -1877,7 +1879,7 @@ function cqMessageToCanonical(text) {
 //#endregion
 //#region src/onebot11/helper/message-info.ts
 /** 毫秒 → 秒（Unix 时间戳）。 */
-const MS_TO_SEC$5 = 1e3;
+const MS_TO_SEC$4 = 1e3;
 /** RawMessage → OB11 消息信息（message_id 经 MessageUnique 映射）。
 * ctx（可选）：接收方向 ID 转换上下文（at uid→uin、reply NT msgId→OB11 id，P2-19）。 */
 function toOb11MessageInfo(msg, unique, ctx = {}) {
@@ -1894,7 +1896,7 @@ function toOb11MessageInfo(msg, unique, ctx = {}) {
 			user_id: Number(msg.senderUin),
 			nickname: msg.sendNickName
 		},
-		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$5),
+		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$4),
 		message: canonicalToSegments(elements),
 		raw_message: canonicalToCqMessage(elements)
 	};
@@ -1909,7 +1911,7 @@ function toOb11MessageInfo(msg, unique, ctx = {}) {
 //#endregion
 //#region src/onebot11/helper/notice.ts
 /** 毫秒 → 秒（Unix 时间戳）。 */
-const MS_TO_SEC$4 = 1e3;
+const MS_TO_SEC$3 = 1e3;
 /** 群文件业务类型（group_upload 的 file.busid,与 kernel 群文件系列同源语义）。 */
 const GROUP_FILE_BUS_ID = 102;
 /** 检查消息是否含文件元素（group_upload 开关分支判定）。 */
@@ -1928,7 +1930,7 @@ function toUin$1(uid, ctx) {
 /** 基础字段（time/self_id/post_type）。 */
 function base(msg, ctx) {
 	return {
-		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$4),
+		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$3),
 		self_id: Number(ctx.selfUin),
 		post_type: "notice",
 		group_id: Number(msg.peerUid)
@@ -1939,7 +1941,7 @@ function toRecall(msg, g, ctx) {
 	if (g?.revokeElement === void 0) return null;
 	const revoke = g.revokeElement;
 	if (msg.chatType === ChatType.C2C) return {
-		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$4),
+		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$3),
 		self_id: Number(ctx.selfUin),
 		post_type: "notice",
 		notice_type: "friend_recall",
@@ -1967,7 +1969,7 @@ function toPoke(msg, g, ctx) {
 	ctx.logger?.warn({ raw: JSON.stringify(g)?.slice(0, 2e3) }, "ob11: poke grayTip raw（待真实事件校准）");
 	const isGroup = msg.chatType === ChatType.GROUP;
 	return {
-		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$4),
+		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$3),
 		self_id: Number(ctx.selfUin),
 		post_type: "notice",
 		notice_type: "notify",
@@ -1977,28 +1979,30 @@ function toPoke(msg, g, ctx) {
 		target_id: toUin$1(aioOp?.peerUid ?? "", ctx)
 	};
 }
+/** 群成员变动映射器表（键 = TipGroupElementType；缺项 = 不可翻译返回 null）。 */
+const GROUP_CHANGE_BUILDERS = {
+	[TipGroupElementType.MEMBER_ADD]: toMemberAdd,
+	[TipGroupElementType.QUIT]: toQuit,
+	[TipGroupElementType.BLOCK]: toAdminChange,
+	[TipGroupElementType.UNBLOCK]: toAdminChange,
+	[TipGroupElementType.SHUT_UP]: toBan
+};
 /** 群成员变动（group_increase / group_decrease / group_admin / group_ban）。 */
 function toGroupChange(msg, g, ctx) {
 	const grp = g?.groupElement;
 	if (grp === void 0 || grp.type === void 0) return null;
-	const common = {
-		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$4),
+	const builder = GROUP_CHANGE_BUILDERS[grp.type];
+	if (builder === void 0) return null;
+	return builder({
+		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$3),
 		selfId: Number(ctx.selfUin),
 		groupId: Number(msg.peerUid),
 		memberUid: grp.memberUid ?? "",
 		adminUid: grp.adminUid ?? ""
-	};
-	switch (grp.type) {
-		case TipGroupElementType.MEMBER_ADD: return toMemberAdd(common, ctx);
-		case TipGroupElementType.QUIT: return toQuit(common, ctx);
-		case TipGroupElementType.BLOCK:
-		case TipGroupElementType.UNBLOCK: return toAdminChange(common, grp, ctx);
-		case TipGroupElementType.SHUT_UP: return toBan(common, grp, ctx);
-		default: return null;
-	}
+	}, grp, ctx);
 }
 /** 群成员增加（approve=管理员操作 / invite=普通邀请）。 */
-function toMemberAdd(common, ctx) {
+function toMemberAdd(common, _grp, ctx) {
 	const { time, selfId, groupId, memberUid, adminUid } = common;
 	return {
 		time,
@@ -2012,7 +2016,7 @@ function toMemberAdd(common, ctx) {
 	};
 }
 /** 群成员退出（leave）。 */
-function toQuit(common, ctx) {
+function toQuit(common, _grp, ctx) {
 	const { time, selfId, groupId, memberUid, adminUid } = common;
 	return {
 		time,
@@ -2040,18 +2044,18 @@ function toAdminChange(common, grp, ctx) {
 }
 /** 禁言（duration>0=ban / 否则 lift_ban）。 */
 function toBan(common, grp, ctx) {
-	const { time, selfId, groupId, adminUid, memberUid } = common;
 	const shutUp = grp.shutUp;
+	const duration = Number(shutUp?.duration ?? 0);
 	return {
-		time,
-		self_id: selfId,
+		time: common.time,
+		self_id: common.selfId,
 		post_type: "notice",
 		notice_type: "group_ban",
-		sub_type: Number(shutUp?.duration ?? 0) > 0 ? "ban" : "lift_ban",
-		group_id: groupId,
-		operator_id: toUin$1(shutUp?.admin?.uid ?? adminUid, ctx),
-		user_id: toUin$1(shutUp?.member?.uid ?? memberUid, ctx),
-		duration: Number(shutUp?.duration ?? 0)
+		sub_type: duration > 0 ? "ban" : "lift_ban",
+		group_id: common.groupId,
+		operator_id: toUin$1(shutUp?.admin?.uid ?? common.adminUid, ctx),
+		user_id: toUin$1(shutUp?.member?.uid ?? common.memberUid, ctx),
+		duration
 	};
 }
 /**
@@ -2062,7 +2066,7 @@ function toBan(common, grp, ctx) {
 function toFriendAdd(entry, selfUin) {
 	const uin = entry.coreInfo?.uin ?? entry.uin ?? "";
 	return {
-		time: Math.floor(Date.now() / MS_TO_SEC$4),
+		time: Math.floor(Date.now() / MS_TO_SEC$3),
 		self_id: Number(selfUin),
 		post_type: "notice",
 		notice_type: "friend_add",
@@ -2079,7 +2083,7 @@ function toGroupUpload(msg, selfUin) {
 	const file = msg.elements.find((e) => e.fileElement !== void 0)?.fileElement;
 	if (file === void 0) return null;
 	return {
-		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$4),
+		time: Math.floor(Number(msg.msgTime) / MS_TO_SEC$3),
 		self_id: Number(selfUin),
 		post_type: "notice",
 		notice_type: "group_upload",
@@ -2099,12 +2103,16 @@ function translateGrayTip(msg, g, ctx) {
 	if (subType === GrayTipSubType.REVOKE) return toRecall(msg, g, ctx);
 	if (subType === GrayTipSubType.GROUP) return toGroupChange(msg, g, ctx);
 	if (g.aioOpGrayTipElement !== void 0) return toPoke(msg, g, ctx);
-	ctx.logger?.warn({
-		subType,
-		raw: JSON.stringify(g)?.slice(0, 2e3)
-	}, "ob11: 未翻译的 grayTip 子类型（raw 校准数据）");
+	logUntranslatedGrayTip(msg, ctx);
 	return null;
 }
+function logUntranslatedGrayTip(msg, ctx) {
+	const untranslated = firstUntranslatedGrayTip(msg);
+	if (untranslated !== void 0) ctx.logger?.warn({
+		subType: untranslated.subElementType,
+		raw: JSON.stringify(untranslated)?.slice(0, 2e3)
+	}, "ob11: 未翻译的 grayTip 子类型（raw 校准数据）");
+}
 /** RawMessage → OB11 notice 事件（无 grayTip 返回 null）。
 * 未知/未翻译子类型打 raw JSON 日志（校准数据积累，2026-09-08）。 */
 function toOb11NoticeEvent(msg, ctx) {
@@ -2133,15 +2141,9 @@ function toOb11NoticeEvent(msg, ctx) {
 * ⚠️ onBuddyReqChange 回调参数形状未经真实事件校准（wrapper 字符串证据仅有方法名），
 * narrowBuddyReqs 防御性收窄，未知形状返回 null 由调用方打 raw 日志积累校准数据。
 */
-/** 毫秒 → 秒（Unix 时间戳）。 */
-const MS_TO_SEC$3 = 1e3;
-/** uid → uin（上下文映射缺省时：数字 uid 直取数值，非数字 uid 返回 0 表示未知）。 */
+/** uid → uin（core 共享解析；ctx 携带映射）。 */
 function toUin(uid, ctx) {
-	if (uid === void 0 || uid === "") return 0;
-	const uin = ctx.uidToUin.get(uid);
-	if (uin !== void 0) return Number(uin);
-	const n = Number(uid);
-	return Number.isFinite(n) ? n : 0;
+	return resolveUin(uid, ctx.uidToUin);
 }
 /**
 * GroupNotify → OB11 群请求事件（group_add / group_invite）。
@@ -2164,7 +2166,7 @@ function toOb11GroupRequestEvent(notify, ctx) {
 		default: return null;
 	}
 	return {
-		time: Math.floor(Date.now() / MS_TO_SEC$3),
+		time: Math.floor(Date.now() / MS_TO_SEC$5),
 		self_id: Number(ctx.selfUin),
 		post_type: "request",
 		request_type: "group",
@@ -2175,24 +2177,6 @@ function toOb11GroupRequestEvent(notify, ctx) {
 		flag: String(notify.seq)
 	};
 }
-/** BuddyReq 防御性收窄：仅接受字段形状可用的对象（onBuddyReqChange 参数待真实事件校准）。 */
-function isBuddyReqLike(value) {
-	if (typeof value !== "object" || value === null) return false;
-	const v = value;
-	return typeof v["reqTime"] === "string" && typeof v["friendUid"] === "string";
-}
-/**
-* onBuddyReqChange 回调参数 → BuddyReq 列表（防御性收窄）。
-* 已知候选形状：BuddyReq[] / { buddyReqs: BuddyReq[] }；其余返回 null（调用方打 raw 日志）。
-*/
-function narrowBuddyReqs(arg) {
-	if (Array.isArray(arg)) return arg.every(isBuddyReqLike) ? arg : null;
-	if (typeof arg === "object" && arg !== null) {
-		const reqs = arg["buddyReqs"];
-		if (Array.isArray(reqs) && reqs.every(isBuddyReqLike)) return reqs;
-	}
-	return null;
-}
 /**
 * BuddyReq → OB11 好友请求事件（friend）。
 * comment 取 words 字段（验证留言，形状待校准，缺省空串）；flag = reqTime。
@@ -2200,7 +2184,7 @@ function narrowBuddyReqs(arg) {
 function toOb11FriendRequestEvent(req, ctx) {
 	const words = req["words"];
 	return {
-		time: Math.floor(Date.now() / MS_TO_SEC$3),
+		time: Math.floor(Date.now() / MS_TO_SEC$5),
 		self_id: Number(ctx.selfUin),
 		post_type: "request",
 		request_type: "friend",
@@ -4269,22 +4253,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);
@@ -4415,18 +4397,9 @@ 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);
-		}
-		let uidToUin = /* @__PURE__ */ new Map();
-		if (uids.length > 0) try {
-			uidToUin = await this.oneBotApi.uidToUin(uids);
-		} catch {}
 		const ctx = {
 			selfUin: this.selfUin,
-			uidToUin
+			uidToUin: await this.uidToUinMap(collectGroupNotifyUids(notifies))
 		};
 		for (const n of notifies) {
 			const event = toOb11GroupRequestEvent(n, ctx);
@@ -4435,17 +4408,21 @@ var NapukettoOneBot11Adapter = class extends BaseProtocolAdapter {
 	}
 	/** 广播好友申请 → OB11 friend request 事件（批量 uidToUin 后翻译，纯函数）。 */
 	async broadcastFriendRequests(reqs) {
-		const uids = reqs.map((r) => r.friendUid).filter((uid) => uid !== "");
-		let uidToUin = /* @__PURE__ */ new Map();
-		if (uids.length > 0) try {
-			uidToUin = await this.oneBotApi.uidToUin(uids);
-		} catch {}
 		const ctx = {
 			selfUin: this.selfUin,
-			uidToUin
+			uidToUin: await this.uidToUinMap(reqs.map((r) => r.friendUid).filter((uid) => uid !== ""))
 		};
 		for (const req of reqs) this.broadcastEvent(toOb11FriendRequestEvent(req, ctx));
 	}
+	/** uid 批量 → uin（失败退空 Map：翻译层退化为 uid 数值，不阻塞请求上报）。 */
+	async uidToUinMap(uids) {
+		if (uids.length === 0) return /* @__PURE__ */ new Map();
+		try {
+			return await this.oneBotApi.uidToUin(uids);
+		} catch {
+			return /* @__PURE__ */ new Map();
+		}
+	}
 	/** 退订（幂等）。 */
 	unsubscribeAll() {
 		for (const off of this.unsubscribes) off();
@@ -4486,6 +4463,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 };