mioku 1.2.0 → 1.2.1

package/dist/index.js

@@ -1,4 +1,4 @@
-import { buildSpawnPlan, commandExists, resolveCommand, runCommand, runCommandInherit, version } from "./exec-JBR-IZk0.js";
+import { buildSpawnPlan, commandExists, compareVersions, pickHighestVersion, resolveCommand, runCommand, runCommandInherit, version } from "./exec-CBlGXt5y.js";
 import { createRequire } from "node:module";
 import * as fs$5 from "node:fs";
 import * as fs$4 from "node:fs";
@@ -3770,28 +3770,36 @@ function getInstalledVersion(pkgName) {
 	const pkg = readPackageJson$1(path$6.join(projectRoot(), "node_modules", pkgName));
 	return String(pkg?.version || "0.0.0");
 }
-function listInstalledPackages() {
-	const modulesPath = path$6.join(projectRoot(), "node_modules");
+/** 项目 package.json 声明的 mioku 依赖，不含被 hoist 上来的传递依赖 */
+function listDeclaredPackages() {
+	const pkg = readPackageJson$1(projectRoot());
+	if (!pkg) return [];
+	const deps = {
+		...pkg.dependencies ?? {},
+		...pkg.devDependencies ?? {},
+		...pkg.optionalDependencies ?? {}
+	};
 	const result = [];
-	if (!fs$5.existsSync(modulesPath)) return result;
-	const entries = fs$5.readdirSync(modulesPath, { withFileTypes: true });
-	for (const entry of entries) {
-		const type = detectType(entry.name);
+	for (const name of Object.keys(deps)) {
+		const type = detectType(name);
 		if (!type) continue;
-		const fullPath = path$6.join(modulesPath, entry.name);
-		const stat = fs$5.lstatSync(fullPath);
-		if (!stat.isDirectory() && !stat.isSymbolicLink()) continue;
-		const pkg = readPackageJson$1(fullPath);
+		const fullPath = path$6.join(projectRoot(), "node_modules", name);
+		const installed = readPackageJson$1(fullPath);
+		if (!installed) continue;
 		result.push({
-			name: entry.name,
+			name,
 			type,
-			shortName: shortNameOf(entry.name),
-			version: String(pkg?.version || "0.0.0"),
+			shortName: shortNameOf(name),
+			version: String(installed.version || "0.0.0"),
 			path: fullPath
 		});
 	}
 	return result.sort((a, b) => a.name.localeCompare(b.name));
 }
+/** .update all 的作用范围：声明的插件与服务，不含框架与传递依赖 */
+function listManagedPackages() {
+	return listDeclaredPackages().filter((pkg) => pkg.type !== "framework");
+}
 async function fetchJson(url) {
 	const res = await fetch(url, { headers: {
 		Accept: "application/json",
@@ -3803,8 +3811,13 @@ async function fetchJson(url) {
 async function fetchNpmMeta(pkgName) {
 	try {
 		const data = await fetchJson(`${NPM_REGISTRY}/${encodeURIComponent(pkgName)}`);
-		const latest = String(data?.["dist-tags"]?.latest || "").trim();
-		const version$2 = latest ? data?.versions?.[latest] || {} : {};
+		const versions = Object.keys(data?.versions ?? {});
+		const distTag = String(data?.["dist-tags"]?.latest || "").trim();
+		const staleTag = distTag !== "" && !versions.includes(distTag);
+		const latest = staleTag ? pickHighestVersion(versions) ?? distTag : distTag || (pickHighestVersion(versions) ?? "");
+		if (!latest) return null;
+		if (staleTag) rootLogger.debug(`[core] ${pkgName} 的 latest 标签 ${distTag} 不存在，改用 ${latest}`);
+		const version$2 = data?.versions?.[latest] || {};
 		const repository = version$2?.repository || data?.repository;
 		let repoUrl = "";
 		if (typeof repository === "string") repoUrl = repository;
@@ -3812,6 +3825,8 @@ async function fetchNpmMeta(pkgName) {
 		repoUrl = repoUrl.replace(/^git\+/, "").replace(/\.git$/, "");
 		return {
 			latest,
+			distTag,
+			staleTag,
 			description: String(version$2?.description || data?.description || "").trim(),
 			keywords: Array.isArray(version$2?.keywords) ? version$2.keywords : [],
 			homepage: String(version$2?.homepage || data?.homepage || "").trim(),
@@ -3824,7 +3839,7 @@ async function fetchNpmMeta(pkgName) {
 	}
 }
 async function checkUpdates() {
-	const installed = listInstalledPackages();
+	const installed = listDeclaredPackages();
 	const metas = await Promise.all(installed.map(async (pkg) => {
 		const meta = await fetchNpmMeta(pkg.name);
 		return {
@@ -3835,7 +3850,7 @@ async function checkUpdates() {
 	const updates = [];
 	for (const { pkg, meta } of metas) {
 		if (!meta || !meta.latest) continue;
-		if (meta.latest === pkg.version) continue;
+		if (compareVersions(meta.latest, pkg.version) <= 0) continue;
 		updates.push({
 			name: pkg.name,
 			type: pkg.type,
@@ -3846,53 +3861,72 @@ async function checkUpdates() {
 	}
 	return updates;
 }
+/** 取 bun 输出里最有用的一行：优先 error: 行，去掉颜色与前缀，超长截断 */
+function errorSummary(text$1) {
+	const lines = String(text$1 ?? "").replace(/\u001b\[[0-9;]*m/g, "").split("\n").map((line$1) => line$1.trim()).filter(Boolean);
+	const line = (lines.find((item) => /^error:/i.test(item)) ?? lines[0] ?? "更新失败").replace(/^error:\s*/i, "");
+	return line.length > 160 ? `${line.slice(0, 157)}...` : line;
+}
 function snapshotVersions(names) {
 	const map = new Map();
 	for (const name of names) map.set(name, getInstalledVersion(name));
 	return map;
 }
+function outcomeOf(name, before, ok = true, error) {
+	const prev = before.get(name) ?? "0.0.0";
+	const after = getInstalledVersion(name);
+	return {
+		name,
+		ok,
+		before: prev,
+		after,
+		changed: prev !== after,
+		error
+	};
+}
+/** latest 标签不可解析时，改用 npm 上真实存在的最高版本 */
+async function updateWithPinnedVersion(name) {
+	const meta = await fetchNpmMeta(name);
+	const target = meta?.latest ?? "";
+	if (!target) return false;
+	if (compareVersions(target, getInstalledVersion(name)) <= 0) return true;
+	rootLogger.info(`[core] ${name} 的 latest 标签不可用，改用 ${target} 更新`);
+	const result = await runBun(["update", `${name}@${target}`]);
+	return result.code === 0;
+}
+async function updateOne(name, before) {
+	const single = await runBun([
+		"update",
+		name,
+		"--latest"
+	]);
+	if (single.code === 0) return outcomeOf(name, before);
+	if (await updateWithPinnedVersion(name)) return outcomeOf(name, before);
+	return outcomeOf(name, before, false, errorSummary(single.stderr || single.stdout));
+}
 async function updatePackages(names) {
 	if (names.length === 0) return {
-		code: 0,
-		stdout: "",
-		stderr: ""
+		outcomes: [],
+		failures: []
 	};
-	return runBun([
+	const before = snapshotVersions(names);
+	const batch = await runBun([
 		"update",
 		...names,
 		"--latest"
 	]);
-}
-async function updateAllManaged() {
-	const managed = listInstalledPackages().filter((pkg) => pkg.type !== "framework").map((pkg) => pkg.name);
-	if (managed.length === 0) return {
-		result: {
-			code: 0,
-			stdout: "",
-			stderr: ""
-		},
-		names: []
+	if (batch.code === 0) return {
+		outcomes: names.map((name) => outcomeOf(name, before)),
+		failures: []
 	};
+	rootLogger.warn(`[core] 批量更新失败，改为逐个更新: ${errorSummary(batch.stderr || batch.stdout)}`);
+	const outcomes = [];
+	for (const name of names) outcomes.push(await updateOne(name, before));
 	return {
-		result: await updatePackages(managed),
-		names: managed
+		outcomes,
+		failures: outcomes.filter((outcome) => !outcome.ok)
 	};
 }
-function diffVersions(names, before) {
-	return names.map((name) => {
-		const after = getInstalledVersion(name);
-		const prev = before.get(name) || "0.0.0";
-		return {
-			name,
-			before: prev,
-			after,
-			changed: prev !== after
-		};
-	});
-}
-function snapshotAll(names) {
-	return snapshotVersions(names);
-}
 function appendToMiokuPlugins(pkgName) {
 	if (!pkgName.startsWith(PLUGIN_PREFIX)) return false;
 	const shortName = pkgName.slice(PLUGIN_PREFIX.length);
@@ -4257,24 +4291,27 @@ async function performUpdateAndReport(ctx, event, names) {
 		await replyText(event, "没有需要更新的项。");
 		return;
 	}
-	const before = snapshotAll(names);
 	await replyText(event, `正在更新 ${names.length} 个包，请稍候...`);
-	const result = await updatePackages(names);
-	if (result.code !== 0) {
-		ctx.logger.error(`[core] 更新失败: ${result.stderr || result.stdout}`);
-		await replyText(event, `更新失败：${result.stderr || result.stdout}`);
+	const report = await updatePackages(names);
+	const changed = report.outcomes.filter((item) => item.changed);
+	const failures = report.failures;
+	ctx.logger.info(`[core] 更新结束：升级 ${changed.length} 个，失败 ${failures.length} 个`);
+	if (failures.length > 0) ctx.logger.error(`[core] 更新失败: ${failures.map((item) => `${item.name}(${item.error})`).join("; ")}`);
+	if (changed.length === 0 && failures.length === 0) {
+		await replyText(event, "更新完成，所有包均已是最新版本");
 		return;
 	}
-	const diffs = diffVersions(names, before);
-	const changed = diffs.filter((d) => d.changed);
-	const unchanged = diffs.filter((d) => !d.changed);
+	const parts = [];
+	if (changed.length > 0) {
+		parts.push(`更新完成，共 ${changed.length} 个包已升级：`, ...changed.map((item) => `• ${item.name}: ${item.before} → ${item.after}`));
+		const unchanged = report.outcomes.length - changed.length - failures.length;
+		if (unchanged > 0) parts.push("", `另有 ${unchanged} 个包已是最新`);
+	}
+	if (failures.length > 0) parts.push("", `以下 ${failures.length} 个包未能更新：`, ...failures.map((item) => `• ${item.name}: ${item.error}`), "", "通常是 npm 上的版本信息尚未同步，可稍后重试");
 	if (changed.length === 0) {
-		await replyText(event, "更新完成，所有包均已是最新版本");
+		await replyText(event, parts.join("\n"));
 		return;
 	}
-	const lines = changed.map((d) => `• ${d.name}: ${d.before} → ${d.after}`);
-	const parts = [`更新完成，共 ${changed.length} 个包已升级：`, ...lines];
-	if (unchanged.length > 0) parts.push("", `另有 ${unchanged.length} 个包已是最新`);
 	parts.push("", "即将重启...");
 	await replyText(event, parts.join("\n"));
 	const selfId = String(event?.self_id ?? "");
@@ -4303,12 +4340,12 @@ function registerUpdateCommands(ctx) {
 			const bot = event.bot;
 			if (!bot) return;
 			if (arg === "all") {
-				const managed = await updateAllManaged();
-				if (managed.names.length === 0) {
+				const managed = listManagedPackages();
+				if (managed.length === 0) {
 					await replyText(event, "未找到可更新的 mioku 包");
 					return;
 				}
-				await performUpdateAndReport(ctx, event, managed.names);
+				await performUpdateAndReport(ctx, event, managed.map((item) => item.name));
 				return;
 			}
 			if (arg === "mioku" || arg === "self") {
@@ -4713,18 +4750,20 @@ function startAutoUpdateScheduler(enabled, time, frequency) {
 		running = true;
 		try {
 			rootLogger.info("[core] 自动更新开始...");
-			const allInstalled = listInstalledPackages();
+			const allInstalled = listDeclaredPackages();
 			const names = allInstalled.map((pkg) => pkg.name);
 			if (names.length === 0) {
 				rootLogger.info("[core] 未找到需要更新的包");
 				return;
 			}
-			const result = await updatePackages(names);
-			if (result.code !== 0) {
-				rootLogger.error(`[core] 自动更新失败: ${result.stderr || result.stdout}`);
+			const report = await updatePackages(names);
+			const changed = report.outcomes.filter((item) => item.changed);
+			if (report.failures.length > 0) rootLogger.error(`[core] 自动更新失败: ${report.failures.map((item) => `${item.name}(${item.error})`).join("; ")}`);
+			if (changed.length === 0) {
+				rootLogger.info("[core] 自动更新结束，没有包需要升级");
 				return;
 			}
-			rootLogger.info("[core] 自动更新成功，准备重启...");
+			rootLogger.info(`[core] 自动更新成功，升级 ${changed.length} 个包，准备重启...`);
 			const marker = {
 				initiatedAt: Date.now(),
 				selfId: "",