@koishi-ce/plugin-market 1.0.4 → 1.0.6

package/lib/index.mjs

@@ -5,14 +5,11 @@ import { compare, gt, satisfies, valid } from "semver";
 import { DataService } from "@koishi-ce/console";
 import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
-import Scanner, { resolvePackageJson } from "@koishi-ce/registry";
+import Scanner, { isResidentInCache, resolvePackageJson } from "@koishi-ce/registry";
 import spawn from "execa";
 import pMap from "p-map";
 import messageZhCN from "./assets/message.zh-CN-B_nH77kB.yml";
 import schemaZhCN from "./assets/schema.zh-CN-CLU01Lrj.yml";
-//#region \0rolldown/runtime.js
-var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
-//#endregion
 //#region src/node/deps.ts
 var DependencyProvider = class extends DataService {
 	constructor(ctx) {
@@ -284,12 +281,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,87 +1,87 @@
 {
-    "name": "@koishi-ce/plugin-market",
-    "description": "Manage your bots and plugins with console",
-    "version": "1.0.4",
-    "type": "module",
-    "main": "lib/index.mjs",
-    "typings": "lib/index.d.ts",
-    "files": [
-        "lib",
-        "dist",
-        "src"
-    ],
-    "contributors": [
-        "Shigma <shigma10826@gmail.com>",
-        "Oppenheymu <oppenheymu@gmail.com>"
-    ],
-    "license": "AGPL-3.0",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/Koishi-CE/koishi.git",
-        "directory": "plugins/webui/market"
-    },
-    "bugs": {
-        "url": "https://github.com/Koishi-CE/koishi/issues"
-    },
-    "homepage": "https://koishi.chat/plugins/console/market.html",
-    "keywords": [
-        "bot",
-        "chatbot",
-        "koishi",
-        "plugin",
-        "market",
-        "manager",
-        "server"
-    ],
-    "koishi": {
-        "public": [
-            "dist"
-        ],
-        "description": {
-            "en": "Manage your plugins with console",
-            "zh": "使用控制台安装、卸载、更新你的插件"
-        },
-        "service": {
-            "optional": [
-                "console"
-            ],
-            "implements": [
-                "installer"
-            ]
-        }
-    },
-    "peerDependencies": {
-        "@koishijs/plugin-console": "^5.30.11",
-        "koishi": "^4.18.11"
-    },
-    "peerDependenciesMeta": {
-        "@koishijs/plugin-console": {
-            "optional": true
-        }
-    },
-    "devDependencies": {
-        "@koishi-ce/client": "^1.0.1",
-        "@koishi-ce/loader": "^1.0.1",
-        "@koishi-ce/plugin-config": "^1.0.3",
-        "@koishijs/market": "^4.2.10",
-        "@types/semver": "^7.5.8",
-        "vue": "^3.5.12"
-    },
-    "dependencies": {
-        "@koishi-ce/console": "^1.0.0",
-        "@koishi-ce/registry": "^1.0.3",
-        "execa": "^5.1.1",
-        "p-map": "^4.0.0",
-        "semver": "^7.6.3",
-        "which-pm-runs": "^1.1.0"
-    },
-    "exports": {
-        ".": {
-            "source": "./src/index.ts",
-            "types": "./lib/index.d.ts",
-            "import": "./lib/index.mjs",
-            "default": "./lib/index.mjs"
-        },
-        "./package.json": "./package.json"
-    }
+	"name": "@koishi-ce/plugin-market",
+	"description": "Manage your bots and plugins with console",
+	"version": "1.0.6",
+	"type": "module",
+	"main": "lib/index.mjs",
+	"typings": "lib/index.d.ts",
+	"files": [
+		"lib",
+		"dist",
+		"src"
+	],
+	"contributors": [
+		"Shigma <shigma10826@gmail.com>",
+		"Oppenheymu <oppenheymu@gmail.com>"
+	],
+	"license": "AGPL-3.0",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/Koishi-CE/koishi.git",
+		"directory": "plugins/webui/market"
+	},
+	"bugs": {
+		"url": "https://github.com/Koishi-CE/koishi/issues"
+	},
+	"homepage": "https://koishi.chat/plugins/console/market.html",
+	"keywords": [
+		"bot",
+		"chatbot",
+		"koishi",
+		"plugin",
+		"market",
+		"manager",
+		"server"
+	],
+	"koishi": {
+		"public": [
+			"dist"
+		],
+		"description": {
+			"en": "Manage your plugins with console",
+			"zh": "使用控制台安装、卸载、更新你的插件"
+		},
+		"service": {
+			"optional": [
+				"console"
+			],
+			"implements": [
+				"installer"
+			]
+		}
+	},
+	"peerDependencies": {
+		"@koishijs/plugin-console": "^5.30.11",
+		"koishi": "^4.18.11"
+	},
+	"peerDependenciesMeta": {
+		"@koishijs/plugin-console": {
+			"optional": true
+		}
+	},
+	"devDependencies": {
+		"@koishi-ce/client": "workspace:*",
+		"@koishi-ce/loader": "workspace:*",
+		"@koishi-ce/plugin-config": "workspace:*",
+		"@koishijs/market": "^4.2.10",
+		"@types/semver": "^7.5.8",
+		"vue": "^3.5.12"
+	},
+	"dependencies": {
+		"@koishi-ce/console": "workspace:*",
+		"@koishi-ce/registry": "workspace:*",
+		"execa": "^5.1.1",
+		"p-map": "^4.0.0",
+		"semver": "^7.6.3",
+		"which-pm-runs": "^1.1.0"
+	},
+	"exports": {
+		".": {
+			"source": "./src/index.ts",
+			"types": "./lib/index.d.ts",
+			"import": "./lib/index.mjs",
+			"default": "./lib/index.mjs"
+		},
+		"./package.json": "./package.json"
+	}
 }

package/src/__tests__/index.test.ts

@@ -58,6 +58,7 @@ import type { RemotePackage } from "@koishi-ce/registry";
 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 { isResidentInCache } = await import("@koishi-ce/registry");
 const market = await import("../node/index.ts");
 const { default: Installer } = await import("../node/installer.ts");
 const mockPlugin = (await import("@koishi-ce/plugin-mock")).default;
@@ -331,6 +332,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

@@ -19,6 +19,7 @@ import type {} from "@koishi-ce/loader";
 import type {} from "@koishi-ce/plugin-market";
 import Scanner, {
 	type DependencyMetaKey,
+	isResidentInCache,
 	type PackageJson,
 	type Registry,
 	type RemotePackage,
@@ -129,8 +130,8 @@ export interface LocalPackage extends PackageJson {
 }
 
 export function loadManifest(name: string) {
-	// 经 resolvePackageJson 兜底：安装前对 `pkg/package.json` 形态的
-	// 探测会被 Bun 记入进程内负缓存，装完后主路径仍解析失败
+	// resolvePackageJson 以纯 fs 探测为主路径：市场安装流程在包落盘前的
+	// 探测不能触碰解析 API，否则触发 Bun 的父目录快照缓存（装完即失败）
 	const filename = resolvePackageJson(name);
 	const meta: LocalPackage = JSON.parse(readFileSync(filename, "utf8"));
 	meta.dependencies ||= {};
@@ -418,14 +419,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();