mioki 0.14.0 → 0.15.0

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { EventMap, GroupMessageEvent, LogLevel, Logger, MessageEvent, NapCat, PrivateMessageEvent, RecvElement, RecvImageElement, Sendable } from "napcat-sdk";
+import { EventMap, GroupMessageEvent, LogLevel, Logger, MessageEvent, NapCat, NoticeEvent, PrivateMessageEvent, RecvElement, RecvImageElement, RequestEvent, Sendable } from "napcat-sdk";
 import { Low } from "lowdb";
 import { Jiti } from "jiti";
 import prettyMs from "pretty-ms";
@@ -642,23 +642,49 @@ type RemoveBotParam<T> = { [K in keyof T]: T[K] extends ((...args: any[]) => any
 type OmitBotParamFromFunc<Func extends (bot: NapCat, ...args: any[]) => any> = Func extends ((bot: NapCat, ...args: infer A) => infer Return) ? (...args: A) => Return : never;
 declare function bindBot<Params extends Array<any> = any[], Return$1 = any>(bot: NapCat, func: (bot: NapCat, ...args: Params) => Return$1): OmitBotParamFromFunc<(bot: NapCat, ...args: Params) => Return$1>;
 /**
- * 消息去重器
- * 处理多个 bot 在同一个群时，同一消息只处理一次
+ * 需要去重的事件类型
+ */
+type DeduplicableEvent = MessageEvent | RequestEvent | NoticeEvent;
+/**
+ * 去重器
+ * 处理多个 bot 在相同场景下，同一事件只处理一次
  */
-declare class MessageDeduplicator {
-  private processedMessages;
+declare class Deduplicator {
+  private processedEvents;
   private maxSize;
   /**
-   * 生成消息唯一键
-   * 对于群消息：使用 group_id:user_id:time
-   * 对于私聊消息：使用 private:user_id:time
+   * 获取事件类型键
+   */
+  private getEventTypeKey;
+  private getGroupMessageKey;
+  private getNoticeGroupKey;
+  private getRequestKey;
+  /**
+   * 生成事件唯一键
    */
   private getKey;
+  /**
+   * 检查事件是否已处理过
+   * @param event
+   * @param scope
+   */
+  isProcessed(event: DeduplicableEvent, scope?: string): boolean;
+  /**
+   * 标记事件为已处理
+   * @param event
+   * @param scope 需与 isProcessed 一致
+   */
+  markProcessed(event: DeduplicableEvent, scope?: string): void;
+}
+/**
+ * 消息去重器
+ * @deprecated 请使用 Deduplicator，它支持更多事件类型
+ */
+declare class MessageDeduplicator extends Deduplicator {
   isProcessed(event: GroupMessageEvent | PrivateMessageEvent): boolean;
   markProcessed(event: GroupMessageEvent | PrivateMessageEvent): void;
-  clear(): void;
 }
-declare const deduplicator: MessageDeduplicator;
+declare const deduplicator: Deduplicator;
 /**
  * Mioki 上下文对象，包含 Mioki 运行时的信息和方法
  */
@@ -674,15 +700,15 @@ interface MiokiContext extends Services, Configs, Utils, RemoveBotParam<Actions>
   /** 通过域名获取 Cookies */
   getCookie: NapCat['getCookie'];
   /** 注册事件处理器 */
-  handle: <EventName extends keyof EventMap>(eventName: EventName, handler: (event: EventMap[EventName]) => any) => void;
+  handle: <EventName extends keyof EventMap>(eventName: EventName, handler: (event: EventMap[EventName]) => any, options?: HandleOptions) => () => void;
   /** 注册定时任务 */
   cron: (cronExpression: string, handler: (ctx: MiokiContext, task: TaskContext) => any) => ScheduledTask;
   /** 待清理的函数集合，在插件卸载时会被调用 */
   clears: Set<(() => any) | null | undefined>;
   /** 日志器 */
   logger: Logger;
-  /** 消息去重器 */
-  deduplicator: MessageDeduplicator;
+  /** 事件去重器 */
+  deduplicator: Deduplicator;
 }
 declare const runtimePlugins: Map<string, {
   name: string;
@@ -692,6 +718,16 @@ declare const runtimePlugins: Map<string, {
   plugin: MiokiPlugin;
   disable: () => any;
 }>;
+/**
+ * 事件处理器选项
+ */
+interface HandleOptions {
+  /**
+   * 是否启用自动去重
+   * @default true
+   */
+  deduplicate?: boolean;
+}
 interface MiokiPlugin {
   /** 插件 ID，请保持唯一，一般为插件目录名称，框架内部通过这个识别不同的插件 */
   name: string;
@@ -729,5 +765,5 @@ declare function findLocalPlugins(): Promise<{
 //#region src/builtins/index.d.ts
 declare const BUILTIN_PLUGINS: MiokiPlugin[];
 //#endregion
-export { AnyFunc, ArchMap, Arrayable, Awaitable, BOT_CWD, BUILTIN_PLUGINS, BotStatus, CORE_PLUGINS, ChromeUA, CreateCmdOptions, ExtendedNapCat, Gettable, HasMessage, MessageDeduplicator, MiokiConfig, MiokiContext, MiokiCoreServiceContrib, MiokiPlugin, MiokiServices, MiokiStatus, NapCatConfig, NapCatInstanceConfig, Noop, OmitBotParamFromFunc, PureObject, START_TIME, StartOptions, StatusFormatter, SystemMap, addService, base64Decode, base64Encode, bindBot, botConfig, box, clamp, colorize, colors, connectedBots, createCmd, createDB, createForwardMsg, createStore, dayjs, dedent, deduplicator, definePlugin, enablePlugin, ensureBuffer, ensurePluginDir, filesize, filter, find, findLocalPlugins, formatDuration, formatMiokiStatus, formatQQLevel, fs, getAbsPluginDir, getAuthCodeViaTicket, getBfaceUrl, getGTk, getGroupAvatarLink, getImage, getImageUrl, getLogFilePath, getMentionedImage, getMentionedImageUrl, getMentionedUserId, getMinicoTokenViaAuthCode, getMiokiLogger, getMiokiStatus, getQQAvatarLink, getQuoteImage, getQuoteImageUrl, getQuoteMsg, getQuoteText, getTerminalInput, getViolationRecords, hasRight, isAdmin, isBoolean, isDefined, isFunction, isGroupMsg, isInPm2, isNumber, isObject, isOwner, isOwnerOrAdmin, isPrivateMsg, isString, jiti, localNum, localeDate, localeTime, logger, match, md5, mri, noNullish, normalizeNapCatConfig, noticeAdmins, noticeFriends, noticeGroups, noticeMainOwner, noticeOwners, path, prettyMs, qs, queryDevToolsLoginStatus, randomId, randomInt, randomItem, randomItems, readMiokiConfig, readPackageJson, requestLoginViaDevTools, runWithErrorHandler, runWithReaction, runtimePlugins, services, signArk, start, string2argv, stringifyError, stripAnsi, systemInfo, text, toArray, toMsgId, unique, updateBotCWD, updateBotConfig, uploadImageToCollection, uploadImageToGroupHomework, uploadImageToGroupNotice, uuid, wait, writePackageJson };
+export { AnyFunc, ArchMap, Arrayable, Awaitable, BOT_CWD, BUILTIN_PLUGINS, BotStatus, CORE_PLUGINS, ChromeUA, CreateCmdOptions, DeduplicableEvent, Deduplicator, ExtendedNapCat, Gettable, HandleOptions, HasMessage, MessageDeduplicator, MiokiConfig, MiokiContext, MiokiCoreServiceContrib, MiokiPlugin, MiokiServices, MiokiStatus, NapCatConfig, NapCatInstanceConfig, Noop, OmitBotParamFromFunc, PureObject, START_TIME, StartOptions, StatusFormatter, SystemMap, addService, base64Decode, base64Encode, bindBot, botConfig, box, clamp, colorize, colors, connectedBots, createCmd, createDB, createForwardMsg, createStore, dayjs, dedent, deduplicator, definePlugin, enablePlugin, ensureBuffer, ensurePluginDir, filesize, filter, find, findLocalPlugins, formatDuration, formatMiokiStatus, formatQQLevel, fs, getAbsPluginDir, getAuthCodeViaTicket, getBfaceUrl, getGTk, getGroupAvatarLink, getImage, getImageUrl, getLogFilePath, getMentionedImage, getMentionedImageUrl, getMentionedUserId, getMinicoTokenViaAuthCode, getMiokiLogger, getMiokiStatus, getQQAvatarLink, getQuoteImage, getQuoteImageUrl, getQuoteMsg, getQuoteText, getTerminalInput, getViolationRecords, hasRight, isAdmin, isBoolean, isDefined, isFunction, isGroupMsg, isInPm2, isNumber, isObject, isOwner, isOwnerOrAdmin, isPrivateMsg, isString, jiti, localNum, localeDate, localeTime, logger, match, md5, mri, noNullish, normalizeNapCatConfig, noticeAdmins, noticeFriends, noticeGroups, noticeMainOwner, noticeOwners, path, prettyMs, qs, queryDevToolsLoginStatus, randomId, randomInt, randomItem, randomItems, readMiokiConfig, readPackageJson, requestLoginViaDevTools, runWithErrorHandler, runWithReaction, runtimePlugins, services, signArk, start, string2argv, stringifyError, stripAnsi, systemInfo, text, toArray, toMsgId, unique, updateBotCWD, updateBotConfig, uploadImageToCollection, uploadImageToGroupHomework, uploadImageToGroupNotice, uuid, wait, writePackageJson };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.mts

@@ -3,7 +3,7 @@ import path from "node:path";
 import mri from "mri";
 import { BinaryLike, BinaryToTextEncoding } from "node:crypto";
 import { Low } from "lowdb";
-import { EventMap, GroupMessageEvent, LogLevel, Logger, MessageEvent, NapCat, PrivateMessageEvent, RecvElement, RecvImageElement, Sendable } from "napcat-sdk";
+import { EventMap, GroupMessageEvent, LogLevel, Logger, MessageEvent, NapCat, NoticeEvent, PrivateMessageEvent, RecvElement, RecvImageElement, RequestEvent, Sendable } from "napcat-sdk";
 import { Jiti } from "jiti";
 import { string2argv } from "string2argv";
 import prettyMs from "pretty-ms";
@@ -640,23 +640,49 @@ type RemoveBotParam<T> = { [K in keyof T]: T[K] extends ((...args: any[]) => any
 type OmitBotParamFromFunc<Func extends (bot: NapCat, ...args: any[]) => any> = Func extends ((bot: NapCat, ...args: infer A) => infer Return) ? (...args: A) => Return : never;
 declare function bindBot<Params extends Array<any> = any[], Return$1 = any>(bot: NapCat, func: (bot: NapCat, ...args: Params) => Return$1): OmitBotParamFromFunc<(bot: NapCat, ...args: Params) => Return$1>;
 /**
- * 消息去重器
- * 处理多个 bot 在同一个群时，同一消息只处理一次
+ * 需要去重的事件类型
+ */
+type DeduplicableEvent = MessageEvent | RequestEvent | NoticeEvent;
+/**
+ * 去重器
+ * 处理多个 bot 在相同场景下，同一事件只处理一次
  */
-declare class MessageDeduplicator {
-  private processedMessages;
+declare class Deduplicator {
+  private processedEvents;
   private maxSize;
   /**
-   * 生成消息唯一键
-   * 对于群消息：使用 group_id:user_id:time
-   * 对于私聊消息：使用 private:user_id:time
+   * 获取事件类型键
+   */
+  private getEventTypeKey;
+  private getGroupMessageKey;
+  private getNoticeGroupKey;
+  private getRequestKey;
+  /**
+   * 生成事件唯一键
    */
   private getKey;
+  /**
+   * 检查事件是否已处理过
+   * @param event
+   * @param scope
+   */
+  isProcessed(event: DeduplicableEvent, scope?: string): boolean;
+  /**
+   * 标记事件为已处理
+   * @param event
+   * @param scope 需与 isProcessed 一致
+   */
+  markProcessed(event: DeduplicableEvent, scope?: string): void;
+}
+/**
+ * 消息去重器
+ * @deprecated 请使用 Deduplicator，它支持更多事件类型
+ */
+declare class MessageDeduplicator extends Deduplicator {
   isProcessed(event: GroupMessageEvent | PrivateMessageEvent): boolean;
   markProcessed(event: GroupMessageEvent | PrivateMessageEvent): void;
-  clear(): void;
 }
-declare const deduplicator: MessageDeduplicator;
+declare const deduplicator: Deduplicator;
 /**
  * Mioki 上下文对象，包含 Mioki 运行时的信息和方法
  */
@@ -672,15 +698,15 @@ interface MiokiContext extends Services, Configs, Utils, RemoveBotParam<Actions>
   /** 通过域名获取 Cookies */
   getCookie: NapCat['getCookie'];
   /** 注册事件处理器 */
-  handle: <EventName extends keyof EventMap>(eventName: EventName, handler: (event: EventMap[EventName]) => any) => void;
+  handle: <EventName extends keyof EventMap>(eventName: EventName, handler: (event: EventMap[EventName]) => any, options?: HandleOptions) => () => void;
   /** 注册定时任务 */
   cron: (cronExpression: string, handler: (ctx: MiokiContext, task: TaskContext) => any) => ScheduledTask;
   /** 待清理的函数集合，在插件卸载时会被调用 */
   clears: Set<(() => any) | null | undefined>;
   /** 日志器 */
   logger: Logger;
-  /** 消息去重器 */
-  deduplicator: MessageDeduplicator;
+  /** 事件去重器 */
+  deduplicator: Deduplicator;
 }
 declare const runtimePlugins: Map<string, {
   name: string;
@@ -690,6 +716,16 @@ declare const runtimePlugins: Map<string, {
   plugin: MiokiPlugin;
   disable: () => any;
 }>;
+/**
+ * 事件处理器选项
+ */
+interface HandleOptions {
+  /**
+   * 是否启用自动去重
+   * @default true
+   */
+  deduplicate?: boolean;
+}
 interface MiokiPlugin {
   /** 插件 ID，请保持唯一，一般为插件目录名称，框架内部通过这个识别不同的插件 */
   name: string;
@@ -727,5 +763,5 @@ declare function findLocalPlugins(): Promise<{
 //#region src/builtins/index.d.ts
 declare const BUILTIN_PLUGINS: MiokiPlugin[];
 //#endregion
-export { AnyFunc, ArchMap, Arrayable, Awaitable, BOT_CWD, BUILTIN_PLUGINS, BotStatus, CORE_PLUGINS, ChromeUA, CreateCmdOptions, ExtendedNapCat, Gettable, HasMessage, MessageDeduplicator, MiokiConfig, MiokiContext, MiokiCoreServiceContrib, MiokiPlugin, MiokiServices, MiokiStatus, NapCatConfig, NapCatInstanceConfig, Noop, OmitBotParamFromFunc, PureObject, START_TIME, StartOptions, StatusFormatter, SystemMap, addService, base64Decode, base64Encode, bindBot, botConfig, box, clamp, colorize, colors, connectedBots, createCmd, createDB, createForwardMsg, createStore, dayjs, dedent, deduplicator, definePlugin, enablePlugin, ensureBuffer, ensurePluginDir, filesize, filter, find, findLocalPlugins, formatDuration, formatMiokiStatus, formatQQLevel, fs, getAbsPluginDir, getAuthCodeViaTicket, getBfaceUrl, getGTk, getGroupAvatarLink, getImage, getImageUrl, getLogFilePath, getMentionedImage, getMentionedImageUrl, getMentionedUserId, getMinicoTokenViaAuthCode, getMiokiLogger, getMiokiStatus, getQQAvatarLink, getQuoteImage, getQuoteImageUrl, getQuoteMsg, getQuoteText, getTerminalInput, getViolationRecords, hasRight, isAdmin, isBoolean, isDefined, isFunction, isGroupMsg, isInPm2, isNumber, isObject, isOwner, isOwnerOrAdmin, isPrivateMsg, isString, jiti, localNum, localeDate, localeTime, logger, match, md5, mri, noNullish, normalizeNapCatConfig, noticeAdmins, noticeFriends, noticeGroups, noticeMainOwner, noticeOwners, path, prettyMs, qs, queryDevToolsLoginStatus, randomId, randomInt, randomItem, randomItems, readMiokiConfig, readPackageJson, requestLoginViaDevTools, runWithErrorHandler, runWithReaction, runtimePlugins, services, signArk, start, string2argv, stringifyError, stripAnsi, systemInfo, text, toArray, toMsgId, unique, updateBotCWD, updateBotConfig, uploadImageToCollection, uploadImageToGroupHomework, uploadImageToGroupNotice, uuid, wait, writePackageJson };
+export { AnyFunc, ArchMap, Arrayable, Awaitable, BOT_CWD, BUILTIN_PLUGINS, BotStatus, CORE_PLUGINS, ChromeUA, CreateCmdOptions, DeduplicableEvent, Deduplicator, ExtendedNapCat, Gettable, HandleOptions, HasMessage, MessageDeduplicator, MiokiConfig, MiokiContext, MiokiCoreServiceContrib, MiokiPlugin, MiokiServices, MiokiStatus, NapCatConfig, NapCatInstanceConfig, Noop, OmitBotParamFromFunc, PureObject, START_TIME, StartOptions, StatusFormatter, SystemMap, addService, base64Decode, base64Encode, bindBot, botConfig, box, clamp, colorize, colors, connectedBots, createCmd, createDB, createForwardMsg, createStore, dayjs, dedent, deduplicator, definePlugin, enablePlugin, ensureBuffer, ensurePluginDir, filesize, filter, find, findLocalPlugins, formatDuration, formatMiokiStatus, formatQQLevel, fs, getAbsPluginDir, getAuthCodeViaTicket, getBfaceUrl, getGTk, getGroupAvatarLink, getImage, getImageUrl, getLogFilePath, getMentionedImage, getMentionedImageUrl, getMentionedUserId, getMinicoTokenViaAuthCode, getMiokiLogger, getMiokiStatus, getQQAvatarLink, getQuoteImage, getQuoteImageUrl, getQuoteMsg, getQuoteText, getTerminalInput, getViolationRecords, hasRight, isAdmin, isBoolean, isDefined, isFunction, isGroupMsg, isInPm2, isNumber, isObject, isOwner, isOwnerOrAdmin, isPrivateMsg, isString, jiti, localNum, localeDate, localeTime, logger, match, md5, mri, noNullish, normalizeNapCatConfig, noticeAdmins, noticeFriends, noticeGroups, noticeMainOwner, noticeOwners, path, prettyMs, qs, queryDevToolsLoginStatus, randomId, randomInt, randomItem, randomItems, readMiokiConfig, readPackageJson, requestLoginViaDevTools, runWithErrorHandler, runWithReaction, runtimePlugins, services, signArk, start, string2argv, stringifyError, stripAnsi, systemInfo, text, toArray, toMsgId, unique, updateBotCWD, updateBotConfig, uploadImageToCollection, uploadImageToGroupHomework, uploadImageToGroupNotice, uuid, wait, writePackageJson };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./chunk-BiucMVzj.mjs";
-import { t as version } from "./package-DFYh9fsp.mjs";
+import { t as version } from "./package-B4h-fhCq.mjs";
 import fs, { default as fs$1 } from "node:fs";
 import util from "node:util";
 import path, { default as path$1 } from "node:path";
@@ -1213,36 +1213,92 @@ 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}:${crypto.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);
+	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 ? crypto.createHash("md5").update(comment).digest("hex") : "_"}`;
+	}
+	/**
+	* 生成事件唯一键
+	*/
+	getKey(e) {
+		const typeKey = this.getEventTypeKey(e);
+		if (typeKey === "msg:group") return this.getGroupMessageKey(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);
+	}
+};
+/**
+* 消息去重器
+* @deprecated 请使用 Deduplicator，它支持更多事件类型
+*/
+var MessageDeduplicator = class extends Deduplicator {
+	isProcessed(event) {
+		return super.isProcessed(event);
 	}
-	clear() {
-		this.processedMessages.clear();
+	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)]));
 /**
@@ -1264,6 +1320,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 插件对象
@@ -1314,22 +1388,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)}:${crypto.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 = () => {
@@ -2045,5 +2123,5 @@ async function start(options = {}) {
 }
 
 //#endregion
-export { ArchMap, BOT_CWD, BUILTIN_PLUGINS, CORE_PLUGINS, ChromeUA, MessageDeduplicator, START_TIME, SystemMap, addService, base64Decode, base64Encode, bindBot, botConfig, box, clamp, colorize, colors, connectedBots, createCmd, createDB, createForwardMsg, createStore, dayjs, dedent, deduplicator, definePlugin, enablePlugin, ensureBuffer, ensurePluginDir, filesize, filter, find, findLocalPlugins, formatDuration, formatMiokiStatus, formatQQLevel, fs, getAbsPluginDir, getAuthCodeViaTicket, getBfaceUrl, getGTk, getGroupAvatarLink, getImage, getImageUrl, getLogFilePath, getMentionedImage, getMentionedImageUrl, getMentionedUserId, getMinicoTokenViaAuthCode, getMiokiLogger, getMiokiStatus, getQQAvatarLink, getQuoteImage, getQuoteImageUrl, getQuoteMsg, getQuoteText, getTerminalInput, getViolationRecords, hasRight, isAdmin, isBoolean, isDefined, isFunction, isGroupMsg, isInPm2, isNumber, isObject, isOwner, isOwnerOrAdmin, isPrivateMsg, isString, jiti, localNum, localeDate, localeTime, logger, match, md5, mri, noNullish, normalizeNapCatConfig, noticeAdmins, noticeFriends, noticeGroups, noticeMainOwner, noticeOwners, path, prettyMs, qs, queryDevToolsLoginStatus, randomId, randomInt, randomItem, randomItems, readMiokiConfig, readPackageJson, requestLoginViaDevTools, runWithErrorHandler, runWithReaction, runtimePlugins, services, signArk, start, string2argv, stringifyError, stripAnsi, systemInfo, text, toArray, toMsgId, unique, updateBotCWD, updateBotConfig, uploadImageToCollection, uploadImageToGroupHomework, uploadImageToGroupNotice, uuid, wait, writePackageJson };
+export { ArchMap, BOT_CWD, BUILTIN_PLUGINS, CORE_PLUGINS, ChromeUA, Deduplicator, MessageDeduplicator, START_TIME, SystemMap, addService, base64Decode, base64Encode, bindBot, botConfig, box, clamp, colorize, colors, connectedBots, createCmd, createDB, createForwardMsg, createStore, dayjs, dedent, deduplicator, definePlugin, enablePlugin, ensureBuffer, ensurePluginDir, filesize, filter, find, findLocalPlugins, formatDuration, formatMiokiStatus, formatQQLevel, fs, getAbsPluginDir, getAuthCodeViaTicket, getBfaceUrl, getGTk, getGroupAvatarLink, getImage, getImageUrl, getLogFilePath, getMentionedImage, getMentionedImageUrl, getMentionedUserId, getMinicoTokenViaAuthCode, getMiokiLogger, getMiokiStatus, getQQAvatarLink, getQuoteImage, getQuoteImageUrl, getQuoteMsg, getQuoteText, getTerminalInput, getViolationRecords, hasRight, isAdmin, isBoolean, isDefined, isFunction, isGroupMsg, isInPm2, isNumber, isObject, isOwner, isOwnerOrAdmin, isPrivateMsg, isString, jiti, localNum, localeDate, localeTime, logger, match, md5, mri, noNullish, normalizeNapCatConfig, noticeAdmins, noticeFriends, noticeGroups, noticeMainOwner, noticeOwners, path, prettyMs, qs, queryDevToolsLoginStatus, randomId, randomInt, randomItem, randomItems, readMiokiConfig, readPackageJson, requestLoginViaDevTools, runWithErrorHandler, runWithReaction, runtimePlugins, services, signArk, start, string2argv, stringifyError, stripAnsi, systemInfo, text, toArray, toMsgId, unique, updateBotCWD, updateBotConfig, uploadImageToCollection, uploadImageToGroupHomework, uploadImageToGroupNotice, uuid, wait, writePackageJson };
 //# sourceMappingURL=index.mjs.map