mioku 1.0.9 → 1.0.11

package/dist/index.js

@@ -1,4 +1,4 @@
-import { buildSpawnPlan, commandExists, resolveCommand, runCommand, runCommandInherit, version } from "./exec-C3QTbHLt.js";
+import { buildSpawnPlan, commandExists, resolveCommand, runCommand, runCommandInherit, version } from "./exec-CqUKSOV5.js";
 import { createRequire } from "node:module";
 import * as fs$5 from "node:fs";
 import * as fs$4 from "node:fs";
@@ -4107,17 +4107,19 @@ function triggerRestart(marker) {
 function formatUptime(ms) {
 	return formatDuration(ms);
 }
-async function waitForBot(timeoutMs = 6e4) {
+async function waitForBot(timeoutMs = 6e4, adapter, botId) {
 	const deadline = Date.now() + timeoutMs;
 	while (Date.now() < deadline) {
 		const bots = Array.from(connectedBots.values());
-		if (bots.length > 0) return bots[0];
+		const matched = bots.find((bot) => (adapter ? bot.adapter === adapter : true) && (botId ? String(bot.bot_id) === botId : true));
+		if (matched) return matched;
+		if (!adapter && !botId && bots.length > 0) return bots[0];
 		await new Promise((resolve) => setTimeout(resolve, 2e3));
 	}
 	return null;
 }
 async function notifyRestartComplete(ctx, marker) {
-	const bot = await waitForBot();
+	const bot = await waitForBot(6e4, marker.adapter, marker.selfId);
 	if (!bot) {
 		rootLogger.warn("[core] 重启完成但未等到 bot 上线，跳过通知");
 		return;
@@ -4150,9 +4152,10 @@ function getPendingMap() {
 	return state[RUNTIME_KEY];
 }
 function conversationKey(event) {
-	const selfId = Number(event?.self_id || 0);
-	if (event?.message_type === "group" && event?.group_id) return `${selfId}:g:${event.group_id}`;
-	return `${selfId}:p:${event?.user_id || 0}`;
+	const selfId = String(event?.self_id ?? "");
+	const adapter = String(event?.bot?.adapter ?? "");
+	if (event?.message_type === "group" && event?.group_id) return `${adapter}:${selfId}:g:${String(event.group_id)}`;
+	return `${adapter}:${selfId}:p:${String(event?.user_id ?? "")}`;
 }
 function typeLabel$1(type) {
 	if (type === "plugin") return "plugin";
@@ -4213,14 +4216,15 @@ async function performUpdateAndReport(ctx, event, names) {
 	if (unchanged.length > 0) parts.push("", `另有 ${unchanged.length} 个包已是最新`);
 	parts.push("", "即将重启...");
 	await replyText(event, parts.join("\n"));
-	const selfId = Number(event?.self_id || 0);
-	const groupId = event?.message_type === "group" && event?.group_id ? Number(event.group_id) : null;
-	const userId = Number(event?.user_id || 0);
+	const selfId = String(event?.self_id ?? "");
+	const groupId = event?.message_type === "group" && event?.group_id ? String(event.group_id) : null;
+	const userId = String(event?.user_id ?? "");
 	const marker = {
 		initiatedAt: Date.now(),
 		selfId,
 		groupId,
-		userId
+		userId,
+		adapter: event?.bot?.adapter
 	};
 	triggerRestart(marker);
 }
@@ -4477,16 +4481,17 @@ function registerRestartCommand(ctx) {
 		priority: -1e3,
 		description: "重启机器人进程",
 		handler: async ({ event }) => {
-			if (event?.user_id === event?.self_id) return;
+			if (String(event?.user_id ?? "") === String(event?.self_id ?? "")) return;
 			const uptimeMs = process.uptime() * 1e3;
-			const selfId = Number(event?.self_id || 0);
-			const groupId = event?.message_type === "group" && event?.group_id ? Number(event.group_id) : null;
-			const userId = Number(event?.user_id || 0);
+			const selfId = String(event?.self_id ?? "");
+			const groupId = event?.message_type === "group" && event?.group_id ? String(event.group_id) : null;
+			const userId = String(event?.user_id ?? "");
 			const marker = {
 				initiatedAt: Date.now(),
 				selfId,
 				groupId,
-				userId
+				userId,
+				adapter: event?.bot?.adapter
 			};
 			try {
 				await replyText(event, `Bot已运行${formatUptime(uptimeMs)}，正在重启...`);
@@ -4661,9 +4666,9 @@ function startAutoUpdateScheduler(enabled, time, frequency) {
 			rootLogger.info("[core] 自动更新成功，准备重启...");
 			const marker = {
 				initiatedAt: Date.now(),
-				selfId: 0,
+				selfId: "",
 				groupId: null,
-				userId: 0
+				userId: ""
 			};
 			triggerRestart(marker);
 		} catch (error) {