mioku 1.0.0 → 1.0.2

package/dist/index.js

@@ -1,4 +1,4 @@
-import { buildSpawnPlan, commandExists, resolveCommand, runCommand, runCommandInherit, version } from "./exec-CUvS9y6X.js";
+import { buildSpawnPlan, commandExists, resolveCommand, runCommand, runCommandInherit, version } from "./exec-DmpZrf3S.js";
 import { createRequire } from "node:module";
 import * as fs$5 from "node:fs";
 import * as fs$4 from "node:fs";
@@ -517,6 +517,12 @@ const segment = {
 	json(data) {
 		return new MessageSegmentImpl("json", { data: typeof data === "string" ? data : JSON.stringify(data) });
 	},
+	markdown(content) {
+		return new MessageSegmentImpl("markdown", { content });
+	},
+	button(options) {
+		return new MessageSegmentImpl("button", { ...options });
+	},
 	raw(type, data, attachment) {
 		return new MessageSegmentImpl(type, data, attachment);
 	}
@@ -862,6 +868,7 @@ var AdapterContextImpl = class {
 	#logger;
 	#emit;
 	#pendingStarts = new Set();
+	#crossDedup;
 	constructor(options) {
 		this.#state = options.state;
 		this.#bots = options.bots;
@@ -870,6 +877,7 @@ var AdapterContextImpl = class {
 		this.#capabilities = options.capabilities;
 		this.#logger = options.logger;
 		this.#emit = options.emit;
+		this.#crossDedup = options.crossDedup ?? null;
 	}
 	registerBot(bot) {
 		return this.#bots.register(bot);
@@ -933,6 +941,20 @@ var AdapterContextImpl = class {
 		};
 	}
 	async dispatch(event) {
+		if (event.kind === "message") {
+			const senderId = event.user_id;
+			if (senderId != null) {
+				const senderBot = this.#bots.pick(senderId);
+				if (senderBot && senderBot.bot_id !== event.self_id) {
+					this.#logger.debug(`拦截来自其他已连接 bot 的消息: sender=${senderId} self=${event.self_id}`);
+					return;
+				}
+			}
+			if (this.#crossDedup?.isDuplicate(event)) {
+				this.#logger.debug(`丢弃跨适配器重复消息: adapter=${event.identity?.adapter ?? ""} sender=${event.user_id ?? ""}`);
+				return;
+			}
+		}
 		await this.#bus.dispatch(event);
 	}
 	listen(route, handler) {
@@ -2414,6 +2436,9 @@ const toInstance = (bot, status) => {
 		connected_at: bot.connected_at,
 		impl: status?.impl,
 		version: status?.version,
+		protocol: status?.protocol,
+		platform: status?.platform,
+		platformVersion: status?.platform_version,
 		stats: normalizeStats(status?.stats, data),
 		data
 	};
@@ -2440,6 +2465,7 @@ const buildAdapterReport = async (options) => {
 		return {
 			name,
 			version: known?.version,
+			impl: known?.impl,
 			loaded: known != null,
 			instances: paired.filter((entry) => entry.adapter === name).map((entry) => entry.instance)
 		};
@@ -2464,8 +2490,11 @@ const formatStats = (stats) => {
 	return segments.join(" · ");
 };
 const formatInstance = (instance) => {
-	const impl = [instance.impl, instance.version].filter(Boolean).join("/");
-	const tags = [impl, instance.online ? "" : "🔴 离线"].filter(Boolean);
+	const tags = [
+		[instance.impl, instance.version].filter(Boolean).join("/"),
+		instance.platform ? `${instance.platform}${instance.platformVersion ? ` v${instance.platformVersion}` : ""}` : "",
+		instance.online ? "" : "🔴 离线"
+	].filter(Boolean);
 	const lines = [`👤 ${instance.nickname || "(未命名)"} (${instance.bot_id})${tags.length ? ` · ${tags.join(" · ")}` : ""}`];
 	const uptime = instance.online && instance.connected_at != null ? `⏳ 已连接 ${prettyMs(Date.now() - instance.connected_at, {
 		hideYear: true,
@@ -2482,9 +2511,16 @@ const summarize = (entry) => {
 	if (online === total) return `🟢 ${localNum(total)} 实例`;
 	return `${online === 0 ? "🔴" : "🟡"} ${localNum(online)}/${localNum(total)} 实例在线`;
 };
+/** `名称@包版本[/实现库 v版本]` */
+const formatAdapterName = (entry) => {
+	const base = `${entry.name}${entry.version ? `@${entry.version}` : ""}`;
+	if (!entry.impl) return base;
+	const impl = `${entry.impl.name}${entry.impl.version ? ` v${entry.impl.version}` : ""}`;
+	return `${base}/${impl}`;
+};
 const formatAdapterReport = (report) => {
 	if (!report.adapters.length) return "〓 🔌 mioku 适配器 〓\n(未加载任何适配器)";
-	const lines = report.adapters.flatMap((entry) => [`🔌 ${entry.name}${entry.version ? `/${entry.version}` : ""} · ${summarize(entry)}`, ...entry.instances.flatMap(formatInstance)]);
+	const lines = report.adapters.flatMap((entry) => [`🔌 ${formatAdapterName(entry)} · ${summarize(entry)}`, ...entry.instances.flatMap(formatInstance)]);
 	return ["〓 🔌 mioku 适配器 〓", ...lines].join("\n");
 };
 
@@ -4027,19 +4063,21 @@ const core = definePlugin({
 		const collectBots = () => ctx.bots;
 		/** 已加载的适配器优先，再补上只在 bot 上出现过的适配器名 */
 		const collectAdapters = () => {
-			const list = ctx.adapters.map((adapter) => ({
-				name: adapter.name,
-				version: adapter.version
-			}));
+			const describe = (name, adapter) => ({
+				name,
+				version: adapter?.version,
+				impl: adapter?.impl ? {
+					name: adapter.impl.name,
+					version: adapter.impl.version
+				} : void 0
+			});
+			const list = ctx.adapters.map((adapter) => describe(adapter.name, adapter));
 			const seen = new Set(list.map((adapter) => adapter.name));
 			for (const bot of ctx.bots) {
 				const name = String(bot.adapter);
 				if (seen.has(name)) continue;
 				seen.add(name);
-				list.push({
-					name,
-					version: ctx.getAdapter(name)?.version
-				});
+				list.push(describe(name, ctx.getAdapter(name)));
 			}
 			return list;
 		};
@@ -4693,6 +4731,96 @@ const loadLocalPlugin = async (jiti, name, resolvedPath) => {
 	return await loadFromEntry(jiti, entry, name);
 };
 
+//#endregion
+//#region src/runtime/cross-adapter-dedup.ts
+const BUCKET_SLACK = 1;
+const PRUNE_INTERVAL = 128;
+const TTL_MS = 15e3;
+const MAX_SIZE = 4096;
+const MAX_SEGMENTS = 16;
+const MAX_TEXT = 256;
+/**
+* 把消息段序列化为跨适配器稳定的内容指纹：
+* 文本/@/表情取内容，媒体段只取类型（url/文件名跨协议不稳定）
+*/
+const contentFingerprintOf = (event) => {
+	const parts = [];
+	for (const seg of event.message) {
+		if (parts.length >= MAX_SEGMENTS) break;
+		if (seg.type === "reply") continue;
+		const data = seg.data ?? {};
+		if (seg.type === "text") {
+			const text$1 = typeof data.text === "string" ? data.text : "";
+			parts.push(`t:${text$1.slice(0, MAX_TEXT)}`);
+		} else if (seg.type === "at") {
+			const target = data.qq ?? data.target;
+			parts.push(`a:${target == null ? "" : String(target)}`);
+		} else if (seg.type === "face") parts.push(`f:${data.id == null ? "" : String(data.id)}`);
+		else parts.push(seg.type);
+	}
+	return parts.join("|");
+};
+const scopeKeyOf = (event, content) => [
+	event.self_id ?? "",
+	event.message_type ?? "",
+	event.group_id ?? event.user_id ?? "",
+	event.user_id ?? "",
+	content
+].join("|");
+/**
+* 跨适配器消息去重（L2）
+*/
+var CrossAdapterMessageDeduplicator = class {
+	#entries = new Map();
+	#inserts = 0;
+	#dropped = 0;
+	/** 本次运行以来被丢弃的跨适配器重复消息数 */
+	get dropped() {
+		return this.#dropped;
+	}
+	isDuplicate(event) {
+		if (event.kind !== "message") return false;
+		const messageEvent = event;
+		const adapter = messageEvent.identity?.adapter ?? "";
+		const now = Date.now();
+		const bucket = Math.floor((messageEvent.time ?? now) / 1e3);
+		const key = scopeKeyOf(messageEvent, contentFingerprintOf(messageEvent));
+		const existing = this.#entries.get(key);
+		if (existing) {
+			if (Math.abs(existing.bucket - bucket) <= BUCKET_SLACK) {
+				if (existing.adapter !== adapter) {
+					this.#dropped++;
+					return true;
+				}
+				existing.bucket = bucket;
+				existing.at = now;
+				return false;
+			}
+			existing.bucket = bucket;
+			existing.at = now;
+			existing.adapter = adapter;
+			return false;
+		}
+		this.#entries.set(key, {
+			adapter,
+			bucket,
+			at: now
+		});
+		this.#inserts++;
+		if (this.#inserts >= PRUNE_INTERVAL || this.#entries.size > MAX_SIZE) {
+			this.#inserts = 0;
+			this.#prune(now);
+		}
+		return false;
+	}
+	#prune(now) {
+		for (const [key, entry] of this.#entries) if (now - entry.at > TTL_MS) this.#entries.delete(key);
+	}
+	clear() {
+		this.#entries.clear();
+	}
+};
+
 //#endregion
 //#region src/runtime/runtime.ts
 const BUILTIN_PLUGINS$1 = [...BUILTIN_PLUGINS];
@@ -4713,6 +4841,7 @@ var MiokuRuntime = class {
 	#enabledPlugins = new Map();
 	#driverFactory;
 	#builtinPlugins;
+	#crossDedup;
 	#started = false;
 	#stopped = false;
 	constructor(options) {
@@ -4729,6 +4858,7 @@ var MiokuRuntime = class {
 		});
 		this.#bots = new BotRegistry();
 		this.#capabilities = new CapabilityRegistry();
+		this.#crossDedup = options.dedup?.crossAdapter === false ? null : new CrossAdapterMessageDeduplicator();
 	}
 	get cwd() {
 		return this.#cwd;
@@ -4849,7 +4979,8 @@ var MiokuRuntime = class {
 			driver: this.#driver,
 			capabilities: this.#capabilities,
 			logger: this.#logger.child({ adapter: state.definition.name }),
-			emit: (event) => this.#emitLifecycle(event)
+			emit: (event) => this.#emitLifecycle(event),
+			crossDedup: this.#crossDedup
 		});
 	}
 	async #loadPlugin(plugin, type) {
@@ -5199,7 +5330,8 @@ const startRuntime = async (options = {}) => {
 	const runtime = createRuntime({
 		cwd,
 		logger,
-		builtinPlugins: getBuiltinPlugins()
+		builtinPlugins: getBuiltinPlugins(),
+		dedup: { crossAdapter: botConfig.dedup?.cross_adapter ?? true }
 	});
 	const pluginDir = path$1.resolve(cwd, botConfig.plugins_dir ?? "plugins");
 	logger.info(colors$1.dim("=".repeat(40)));