mioki 0.14.0 → 0.15.1

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_package = require('./package-xEK88jTG.cjs');
+const require_package = require('./package-DrAKGYns.cjs');
 let node_fs = require("node:fs");
 node_fs = require_package.__toESM(node_fs);
 let node_path = require("node:path");

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as version } from "./package-DFYh9fsp.mjs";
+import { t as version } from "./package-75_Caljc.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import mri from "mri";

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_package = require('./package-xEK88jTG.cjs');
+const require_package = require('./package-DrAKGYns.cjs');
 let node_fs = require("node:fs");
 node_fs = require_package.__toESM(node_fs);
 let node_util = require("node:util");
@@ -1224,36 +1224,100 @@ function bindBot(bot, func) {
 	return (...args) => func(bot, ...args);
 }
 /**
-* 消息去重器
-* 处理多个 bot 在同一个群时，同一消息只处理一次
+* 去重器
+* 处理多个 bot 在相同场景下，同一事件只处理一次
 */
-var MessageDeduplicator = class {
-	processedMessages = /* @__PURE__ */ new Set();
+var Deduplicator = class {
+	processedEvents = /* @__PURE__ */ new Set();
 	maxSize = 1e3;
 	/**
-	* 生成消息唯一键
-	* 对于群消息：使用 group_id:user_id:time
-	* 对于私聊消息：使用 private:user_id:time
+	* 获取事件类型键
 	*/
-	getKey(event) {
-		if (event.message_type === "group") return `group:${event.group_id}:${event.user_id}:${event.time}`;
-		else return `private:${event.user_id}:${event.time}`;
+	getEventTypeKey(e) {
+		const { post_type } = e;
+		if (post_type === "message") return `msg:${e.message_type}`;
+		if (post_type === "request") {
+			if (e.request_type === "friend") return "req:friend";
+			return `req:group:${e.sub_type ?? "unknown"}`;
+		}
+		if (post_type === "notice") {
+			if (e.notice_type === "group") return `notice:group:${e.sub_type}`;
+			return `notice:${e.notice_type}:${e.sub_type}`;
+		}
+		return "unknown";
 	}
-	isProcessed(event) {
-		return this.processedMessages.has(this.getKey(event));
+	getGroupMessageKey(e) {
+		const groupId = e.group_id ?? "_";
+		const userId = e.user_id ?? "_";
+		const time = e.time ?? "_";
+		const raw = e.raw_message ?? "_";
+		return `msg:group:${groupId}:${userId}:${time}:${node_crypto.default.createHash("md5").update(raw).digest("hex")}`;
 	}
-	markProcessed(event) {
-		if (this.processedMessages.size >= this.maxSize) {
-			const first = this.processedMessages.values().next();
-			if (!first.done) this.processedMessages.delete(first.value);
+	getPrivateMessageKey(e) {
+		const userId = e.user_id ?? "_";
+		const targetId = e.target_id ?? "_";
+		const time = e.time ?? "_";
+		const raw = e.raw_message ?? "_";
+		return `msg:private:${userId}:${targetId}:${time}:${node_crypto.default.createHash("md5").update(raw).digest("hex")}`;
+	}
+	getNoticeGroupKey(e) {
+		return `${this.getEventTypeKey(e)}:${e.group_id ?? "_"}:${e.user_id ?? "_"}:${"operator_id" in e ? e.operator_id ?? "_" : "_"}:${"target_id" in e ? e.target_id ?? "_" : "_"}:${e.sub_type ?? "_"}:${"action_type" in e ? e.action_type ?? "_" : "_"}:${"duration" in e ? e.duration ?? "_" : "_"}:${e.time ?? "_"}`;
+	}
+	getRequestKey(e) {
+		const typeKey = this.getEventTypeKey(e);
+		const userId = e.user_id ?? "_";
+		const groupId = "group_id" in e ? e.group_id ?? "_" : "_";
+		const time = e.time ?? "_";
+		const comment = e.comment ?? "_";
+		return `${typeKey}:${userId}:${groupId}:${time}:${comment ? node_crypto.default.createHash("md5").update(comment).digest("hex") : "_"}`;
+	}
+	/**
+	* 生成事件唯一键
+	*/
+	getKey(e) {
+		const typeKey = this.getEventTypeKey(e);
+		if (typeKey === "msg:group") return this.getGroupMessageKey(e);
+		if (typeKey === "msg:private") return this.getPrivateMessageKey(e);
+		if (typeKey.startsWith("notice:group:")) return this.getNoticeGroupKey(e);
+		if (typeKey.startsWith("req:")) return this.getRequestKey(e);
+		return "";
+	}
+	/**
+	* 检查事件是否已处理过
+	* @param event
+	* @param scope
+	*/
+	isProcessed(event, scope) {
+		const key = scope ? `${this.getKey(event)}:${scope}` : this.getKey(event);
+		return this.processedEvents.has(key);
+	}
+	/**
+	* 标记事件为已处理
+	* @param event
+	* @param scope 需与 isProcessed 一致
+	*/
+	markProcessed(event, scope) {
+		const key = scope ? `${this.getKey(event)}:${scope}` : this.getKey(event);
+		if (this.processedEvents.size >= this.maxSize) {
+			const first = this.processedEvents.values().next();
+			if (!first.done) this.processedEvents.delete(first.value);
 		}
-		this.processedMessages.add(this.getKey(event));
+		this.processedEvents.add(key);
 	}
-	clear() {
-		this.processedMessages.clear();
+};
+/**
+* 消息去重器
+* @deprecated 请使用 Deduplicator，它支持更多事件类型
+*/
+var MessageDeduplicator = class extends Deduplicator {
+	isProcessed(event) {
+		return super.isProcessed(event);
+	}
+	markProcessed(event) {
+		super.markProcessed(event);
 	}
 };
-const deduplicator = new MessageDeduplicator();
+const deduplicator = new Deduplicator();
 const runtimePlugins = /* @__PURE__ */ new Map();
 const buildRemovedActions = (bot) => Object.fromEntries(Object.entries(actions_exports).map(([k, v]) => [k, bindBot(bot, v)]));
 /**
@@ -1275,6 +1339,24 @@ function isMessageEvent(event) {
 	return isGroupMessageEvent(event) || isPrivateMessageEvent(event);
 }
 /**
+* 检查事件是否是请求事件
+*/
+function isRequestEvent(event) {
+	return event?.post_type === "request";
+}
+/**
+* 检查事件是否是群通知事件
+*/
+function isGroupNoticeEvent(event) {
+	return event?.post_type === "notice" && event?.notice_type === "group";
+}
+/**
+* 检查事件是否需要去重
+*/
+function isDeduplicableEvent(event) {
+	return isMessageEvent(event) || isRequestEvent(event) || isGroupNoticeEvent(event);
+}
+/**
 * 定义一个 Mioki 插件
 * @param plugin Mioki 插件对象
 * @returns Mioki 插件对象
@@ -1325,22 +1407,26 @@ async function enablePlugin(bots, plugin, type = "external") {
 					clears.add(remove);
 					return remove;
 				},
-				handle: (eventName, handler) => {
+				handle: (eventName, handler, options = {}) => {
 					logger$1.debug(`Registering event handler for event: ${String(eventName)}`);
+					const { deduplicate = true } = options;
+					const dedupeScope = `${name}:${String(eventName)}:${node_crypto.default.randomUUID()}`;
 					const unsubscribes = [];
 					for (const bot$1 of bots) {
-						const wrappedHandler = (event) => {
-							if (isMessageEvent(event)) {
-								const messageEvent = event;
-								if (isPrivateMessageEvent(messageEvent)) {
-									if (messageEvent.self_id !== bot$1.bot_id) return;
-								}
-								if (isGroupMessageEvent(messageEvent)) {
-									if (deduplicator.isProcessed(messageEvent)) return;
-									deduplicator.markProcessed(messageEvent);
-								}
+						const wrappedHandler = (e) => {
+							if (isPrivateMessageEvent(e)) {
+								if (e.self_id !== bot$1.bot_id) return;
+							}
+							const senderUserId = e.user_id;
+							const senderOperatorId = e.operator_id;
+							const isFromConnectedBot = senderUserId && bots.some((b) => b.bot_id === senderUserId);
+							const isFromConnectedBotOperator = senderOperatorId && bots.some((b) => b.bot_id === senderOperatorId);
+							if (isFromConnectedBot || isFromConnectedBotOperator) return;
+							if (deduplicate && isDeduplicableEvent(e)) {
+								if (deduplicator.isProcessed(e, dedupeScope)) return;
+								deduplicator.markProcessed(e, dedupeScope);
 							}
-							handler(event);
+							handler(e);
 						};
 						bot$1.on(eventName, wrappedHandler);
 						const unsubscribe = () => {
@@ -2061,6 +2147,7 @@ exports.BOT_CWD = BOT_CWD;
 exports.BUILTIN_PLUGINS = BUILTIN_PLUGINS;
 exports.CORE_PLUGINS = CORE_PLUGINS;
 exports.ChromeUA = ChromeUA;
+exports.Deduplicator = Deduplicator;
 exports.MessageDeduplicator = MessageDeduplicator;
 exports.START_TIME = START_TIME;
 exports.SystemMap = SystemMap;