@koishi-ce/plugin-market 1.0.8 → 1.0.9

package/lib/index.d.ts

@@ -26,7 +26,6 @@ declare class Installer extends Service {
   fullCache: Dict<Dict<Pick<RemotePackage, DependencyMetaKey>>>;
   tempCache: Dict<Dict<Pick<RemotePackage, DependencyMetaKey>>>;
   private pkgTasks;
-  private agent;
   private manifest;
   private depTask;
   private flushData;

package/lib/index.mjs

@@ -1,13 +1,11 @@
-import { createRequire } from "node:module";
 import { 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 { homedir } from "node:os";
-import Scanner, { isResidentInCache, resolvePackageJson } from "@koishi-ce/registry";
-import spawn from "execa";
-import pMap from "p-map";
+import Scanner, { isResidentInCache, mapLimit, resolvePackageJson } from "@koishi-ce/registry";
+import { spawn } from "node:child_process";
 import messageZhCN from "./assets/message.zh-CN-D1DbsO3I.yml";
 import schemaZhCN from "./assets/schema.zh-CN-Bj0_jaVr.yml";
 //#region src/node/deps.ts
@@ -28,6 +26,27 @@ var RegistryProvider = class extends DataService {
 	}
 };
 //#endregion
+//#region src/node/proc.ts
+/**
+* 安装子进程的创建封装（原依赖 execa）。
+*
+* execa 本质是 node:child_process 的事件流封装，本仓只用到其
+* spawn + exit/error 事件 + stdout/stderr 流读取的子集，直接用
+* node:child_process 等价实现即可，Bun 运行时完全兼容。刻意不用
+* Bun.spawn 的捕获管道：win32 下其读端存在 EOF 竞态（见
+* tooling/release/proc.ts 注释），而单进程安装场景 child_process
+* 无此问题。子进程以 process.execPath 启动——宿主必为 Bun 运行时，
+* 直接复用当前可执行文件，不依赖 PATH 中的 bun。
+*
+* 独立成模块是为了让测试能以 mock.module 按相对路径精确拦截，
+* 不真正拉起安装进程（此前 mock execa 包名，全局替换同样可行，
+* 但本地模块拦截范围更小、不受其它包使用 child_process 的干扰）。
+*/
+/** 在指定工作目录启动 bun 子进程（args 已含子命令与参数），stdio 三路 pipe。 */
+function spawnBun(args, cwd) {
+	return spawn(process.execPath, args, { cwd });
+}
+//#endregion
 //#region src/node/installer.ts
 const logger$2 = new Logger("market");
 /**
@@ -70,12 +89,6 @@ function getLocalRegistry(cwd, userHome = homedir()) {
 	for (const candidate of candidates) if (candidate?.startsWith("https://") || candidate?.startsWith("http://")) return candidate;
 	return "https://registry.npmjs.org/";
 }
-const whichPMRuns = createRequire(import.meta.url)("which-pm-runs");
-const levelMap = {
-	info: "info",
-	warning: "debug",
-	error: "warn"
-};
 function loadManifest(name) {
 	const filename = resolvePackageJson(name);
 	const meta = JSON.parse(readFileSync(filename, "utf8"));
@@ -94,7 +107,6 @@ var Installer = class extends Service {
 	fullCache = {};
 	tempCache = {};
 	pkgTasks = {};
-	agent = whichPMRuns();
 	manifest;
 	flushData;
 	config;
@@ -164,7 +176,7 @@ var Installer = class extends Service {
 		const result = valueMap(this.manifest.dependencies, (request) => {
 			return { request: request.replace(/^[~^]/, "") };
 		});
-		await pMap(Object.keys(result), async (name) => {
+		await mapLimit(Object.keys(result), 10, async (name) => {
 			const dep = result[name];
 			if (!dep) return;
 			try {
@@ -176,7 +188,7 @@ var Installer = class extends Service {
 			if (!valid(dep.request)) dep.invalid = true;
 			const versions = await this.getPackage(name);
 			if (versions) dep.latest = Object.keys(versions)[0];
-		}, { concurrency: 10 });
+		});
 		return result;
 	}
 	getDeps() {
@@ -195,40 +207,24 @@ var Installer = class extends Service {
 		this.refreshData();
 	}
 	async exec(args) {
-		const name = this.agent?.name ?? "npm";
-		const useJson = name === "yarn" && (this.agent?.version ?? "1") >= "2";
-		if (name !== "yarn") args.unshift("install");
+		args.unshift("install");
 		return new Promise((resolve) => {
-			if (useJson) args.push("--json");
-			const child = spawn(name, args, { cwd: this.cwd });
+			const child = spawnBun(args, this.cwd);
 			child.on("exit", (code) => resolve(code ?? -1));
 			child.on("error", () => resolve(-1));
 			let stderr = "";
 			child.stderr?.on("data", (data) => {
-				data = stderr + data.toString();
-				const lines = data.split("\n");
+				stderr += data.toString();
+				const lines = stderr.split("\n");
 				stderr = lines.pop() ?? "";
 				for (const line of lines) logger$2.warn(line);
 			});
 			let stdout = "";
 			child.stdout?.on("data", (data) => {
-				data = stdout + data.toString();
-				const lines = data.split("\n");
+				stdout += data.toString();
+				const lines = stdout.split("\n");
 				stdout = lines.pop() ?? "";
-				for (const line of lines) {
-					if (!useJson || line[0] !== "{") {
-						logger$2.info(line);
-						continue;
-					}
-					try {
-						const { type, data } = JSON.parse(line);
-						const level = type in levelMap ? levelMap[type] : null;
-						(level ? logger$2[level] : logger$2.info)(data);
-					} catch (error) {
-						logger$2.warn(line);
-						logger$2.warn(error);
-					}
-				}
+				for (const line of lines) logger$2.info(line);
 			});
 		});
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@koishi-ce/plugin-market",
     "description": "Manage your bots and plugins with console",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "type": "module",
     "main": "lib/index.mjs",
     "typings": "lib/index.d.ts",
@@ -60,20 +60,19 @@
         }
     },
     "devDependencies": {
-        "@koishi-ce/client": "^1.0.2",
-        "@koishi-ce/loader": "^1.0.3",
-        "@koishi-ce/plugin-config": "^1.0.7",
+        "@koishi-ce/client": "^1.0.3",
+        "@koishi-ce/loader": "^1.0.4",
+        "@koishi-ce/plugin-config": "^1.0.8",
         "@koishijs/market": "^4.2.10",
         "@types/semver": "^7.5.8",
-        "vue": "^3.5.12"
+        "@vueuse/core": "^14.4.0",
+        "vue": "^3.5.12",
+        "vue-router": "^5.2.0"
     },
     "dependencies": {
         "@koishi-ce/console": "^1.0.0",
-        "@koishi-ce/registry": "^1.0.4",
-        "execa": "^5.1.1",
-        "p-map": "^4.0.0",
-        "semver": "^7.6.3",
-        "which-pm-runs": "^1.1.0"
+        "@koishi-ce/registry": "^1.0.5",
+        "semver": "^7.6.3"
     },
     "exports": {
         ".": {

package/src/__tests__/index.test.ts

@@ -10,20 +10,20 @@ import memory from "@koishijs/plugin-database-memory";
 
 /**
  * market 插件测试：
- * - 子进程（npm/yarn 安装）经 mock.module 拦截 execa，不落盘不联网安装；
+ * - 子进程（bun 安装）经 mock.module 拦截本地 proc.ts（spawnBun 封装），不落盘不联网安装；
  * - registry 网络请求由进程内 Bun.serve 提供（registry 协议的最小 JSON）；
  * - 宿主环境（loader / cwd）使用 FakeLoader 与临时目录 + chdir，
  *   Installer 的 override 写盘只会作用于临时 package.json。
  */
 
-/** 已发生的子进程调用（命令与参数）。 */
+/** 已发生的子进程调用（参数列表）。 */
 const spawnCalls: string[][] = [];
 /** 控制下一次子进程的退出码与触发事件。 */
 let nextExitCode = 0;
 let nextSpawnError = false;
 
-const execaMock = (name: string, args: string[]) => {
-	spawnCalls.push([name, ...args]);
+const spawnBunMock = (_args: string[], _cwd: string) => {
+	spawnCalls.push(_args);
 	return {
 		on(event: string, cb: (code?: number) => void) {
 			if (nextSpawnError) {
@@ -52,7 +52,7 @@ const execaMock = (name: string, args: string[]) => {
 	};
 };
 
-mock.module("execa", () => ({ default: execaMock }));
+mock.module("../node/proc.ts", () => ({ spawnBun: spawnBunMock }));
 
 import type { Entry } from "@koishi-ce/console";
 // 均为 type-only 导入：编译期擦除，不干扰 mock.module 先于插件加载的时序
@@ -284,10 +284,9 @@ describe("Installer 安装链路", () => {
 			"koishi-plugin-demo": "^1.0.0",
 		});
 		expect(code).toBe(0);
-		// 触发了包管理器安装（npm install --registry …）
+		// 触发了包管理器安装（bun install --registry …）
 		expect(spawnCalls.length).toBe(1);
-		expect(spawnCalls[0]?.[0]).toBe("npm");
-		expect(spawnCalls[0]?.[1]).toBe("install");
+		expect(spawnCalls[0]?.[0]).toBe("install");
 		// 重新读取临时 package.json：护栏项保持原样，新依赖加入
 		const manifest = JSON.parse(
 			await Bun.file(join(tmp, "package.json")).text(),

package/src/node/installer.ts

@@ -3,7 +3,6 @@
 // Copyright (c) 2026-present Koishi-CE contributors.
 
 import { readFileSync } from "node:fs";
-import { createRequire } from "node:module";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
 import type {} from "@koishi-ce/console";
@@ -24,14 +23,14 @@ import type {} from "@koishi-ce/plugin-market";
 import Scanner, {
 	type DependencyMetaKey,
 	isResidentInCache,
+	mapLimit,
 	type PackageJson,
 	type Registry,
 	type RemotePackage,
 	resolvePackageJson,
 } from "@koishi-ce/registry";
-import spawn from "execa";
-import pMap from "p-map";
 import { compare, satisfies, valid } from "semver";
+import { spawnBun } from "./proc.ts";
 
 const logger = new Logger("market");
 
@@ -87,12 +86,6 @@ function getLocalRegistry(cwd: string, userHome: string = homedir()): string {
 	return "https://registry.npmjs.org/";
 }
 
-// 经 createRequire 加载 CJS 包并就地断言签名：不走 ESM 导入互操作，
-// 规避多包合并类型检查（大一统 tsconfig）下 export = 交织失效问题
-const whichPMRuns = createRequire(import.meta.url)("which-pm-runs") as () =>
-	| undefined
-	| { name: string; version: string };
-
 export interface Dependency {
 	/**
 	 * requested semver range
@@ -112,28 +105,14 @@ export interface Dependency {
 	latest?: string | undefined;
 }
 
-export interface YarnLog {
-	type: "warning" | "info" | "error" | string;
-	name: number | null;
-	displayName: string;
-	indent?: string;
-	data: string;
-}
-
-const levelMap = {
-	info: "info",
-	warning: "debug",
-	error: "warn",
-} as const;
-
-export interface LocalPackage extends PackageJson {
+interface LocalPackage extends PackageJson {
 	private?: boolean;
 	$workspace?: boolean;
 	/** loadManifest 归一化保证 dependencies 必有 */
 	dependencies: Record<string, string>;
 }
 
-export function loadManifest(name: string) {
+function loadManifest(name: string) {
 	// resolvePackageJson 以纯 fs 探测为主路径：市场安装流程在包落盘前的
 	// 探测不能触碰解析 API，否则触发 Bun 的父目录快照缓存（装完即失败）
 	const filename = resolvePackageJson(name);
@@ -170,7 +149,6 @@ class Installer extends Service {
 	private pkgTasks: Dict<
 		Promise<Dict<Pick<RemotePackage, DependencyMetaKey>>>
 	> = {};
-	private agent = whichPMRuns();
 	private manifest: LocalPackage;
 	private declare depTask: Promise<Dict<Dependency>>;
 	private flushData: () => void;
@@ -259,28 +237,24 @@ class Installer extends Service {
 		const result = valueMap(this.manifest.dependencies, (request) => {
 			return { request: request.replace(/^[~^]/, "") } as Dependency;
 		});
-		await pMap(
-			Object.keys(result),
-			async (name) => {
-				const dep = result[name];
-				if (!dep) return;
-				try {
-					// some dependencies may be left with no local installation
-					const meta = loadManifest(name);
-					dep.resolved = meta.version;
-					dep.workspace = meta.$workspace;
-					if (meta.$workspace) return;
-				} catch {}
-
-				if (!valid(dep.request)) {
-					dep.invalid = true;
-				}
+		await mapLimit(Object.keys(result), 10, async (name) => {
+			const dep = result[name];
+			if (!dep) return;
+			try {
+				// some dependencies may be left with no local installation
+				const meta = loadManifest(name);
+				dep.resolved = meta.version;
+				dep.workspace = meta.$workspace;
+				if (meta.$workspace) return;
+			} catch {}
 
-				const versions = await this.getPackage(name);
-				if (versions) dep.latest = Object.keys(versions)[0];
-			},
-			{ concurrency: 10 },
-		);
+			if (!valid(dep.request)) {
+				dep.invalid = true;
+			}
+
+			const versions = await this.getPackage(name);
+			if (versions) dep.latest = Object.keys(versions)[0];
+		});
 		return result;
 	}
 
@@ -303,19 +277,18 @@ class Installer extends Service {
 	}
 
 	async exec(args: string[]) {
-		const name = this.agent?.name ?? "npm";
-		const useJson = name === "yarn" && (this.agent?.version ?? "1") >= "2";
-		if (name !== "yarn") args.unshift("install");
+		// Bun-first：CE 生态只存在 bun 这一种包管理器，直接驱动 bun 执行
+		// 安装（上游经 which-pm-runs 探测 npm/yarn/bun，此处固定为 bun）
+		args.unshift("install");
 		return new Promise<number>((resolve) => {
-			if (useJson) args.push("--json");
-			const child = spawn(name, args, { cwd: this.cwd });
+			const child = spawnBun(args, this.cwd);
 			child.on("exit", (code) => resolve(code ?? -1));
 			child.on("error", () => resolve(-1));
 
 			let stderr = "";
 			child.stderr?.on("data", (data) => {
-				data = stderr + data.toString();
-				const lines = data.split("\n");
+				stderr += data.toString();
+				const lines = stderr.split("\n");
 				stderr = lines.pop() ?? "";
 				for (const line of lines) {
 					logger.warn(line);
@@ -324,23 +297,11 @@ class Installer extends Service {
 
 			let stdout = "";
 			child.stdout?.on("data", (data) => {
-				data = stdout + data.toString();
-				const lines = data.split("\n");
+				stdout += data.toString();
+				const lines = stdout.split("\n");
 				stdout = lines.pop() ?? "";
 				for (const line of lines) {
-					if (!useJson || line[0] !== "{") {
-						logger.info(line);
-						continue;
-					}
-					try {
-						const { type, data } = JSON.parse(line) as YarnLog;
-						const level =
-							type in levelMap ? levelMap[type as keyof typeof levelMap] : null;
-						(level ? logger[level] : logger.info)(data);
-					} catch (error) {
-						logger.warn(line);
-						logger.warn(error);
-					}
+					logger.info(line);
 				}
 			});
 		});

package/src/node/proc.ts

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (c) 2019-present Shigma and Koishijs contributors.
+// Copyright (c) 2026-present Koishi-CE contributors.
+
+/**
+ * 安装子进程的创建封装（原依赖 execa）。
+ *
+ * execa 本质是 node:child_process 的事件流封装，本仓只用到其
+ * spawn + exit/error 事件 + stdout/stderr 流读取的子集，直接用
+ * node:child_process 等价实现即可，Bun 运行时完全兼容。刻意不用
+ * Bun.spawn 的捕获管道：win32 下其读端存在 EOF 竞态（见
+ * tooling/release/proc.ts 注释），而单进程安装场景 child_process
+ * 无此问题。子进程以 process.execPath 启动——宿主必为 Bun 运行时，
+ * 直接复用当前可执行文件，不依赖 PATH 中的 bun。
+ *
+ * 独立成模块是为了让测试能以 mock.module 按相对路径精确拦截，
+ * 不真正拉起安装进程（此前 mock execa 包名，全局替换同样可行，
+ * 但本地模块拦截范围更小、不受其它包使用 child_process 的干扰）。
+ */
+import { type ChildProcess, spawn } from "node:child_process";
+
+/** 在指定工作目录启动 bun 子进程（args 已含子命令与参数），stdio 三路 pipe。 */
+export function spawnBun(args: string[], cwd: string): ChildProcess {
+	return spawn(process.execPath, args, { cwd });
+}