@koishi-ce/plugin-market 1.0.12 → 1.0.14

package/lib/index.d.ts

@@ -45,6 +45,20 @@ declare class Installer extends Service {
   exec(args: string[]): Promise<number>;
   override(deps: Dict<string | null>): Promise<void>;
   private _install;
+  /**
+   * 安装完整性校验:从本次安装的包出发递归纯 fs 探测依赖可达性,返回
+   * 「包: 缺失依赖」描述列表。背景是 Bun isolated 布局的增量安装缺陷
+   * (2026-09-07 实证):升级插件时包目录 hash 变化,而其依赖的解析
+   * 结果未变,bun 的增量安装跳过新包目录内的依赖链接建立——插件入口
+   * (顶层 symlink)可加载,内部依赖的 require 却炸 MODULE_NOT_FOUND;
+   * 此时补跑一次普通 bun install,bun 按磁盘实际状态检测到包不完整
+   * 即重建链接(秒级)。全程只走 existsSync / readFileSync /
+   * realpathSync,不触碰解析 API(防父目录快照缓存,与
+   * resolvePackageJson 同一纪律)。peer / optional 依赖由宿主或按需
+   * 提供不入校验;workspace / alias 等非 semver 声明的落盘名与键名无
+   * 直接映射,同样跳过。
+   */
+  private _findMissingDeps;
   private _getLocalDeps;
   install(deps: Dict<string | null>, forced?: boolean): Promise<number>;
   static Config: Schema<Installer.Config>;
@@ -113,6 +127,10 @@ declare class MarketProvider$1 extends MarketProvider {
    * 服务端瞬态错误（408 / 5xx）可安全重试；allowNotFound 时把 404
    * 也视为瞬态——镜像索引以「302 指向版本化文件」方式发布，切换文件
    * 的部署窗口会出现短时 404。
+   *
+   * 无 code 且无 response 的 HTTP.Error 是 plugin-http 对 fetch 网络层
+   * 异常（证书验证失败、连接重置、DNS 等）的统一包装——代理节点切换
+   * 等瞬态网络抖动即此形态，重试可自愈。
    */
   private isRetryable;
   /**

package/lib/index.mjs

@@ -1,8 +1,8 @@
-import { join, resolve } from "node:path";
+import { dirname, join, resolve } 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 { existsSync, readFileSync, realpathSync } from "node:fs";
 import { homedir } from "node:os";
 import Scanner, { isResidentInCache, mapLimit, resolvePackageJson } from "@koishi-ce/registry";
 import { spawn } from "node:child_process";
@@ -62,6 +62,26 @@ const logger$2 = new Logger("market");
 function isGuardedRequest(request) {
 	return request?.startsWith("workspace:") === true || request?.startsWith("npm:@koishi-ce") === true;
 }
+/**
+* 从 fromDir 沿 node_modules 链纯 fs 探测依赖包,命中返回其真实目录。
+* realpath 化是 isolated 布局的关键:顶层条目是 symlink,包的依赖链接
+* 挂在 .bun 真实目录的同级 node_modules,从链接路径向上爬会错误地查
+* 顶层(isolated 不提升传递依赖)。
+*/
+function probePackage(fromDir, name) {
+	let dir = resolve(fromDir);
+	for (;;) {
+		const manifestPath = join(dir, "node_modules", name, "package.json");
+		if (existsSync(manifestPath)) try {
+			return dirname(realpathSync(manifestPath));
+		} catch {
+			return;
+		}
+		const parent = dirname(dir);
+		if (parent === dir) return void 0;
+		dir = parent;
+	}
+}
 /** 从单个 .npmrc 文件提取 registry 配置项；文件不存在或读取出错一律视为未配置 */
 function readNpmrcRegistry(file) {
 	try {
@@ -244,6 +264,50 @@ var Installer = class extends Service {
 		if (this.endpoint) args.push("--registry", this.endpoint);
 		return this.exec(args);
 	}
+	/**
+	* 安装完整性校验:从本次安装的包出发递归纯 fs 探测依赖可达性,返回
+	* 「包: 缺失依赖」描述列表。背景是 Bun isolated 布局的增量安装缺陷
+	* (2026-09-07 实证):升级插件时包目录 hash 变化,而其依赖的解析
+	* 结果未变,bun 的增量安装跳过新包目录内的依赖链接建立——插件入口
+	* (顶层 symlink)可加载,内部依赖的 require 却炸 MODULE_NOT_FOUND;
+	* 此时补跑一次普通 bun install,bun 按磁盘实际状态检测到包不完整
+	* 即重建链接(秒级)。全程只走 existsSync / readFileSync /
+	* realpathSync,不触碰解析 API(防父目录快照缓存,与
+	* resolvePackageJson 同一纪律)。peer / optional 依赖由宿主或按需
+	* 提供不入校验;workspace / alias 等非 semver 声明的落盘名与键名无
+	* 直接映射,同样跳过。
+	*/
+	_findMissingDeps(deps) {
+		const problems = [];
+		const visited = /* @__PURE__ */ new Set();
+		const walk = (dir, label) => {
+			if (visited.has(dir)) return;
+			visited.add(dir);
+			let manifest;
+			try {
+				manifest = JSON.parse(readFileSync(join(dir, "package.json"), "utf8"));
+			} catch {
+				return;
+			}
+			for (const [dep, request] of Object.entries(manifest.dependencies ?? {})) {
+				if (request.includes(":")) continue;
+				const depDir = probePackage(dir, dep);
+				if (!depDir) {
+					problems.push(`${label} 的依赖 ${dep} 未被链接`);
+					continue;
+				}
+				walk(depDir, `${label} → ${dep}`);
+			}
+		};
+		for (const name in deps) {
+			const request = deps[name];
+			if (!request || request.includes(":")) continue;
+			const dir = probePackage(this.cwd, name);
+			if (!dir) continue;
+			walk(dir, name);
+		}
+		return problems;
+	}
 	_getLocalDeps(override) {
 		return valueMap(override, (request, name) => {
 			const dep = { request };
@@ -269,6 +333,13 @@ var Installer = class extends Service {
 		if (shouldInstall) {
 			const code = await this._install();
 			if (code) return code;
+			const missing = this._findMissingDeps(deps);
+			if (missing.length) {
+				logger$2.warn(`检测到增量安装未建立部分依赖链接(isolated 布局已知缺陷),正在补装: ${missing.join("; ")}`);
+				const retry = await this._install();
+				if (retry) return retry;
+				if (this._findMissingDeps(deps).length) logger$2.warn("自动补装后依赖链接仍不完整,请在项目根目录运行 bun install --force 并重启 koishi");
+			}
 		}
 		this.refresh();
 		const newDeps = await this.getDeps();
@@ -359,10 +430,14 @@ var MarketProvider$1 = class extends MarketProvider {
 	* 服务端瞬态错误（408 / 5xx）可安全重试；allowNotFound 时把 404
 	* 也视为瞬态——镜像索引以「302 指向版本化文件」方式发布，切换文件
 	* 的部署窗口会出现短时 404。
+	*
+	* 无 code 且无 response 的 HTTP.Error 是 plugin-http 对 fetch 网络层
+	* 异常（证书验证失败、连接重置、DNS 等）的统一包装——代理节点切换
+	* 等瞬态网络抖动即此形态，重试可自愈。
 	*/
 	isRetryable(error, allowNotFound = false) {
 		if (!this.ctx.http.isError(error)) return false;
-		if (!error.response) return error.code === "ETIMEDOUT";
+		if (!error.response) return error.code === void 0 || error.code === "ETIMEDOUT";
 		const { status } = error.response;
 		return status === 429 || status === 408 || allowNotFound && status === 404 || status !== void 0 && status >= 500;
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@koishi-ce/plugin-market",
     "description": "Manage your bots and plugins with console",
-    "version": "1.0.12",
+    "version": "1.0.14",
     "type": "module",
     "main": "lib/index.mjs",
     "typings": "lib/index.d.ts",
@@ -60,9 +60,10 @@
         }
     },
     "devDependencies": {
-        "@koishi-ce/client": "^1.1.0",
-        "@koishi-ce/loader": "^1.0.6",
-        "@koishi-ce/plugin-config": "^1.1.0",
+        "@koishi-ce/plugin-database-memory": "^1.1.0",
+        "@koishi-ce/client": "^1.2.3",
+        "@koishi-ce/loader": "^1.0.8",
+        "@koishi-ce/plugin-config": "^1.1.2",
         "@koishijs/market": "^4.2.10",
         "@types/semver": "^7.5.8",
         "@vueuse/core": "^14.4.0",

package/src/__tests__/index.test.ts

@@ -16,9 +16,10 @@ import {
 	rmSync,
 	writeFileSync,
 } from "node:fs";
+import net from "node:net";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import memory from "@koishijs/plugin-database-memory";
+import memory from "@koishi-ce/plugin-database-memory";
 
 /**
  * market 插件测试：
@@ -297,8 +298,7 @@ type TestApp = InstanceType<typeof App>;
 
 const app = new App();
 
-// 同 admin：CJS 实现配 ESM 声明，nodenext 互操作视图多包一层 default，类型层穿透取真实类
-app.plugin(memory as unknown as typeof memory.default);
+app.plugin(memory);
 app.plugin(http);
 // Console 基类的 static inject 是 cordis 3 旧形态，与 Plugin.Constructor 期待类型不兼容，仅做类型层转型
 app.plugin(
@@ -493,6 +493,108 @@ describe("Installer 安装链路", () => {
 		expect(code).toBe(-1);
 	});
 
+	/** 在临时 node_modules 落盘一个带 dependencies 声明的校验用包 */
+	function placeLinkcheckPkg(
+		dependencies: Record<string, string>,
+	) {
+		const name = "koishi-plugin-linkcheck";
+		const pkgDir = join(tmp, "node_modules", name);
+		mkdirSync(pkgDir, { recursive: true });
+		writeFileSync(
+			join(pkgDir, "package.json"),
+			JSON.stringify({
+				name,
+				version: "1.0.0",
+				dependencies,
+			}),
+		);
+		return pkgDir;
+	}
+
+	itQuiet(
+		"装后依赖链接完整时不触发补装",
+		async () => {
+			nextExitCode = 0;
+			spawnCalls.length = 0;
+			const pkgDir = placeLinkcheckPkg({
+				"linkcheck-dep": "^1.0.0",
+			});
+			const depDir = join(
+				tmp,
+				"node_modules",
+				"linkcheck-dep",
+			);
+			mkdirSync(depDir, { recursive: true });
+			writeFileSync(
+				join(depDir, "package.json"),
+				JSON.stringify({
+					name: "linkcheck-dep",
+					version: "1.0.0",
+				}),
+			);
+			try {
+				const code = await app.installer.install(
+					{ "koishi-plugin-linkcheck": "^1.0.0" },
+					true,
+				);
+				expect(code).toBe(0);
+				expect(spawnCalls.length).toBe(1);
+			} finally {
+				rmSync(pkgDir, { recursive: true, force: true });
+				rmSync(depDir, { recursive: true, force: true });
+			}
+		},
+		15000,
+	);
+
+	itQuiet(
+		"包级依赖链接缺失时自动补装一次且不无限重试",
+		async () => {
+			nextExitCode = 0;
+			spawnCalls.length = 0;
+			// isolated 增量安装缺陷形态:包已落盘但声明的依赖未链接。
+			// 首装后校验命中补装一次;mock 安装不会真落盘依赖,二次校验
+			// 仍缺,只告警不再补装——总计恰好两次子进程调用
+			const pkgDir = placeLinkcheckPkg({
+				"linkcheck-missing": "^1.0.0",
+			});
+			try {
+				const code = await app.installer.install(
+					{ "koishi-plugin-linkcheck": "^1.0.0" },
+					true,
+				);
+				expect(code).toBe(0);
+				expect(spawnCalls.length).toBe(2);
+			} finally {
+				rmSync(pkgDir, { recursive: true, force: true });
+			}
+		},
+		15000,
+	);
+
+	itQuiet(
+		"alias 声明的依赖跳过链接校验",
+		async () => {
+			nextExitCode = 0;
+			spawnCalls.length = 0;
+			// alias 落盘名与键名无直接映射,不入校验,缺失也不触发补装
+			const pkgDir = placeLinkcheckPkg({
+				"linkcheck-alias": "npm:whatever@^1.0.0",
+			});
+			try {
+				const code = await app.installer.install(
+					{ "koishi-plugin-linkcheck": "^1.0.0" },
+					true,
+				);
+				expect(code).toBe(0);
+				expect(spawnCalls.length).toBe(1);
+			} finally {
+				rmSync(pkgDir, { recursive: true, force: true });
+			}
+		},
+		15000,
+	);
+
 	itQuiet(
 		"exec 收集子进程 stdout / stderr 输出行",
 		async () => {
@@ -1014,9 +1116,7 @@ describe("镜像索引瞬态重试", () => {
 		timeout?: number;
 	}) {
 		const mirror = new App();
-		mirror.plugin(
-			memory as unknown as typeof memory.default,
-		);
+		mirror.plugin(memory);
 		mirror.plugin(http);
 		mirror.plugin(
 			FakeConsole as unknown as Plugin.Constructor<TestApp>,
@@ -1072,4 +1172,71 @@ describe("镜像索引瞬态重试", () => {
 		},
 		15000,
 	);
+
+	// 裸 TCP 桩：前 planned 次请求收到请求头后直接销毁连接（复现
+	// 证书验证失败 / 连接重置等 fetch 网络层瞬态错误），随后回正常索引
+	function startFlakyTcpServer(planned: number) {
+		let hits = 0;
+		const server = net.createServer((socket) => {
+			socket.on("data", () => {
+				hits++;
+				if (hits <= planned) {
+					socket.destroy();
+					return;
+				}
+				const body = JSON.stringify({
+					version: "4",
+					objects: [
+						{
+							package: {
+								name: "koishi-plugin-demo",
+								version: "2.0.0",
+								date: "2024-06-01T00:00:00Z",
+								keywords: ["koishi", "plugin"],
+							},
+						},
+					],
+				});
+				socket.end(
+					`HTTP/1.1 200 OK\r\nContent-Type: application/json\r\nContent-Length: ${body.length}\r\nConnection: close\r\n\r\n${body}`,
+				);
+			});
+		});
+		return new Promise<{
+			port: number;
+			hits: () => number;
+			close: () => void;
+		}>((resolve) => {
+			server.listen(0, "127.0.0.1", () => {
+				const { port } =
+					server.address() as net.AddressInfo;
+				resolve({
+					port,
+					hits: () => hits,
+					close: () => {
+						server.close();
+					},
+				});
+			});
+		});
+	}
+
+	it("网络层瞬态错误（连接重置）经退避重试后恢复", async () => {
+		const stub = await startFlakyTcpServer(2);
+		const mirror = await createMirrorApp({
+			endpoint: `http://127.0.0.1:${stub.port}/`,
+		});
+		const svc = mirror.get("console.services.market");
+		// 前两次连接被重置（fetch 抛 TypeError，plugin-http 包装为无 code
+		// 无 response 的 HTTP.Error），退避重试后第三次成功
+		await svc?.start(true);
+		expect(stub.hits()).toBeGreaterThanOrEqual(3);
+		const payload = await svc?.get();
+		expect(Object.keys(payload?.data ?? {})).toEqual([
+			"koishi-plugin-demo",
+		]);
+		expect(payload?.total).toBe(1);
+		await mirror.stop();
+		stub.close();
+	}, 10000);
 });

package/src/node/installer.ts

@@ -2,9 +2,13 @@
 // Copyright (c) 2019-present Shigma and Koishijs contributors.
 // Copyright (c) 2026-present Koishi-CE contributors.
 
-import { readFileSync } from "node:fs";
+import {
+	existsSync,
+	readFileSync,
+	realpathSync,
+} from "node:fs";
 import { homedir } from "node:os";
-import { join, resolve } from "node:path";
+import { dirname, join, resolve } from "node:path";
 import type {} from "@koishi-ce/console";
 import {
 	type Context,
@@ -53,6 +57,37 @@ function isGuardedRequest(
 	);
 }
 
+/**
+ * 从 fromDir 沿 node_modules 链纯 fs 探测依赖包,命中返回其真实目录。
+ * realpath 化是 isolated 布局的关键:顶层条目是 symlink,包的依赖链接
+ * 挂在 .bun 真实目录的同级 node_modules,从链接路径向上爬会错误地查
+ * 顶层(isolated 不提升传递依赖)。
+ */
+function probePackage(
+	fromDir: string,
+	name: string,
+): string | undefined {
+	let dir = resolve(fromDir);
+	for (;;) {
+		const manifestPath = join(
+			dir,
+			"node_modules",
+			name,
+			"package.json",
+		);
+		if (existsSync(manifestPath)) {
+			try {
+				return dirname(realpathSync(manifestPath));
+			} catch {
+				return undefined;
+			}
+		}
+		const parent = dirname(dir);
+		if (parent === dir) return undefined;
+		dir = parent;
+	}
+}
+
 /** 从单个 .npmrc 文件提取 registry 配置项；文件不存在或读取出错一律视为未配置 */
 function readNpmrcRegistry(
 	file: string,
@@ -174,7 +209,7 @@ class Installer extends Service {
 		Promise<Dict<Pick<RemotePackage, DependencyMetaKey>>>
 	> = {};
 	private manifest: LocalPackage;
-	private declare depTask: Promise<Dict<Dependency>>;
+	declare private depTask: Promise<Dict<Dependency>>;
 	private flushData: () => void;
 
 	override config: Installer.Config;
@@ -404,6 +439,59 @@ class Installer extends Service {
 		return this.exec(args);
 	}
 
+	/**
+	 * 安装完整性校验:从本次安装的包出发递归纯 fs 探测依赖可达性,返回
+	 * 「包: 缺失依赖」描述列表。背景是 Bun isolated 布局的增量安装缺陷
+	 * (2026-09-07 实证):升级插件时包目录 hash 变化,而其依赖的解析
+	 * 结果未变,bun 的增量安装跳过新包目录内的依赖链接建立——插件入口
+	 * (顶层 symlink)可加载,内部依赖的 require 却炸 MODULE_NOT_FOUND;
+	 * 此时补跑一次普通 bun install,bun 按磁盘实际状态检测到包不完整
+	 * 即重建链接(秒级)。全程只走 existsSync / readFileSync /
+	 * realpathSync,不触碰解析 API(防父目录快照缓存,与
+	 * resolvePackageJson 同一纪律)。peer / optional 依赖由宿主或按需
+	 * 提供不入校验;workspace / alias 等非 semver 声明的落盘名与键名无
+	 * 直接映射,同样跳过。
+	 */
+	private _findMissingDeps(
+		deps: Dict<string | null>,
+	): string[] {
+		const problems: string[] = [];
+		const visited = new Set<string>();
+		const walk = (dir: string, label: string) => {
+			if (visited.has(dir)) return;
+			visited.add(dir);
+			let manifest: LocalPackage;
+			try {
+				manifest = JSON.parse(
+					readFileSync(join(dir, "package.json"), "utf8"),
+				) as LocalPackage;
+			} catch {
+				return;
+			}
+			for (const [dep, request] of Object.entries(
+				manifest.dependencies ?? {},
+			)) {
+				if (request.includes(":")) continue;
+				const depDir = probePackage(dir, dep);
+				if (!depDir) {
+					problems.push(`${label} 的依赖 ${dep} 未被链接`);
+					continue;
+				}
+				walk(depDir, `${label} → ${dep}`);
+			}
+		};
+		for (const name in deps) {
+			const request = deps[name];
+			if (!request || request.includes(":")) continue;
+			const dir = probePackage(this.cwd, name);
+			// 顶层包未落盘属于安装失败,由退出码与后续加载告警兜底,
+			// 不属于「包已装但链接缺失」的补装场景
+			if (!dir) continue;
+			walk(dir, name);
+		}
+		return problems;
+	}
+
 	private _getLocalDeps(override: Dict<string | null>) {
 		return valueMap(override, (request, name) => {
 			const dep = { request } as Dependency;
@@ -443,6 +531,22 @@ class Installer extends Service {
 		if (shouldInstall) {
 			const code = await this._install();
 			if (code) return code;
+			// isolated 布局的增量安装可能漏建新包目录的依赖链接(机理
+			// 见 _findMissingDeps 注释):装完即校验,缺失时补跑一次
+			// 安装——bun 按磁盘实际状态重建链接,秒级自愈,无需人工
+			const missing = this._findMissingDeps(deps);
+			if (missing.length) {
+				logger.warn(
+					`检测到增量安装未建立部分依赖链接(isolated 布局已知缺陷),正在补装: ${missing.join("; ")}`,
+				);
+				const retry = await this._install();
+				if (retry) return retry;
+				if (this._findMissingDeps(deps).length) {
+					logger.warn(
+						"自动补装后依赖链接仍不完整,请在项目根目录运行 bun install --force 并重启 koishi",
+					);
+				}
+			}
 		}
 
 		this.refresh();

package/src/node/market.ts

@@ -22,8 +22,8 @@ const logger = new Logger("market");
 
 // registry 接口对无认证请求有速率限制：搜索接口（/-/v1/search）超频时
 // 返回 429，collect 一旦失败会中断整个市场数据刷新（prepare 置 _error，
-// 页面清空）。对限流、请求超时与 5xx 瞬态错误做指数退避重试；镜像索引
-// 的 404（部署窗口内版本化文件尚未就绪）同样按瞬态处理。
+// 页面清空）。对限流、请求超时、fetch 网络层瞬态错误与 5xx 做指数退避
+// 重试；镜像索引的 404（部署窗口内版本化文件尚未就绪）同样按瞬态处理。
 /** 首次请求失败后的最大重试次数 */
 const maxRetries = 2;
 /** 重试的基础退避时长，按尝试次数指数放大 */
@@ -69,13 +69,21 @@ class MarketProvider extends BaseMarketProvider {
 	 * 服务端瞬态错误（408 / 5xx）可安全重试；allowNotFound 时把 404
 	 * 也视为瞬态——镜像索引以「302 指向版本化文件」方式发布，切换文件
 	 * 的部署窗口会出现短时 404。
+	 *
+	 * 无 code 且无 response 的 HTTP.Error 是 plugin-http 对 fetch 网络层
+	 * 异常（证书验证失败、连接重置、DNS 等）的统一包装——代理节点切换
+	 * 等瞬态网络抖动即此形态，重试可自愈。
 	 */
 	private isRetryable(
 		error: unknown,
 		allowNotFound = false,
 	): error is HTTP.Error {
 		if (!this.ctx.http.isError(error)) return false;
-		if (!error.response) return error.code === "ETIMEDOUT";
+		if (!error.response)
+			return (
+				error.code === undefined ||
+				error.code === "ETIMEDOUT"
+			);
 		const { status } = error.response;
 		return (
 			status === 429 ||