mioki 0.16.0 → 0.16.2

package/dist/index.d.cts

@@ -32,7 +32,6 @@ interface ExtendedNapCat extends NapCat {
   bot_id: number;
   app_name: string;
   app_version: string;
-  name?: string;
 }
 declare const connectedBots: Map<number, ExtendedNapCat>;
 declare function start(options?: StartOptions): Promise<void>;
@@ -551,7 +550,6 @@ declare const ArchMap: Record<string, string>;
 interface BotStatus {
   uin: number;
   nickname: string;
-  name?: string;
   friends: number;
   groups: number;
   send: number;

package/dist/index.d.mts

@@ -30,7 +30,6 @@ interface ExtendedNapCat extends NapCat {
   bot_id: number;
   app_name: string;
   app_version: string;
-  name?: string;
 }
 declare const connectedBots: Map<number, ExtendedNapCat>;
 declare function start(options?: StartOptions): Promise<void>;
@@ -549,7 +548,6 @@ declare const ArchMap: Record<string, string>;
 interface BotStatus {
   uin: number;
   nickname: string;
-  name?: string;
   friends: number;
   groups: number;
   send: number;

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./chunk-BiucMVzj.mjs";
-import { t as version } from "./package-UYRX612w.mjs";
+import { t as version } from "./package-CwoAh-rX.mjs";
 import fs, { default as fs$1 } from "node:fs";
 import util from "node:util";
 import path, { default as path$1 } from "node:path";
@@ -1408,11 +1408,10 @@ async function enablePlugin(bots, plugin, type = "external") {
 							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 (isMessageEvent(e)) {
+								const senderUserId = e.user_id;
+								if (senderUserId && bots.some((b) => b.bot_id === senderUserId)) return;
+							}
 							if (deduplicate && isDeduplicableEvent(e)) {
 								if (deduplicator.isProcessed(e, dedupeScope)) return;
 								deduplicator.markProcessed(e, dedupeScope);
@@ -1526,7 +1525,6 @@ async function getMiokiStatus(bots) {
 		botStatuses.push({
 			uin: bot.bot_id,
 			nickname: bot.nickname,
-			name: bot.name,
 			friends: friendList.length,
 			groups: groupList.length,
 			send: bot.stat.send.group + bot.stat.send.private,
@@ -1538,7 +1536,6 @@ async function getMiokiStatus(bots) {
 		botStatuses.push({
 			uin: bot.bot_id,
 			nickname: bot.nickname,
-			name: bot.name,
 			friends: 0,
 			groups: 0,
 			send: 0,
@@ -1593,13 +1590,14 @@ async function formatMiokiStatus(status) {
 	const { bots, plugins, stats, system, disk, cpu, memory, versions } = status;
 	const diskValid = disk.total > 0 && disk.free >= 0;
 	const diskDesc = `${disk.percent}%-${filesize(disk.used, { round: 1 })}/${filesize(disk.total, { round: 1 })}`;
+	const botLines = bots.map((bot) => {
+		return `👤 ${bot.nickname} (${bot.uin})\n   📋 ${localNum(bot.friends)} 好友 / ${localNum(bot.groups)} 群 / 📮 收 ${localNum(bot.receive)} 发 ${localNum(bot.send)}`;
+	}).join("\n");
+	const statsLine = bots.length > 1 ? `\n📮 总计: 收 ${localNum(stats.receive)} 条，发 ${localNum(stats.send)} 条` : "";
 	return `
 〓 🟢 mioki 状态 〓
-${bots.map((bot, index) => {
-		return `👤 ${bot.name ? `[${bot.name}] ` : ""}${bot.nickname} (${bot.uin})\n   📋 ${localNum(bot.friends)} 好友 / ${localNum(bot.groups)} 群 / 📮 收 ${localNum(bot.receive)} 发 ${localNum(bot.send)}`;
-	}).join("\n")}
-🧩 启用了 ${localNum(plugins.enabled)} 个插件，共 ${localNum(plugins.total)} 个
-📮 总计: 收 ${localNum(stats.receive)} 条，发 ${localNum(stats.send)} 条
+${botLines}
+🧩 启用了 ${localNum(plugins.enabled)} 个插件，共 ${localNum(plugins.total)} 个${statsLine}
 🚀 ${filesize(memory.rss.used, { round: 1 })}/${memory.percent}%
 ⏳ 已运行 ${prettyMs(stats.uptime, {
 		hideYear: true,
@@ -1939,8 +1937,8 @@ const BUILTIN_PLUGINS = [core_default];
 //#region src/start.ts
 const connectedBots = /* @__PURE__ */ new Map();
 async function connectBot(config, index) {
-	const { protocol = "ws", port = 3001, host = "localhost", token = "", name } = config;
-	const botName = name || `Bot${index + 1}`;
+	const { protocol = "ws", port = 3001, host = "localhost", token = "" } = config;
+	const botName = `Bot${index + 1}`;
 	const wsUrl = colors$1.green(`${protocol}://${host}:${port}${token ? "?access_token=***" : ""}`);
 	logger.info(`>>> 正在连接 ${colors$1.cyan(botName)}: ${wsUrl}`);
 	const napcat = new NapCat({
@@ -1960,8 +1958,7 @@ async function connectBot(config, index) {
 		napcat.once("napcat.connected", ({ user_id, nickname, app_name, app_version }) => {
 			logger.info(`已连接到 ${colors$1.cyan(botName)}: ${colors$1.green(`${app_name}-v${app_version} ${nickname}(${user_id})`)}`);
 			if (connectedBots.has(user_id)) {
-				const existingBot = connectedBots.get(user_id);
-				if (existingBot.name) logger.warn(`${colors$1.yellow(botName)} (${user_id}) 与 ${colors$1.yellow(existingBot.name)} (${user_id}) QQ 号重复，将跳过`);
+				logger.warn(`${colors$1.yellow(botName)} (${user_id}) 与已存在的 bot (${user_id}) QQ 号重复，将跳过`);
 				napcat.close();
 				resolve(null);
 				return;
@@ -1970,7 +1967,6 @@ async function connectBot(config, index) {
 			extendedNapCat.bot_id = user_id;
 			extendedNapCat.app_name = app_name;
 			extendedNapCat.app_version = app_version;
-			extendedNapCat.name = botName;
 			resolve(extendedNapCat);
 		});
 		napcat.run().catch((err) => {
@@ -2077,10 +2073,10 @@ async function start(options = {}) {
 	}
 	const seenEndpoints = /* @__PURE__ */ new Set();
 	const duplicateConfigs = [];
-	for (const config of napcatConfigs) {
-		const { protocol = "ws", host = "localhost", port = 3001 } = config;
+	for (let i = 0; i < napcatConfigs.length; i++) {
+		const { protocol = "ws", host = "localhost", port = 3001 } = napcatConfigs[i];
 		const endpoint = `${protocol}://${host}:${port}`;
-		if (seenEndpoints.has(endpoint)) duplicateConfigs.push(`${config.name || "未命名"} (${endpoint})`);
+		if (seenEndpoints.has(endpoint)) duplicateConfigs.push(`Bot${i + 1} (${endpoint})`);
 		else seenEndpoints.add(endpoint);
 	}
 	if (duplicateConfigs.length > 0) {
@@ -2098,7 +2094,7 @@ async function start(options = {}) {
 	}
 	for (const bot of bots) connectedBots.set(bot.bot_id, bot);
 	if (bots.length < napcatConfigs.length) logger.warn(`${colors$1.yellow(napcatConfigs.length - bots.length)} 个 NapCat 实例连接失败`);
-	const botNames = bots.map((b) => `${b.name}(${b.bot_id})`).join(", ");
+	const botNames = bots.map((b) => `${b.bot_id}`).join(", ");
 	logger.info(colors$1.green(`成功连接 ${bots.length} 个实例: ${botNames}`));
 	logger.info(colors$1.dim("=".repeat(40)));
 	const mainBot = bots[0];