@koishi-ce/plugin-market 1.0.4 → 1.0.5

package/lib/index.mjs

@@ -1,9 +1,9 @@
 import { createRequire } from "node:module";
-import { join, resolve } from "node:path";
+import { dirname, join, resolve, sep } from "node:path";
 import { Logger, Schema, Service, Time, defineProperty, pick, sleep, valueMap } from "@koishi-ce/koishi";
 import { compare, gt, satisfies, valid } from "semver";
 import { DataService } from "@koishi-ce/console";
-import { readFileSync } from "node:fs";
+import { readFileSync, realpathSync } from "node:fs";
 import { homedir } from "node:os";
 import Scanner, { resolvePackageJson } from "@koishi-ce/registry";
 import spawn from "execa";
@@ -86,6 +86,32 @@ function loadManifest(name) {
 	defineProperty(meta, "$workspace", !filename.includes("node_modules"));
 	return meta;
 }
+/** 缓存键归一（win32 大小写不敏感），对齐 require.cache 键与探测路径的比对 */
+function normalizeCacheKey(path) {
+	return process.platform === "win32" ? path.toLowerCase() : path;
+}
+/**
+* 判断某依赖包是否有模块驻留在 require.cache（旧版本仍在内存）。
+*
+* 原上游实现用 require.resolve(name)（FIXME koishijs/webui#273 的报错
+* 源）：安装流程在包落盘前的探测已把该裸名记入 Bun 的进程内解析负缓
+* 存，装完后同进程内必然抛 ResolveMessage。改为经 resolvePackageJson
+* （fs 探测兜底）取包目录后扫 require.cache 前缀；任何环节失败都保守
+* 返回 true——多一次重载只是进程重启，漏判才会让旧版本代码继续驻留。
+*/
+function isResidentInCache(name) {
+	try {
+		const dir = dirname(resolvePackageJson(name));
+		const prefixes = [normalizeCacheKey(dir + sep)];
+		try {
+			const real = realpathSync(dir);
+			if (real !== dir) prefixes.push(normalizeCacheKey(real + sep));
+		} catch {}
+		return Object.keys(__require.cache).some((key) => prefixes.some((prefix) => normalizeCacheKey(key).startsWith(prefix)));
+	} catch {
+		return true;
+	}
+}
 function getVersions(versions) {
 	return Object.fromEntries(versions.map((item) => [item.version, pick(item, [
 		"peerDependencies",
@@ -284,12 +310,7 @@ var Installer = class extends Service {
 			const newDep = newDeps[name];
 			if (!local || !newDep || local.workspace) continue;
 			if (newDep.resolved === local.resolved) continue;
-			try {
-				if (!(__require.resolve(name) in __require.cache)) continue;
-			} catch (error) {
-				logger$2.error(error);
-			}
-			this.ctx.loader.fullReload();
+			if (isResidentInCache(name)) this.ctx.loader.fullReload();
 		}
 		this.refreshData();
 		return 0;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@koishi-ce/plugin-market",
     "description": "Manage your bots and plugins with console",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "type": "module",
     "main": "lib/index.mjs",
     "typings": "lib/index.d.ts",
@@ -61,8 +61,8 @@
     },
     "devDependencies": {
         "@koishi-ce/client": "^1.0.1",
-        "@koishi-ce/loader": "^1.0.1",
-        "@koishi-ce/plugin-config": "^1.0.3",
+        "@koishi-ce/loader": "^1.0.2",
+        "@koishi-ce/plugin-config": "^1.0.4",
         "@koishijs/market": "^4.2.10",
         "@types/semver": "^7.5.8",
         "vue": "^3.5.12"

package/src/__tests__/index.test.ts

@@ -59,7 +59,9 @@ const { Console } = await import("@koishi-ce/console");
 const { App, Service } = await import("@koishi-ce/koishi");
 const http = (await import("@koishi-ce/plugin-http")).default;
 const market = await import("../node/index.ts");
-const { default: Installer } = await import("../node/installer.ts");
+const { default: Installer, isResidentInCache } = await import(
+	"../node/installer.ts"
+);
 const mockPlugin = (await import("@koishi-ce/plugin-mock")).default;
 // 加载包入口占位文件（纯 re-export，无独立逻辑），保证 src 全量被加载
 await import("../index.ts");
@@ -331,6 +333,36 @@ describe("Installer 安装链路", () => {
 	});
 });
 
+describe("isResidentInCache（装后重载判定）", () => {
+	/** 在临时 node_modules 放一个已安装包，返回其目录 */
+	function placePkg(name: string) {
+		const pkgDir = join(tmp, "node_modules", name);
+		mkdirSync(pkgDir, { recursive: true });
+		writeFileSync(
+			join(pkgDir, "package.json"),
+			JSON.stringify({ name, version: "1.0.0", main: "index.js" }),
+		);
+		writeFileSync(join(pkgDir, "index.js"), "module.exports = {}");
+		return pkgDir;
+	}
+
+	it("包目录下有模块驻留 require.cache 时返回 true", () => {
+		const pkgDir = placePkg("koishi-plugin-resident-check");
+		// 入口经 require 进入 require.cache，模拟旧版本驻留内存
+		require(join(pkgDir, "index.js"));
+		expect(isResidentInCache("koishi-plugin-resident-check")).toBe(true);
+	});
+
+	it("已安装但无模块驻留内存时返回 false", () => {
+		placePkg("koishi-plugin-idle-check");
+		expect(isResidentInCache("koishi-plugin-idle-check")).toBe(false);
+	});
+
+	it("包不存在时保守返回 true（宁可多重载不漏判）", () => {
+		expect(isResidentInCache("koishi-plugin-absent-check")).toBe(true);
+	});
+});
+
 describe("registry 配置探测", () => {
 	it("无显式 endpoint 时按 npmrc / 环境变量探测", async () => {
 		// 环境变量优先：npm_config_registry 指向本地服务

package/src/node/installer.ts

@@ -1,7 +1,7 @@
-import { readFileSync } from "node:fs";
+import { readFileSync, realpathSync } from "node:fs";
 import { createRequire } from "node:module";
 import { homedir } from "node:os";
-import { join, resolve } from "node:path";
+import { dirname, join, resolve, sep } from "node:path";
 import type {} from "@koishi-ce/console";
 import {
 	type Context,
@@ -138,6 +138,37 @@ export function loadManifest(name: string) {
 	return meta;
 }
 
+/** 缓存键归一（win32 大小写不敏感），对齐 require.cache 键与探测路径的比对 */
+function normalizeCacheKey(path: string): string {
+	return process.platform === "win32" ? path.toLowerCase() : path;
+}
+
+/**
+ * 判断某依赖包是否有模块驻留在 require.cache（旧版本仍在内存）。
+ *
+ * 原上游实现用 require.resolve(name)（FIXME koishijs/webui#273 的报错
+ * 源）：安装流程在包落盘前的探测已把该裸名记入 Bun 的进程内解析负缓
+ * 存，装完后同进程内必然抛 ResolveMessage。改为经 resolvePackageJson
+ * （fs 探测兜底）取包目录后扫 require.cache 前缀；任何环节失败都保守
+ * 返回 true——多一次重载只是进程重启，漏判才会让旧版本代码继续驻留。
+ */
+export function isResidentInCache(name: string): boolean {
+	try {
+		const dir = dirname(resolvePackageJson(name));
+		const prefixes = [normalizeCacheKey(dir + sep)];
+		// 符号链接布局下缓存键可能是 realpath 形态，两种前缀都查
+		try {
+			const real = realpathSync(dir);
+			if (real !== dir) prefixes.push(normalizeCacheKey(real + sep));
+		} catch {}
+		return Object.keys(require.cache).some((key) =>
+			prefixes.some((prefix) => normalizeCacheKey(key).startsWith(prefix)),
+		);
+	} catch {
+		return true;
+	}
+}
+
 function getVersions(versions: RemotePackage[]) {
 	return Object.fromEntries(
 		versions
@@ -418,14 +449,9 @@ class Installer extends Service {
 			const newDep = newDeps[name];
 			if (!local || !newDep || local.workspace) continue;
 			if (newDep.resolved === local.resolved) continue;
-			try {
-				if (!(require.resolve(name) in require.cache)) continue;
-			} catch (error) {
-				// FIXME https://github.com/koishijs/webui/issues/273
-				// I have no idea why this happens and how to fix it.
-				logger.error(error);
-			}
-			this.ctx.loader.fullReload();
+			// 版本变化且旧版本仍驻留内存时才需要整进程重载（判定不走
+			// 解析 API，规避 Bun 负缓存，见 isResidentInCache）
+			if (isResidentInCache(name)) this.ctx.loader.fullReload();
 		}
 		this.refreshData();