@koishi-ce/plugin-market 1.0.8 → 1.0.10

package/src/browser/index.ts

@@ -25,6 +25,11 @@ export function apply(ctx: Context, _config: Config) {
 	ctx.console.addEntry(
 		base
 			? [`${base}/dist/index.js`, `${base}/dist/style.css`]
-			: [import.meta.url.replace(/\/src\/[^/]+\/[^/]+$/, "/client/index.ts")],
+			: [
+					import.meta.url.replace(
+						/\/src\/[^/]+\/[^/]+$/,
+						"/client/index.ts",
+					),
+				],
 	);
 }

package/src/browser/market.ts

@@ -12,10 +12,14 @@ export default class MarketProvider extends BaseMarketProvider {
 
 	override async get() {
 		const market = await this.prepare();
-		if (!market) return { data: {}, failed: 0, total: 0, progress: 0 };
+		if (!market)
+			return { data: {}, failed: 0, total: 0, progress: 0 };
 		return {
 			data: Object.fromEntries(
-				market.objects.map((item) => [item.package.name, item]),
+				market.objects.map((item) => [
+					item.package.name,
+					item,
+				]),
 			),
 			failed: 0,
 			total: market.objects.length,

package/src/node/deps.ts

@@ -4,10 +4,15 @@
 
 import { DataService } from "@koishi-ce/console";
 import type { Context, Dict } from "@koishi-ce/koishi";
-import type { DependencyMetaKey, RemotePackage } from "@koishi-ce/registry";
+import type {
+	DependencyMetaKey,
+	RemotePackage,
+} from "@koishi-ce/registry";
 import type { Dependency } from "./installer.ts";
 
-class DependencyProvider extends DataService<Dict<Dependency>> {
+class DependencyProvider extends DataService<
+	Dict<Dependency>
+> {
 	constructor(ctx: Context) {
 		super(ctx, "dependencies", { authority: 4 });
 	}

package/src/node/index.ts

@@ -3,10 +3,21 @@
 // Copyright (c) 2026-present Koishi-CE contributors.
 
 import { resolve } from "node:path";
-import { type Context, type Dict, pick, Schema } from "@koishi-ce/koishi";
-import type { DependencyMetaKey, RemotePackage } from "@koishi-ce/registry";
+import {
+	type Context,
+	type Dict,
+	pick,
+	Schema,
+} from "@koishi-ce/koishi";
+import type {
+	DependencyMetaKey,
+	RemotePackage,
+} from "@koishi-ce/registry";
 import { gt } from "semver";
-import { DependencyProvider, RegistryProvider } from "./deps.ts";
+import {
+	DependencyProvider,
+	RegistryProvider,
+} from "./deps.ts";
 import Installer from "./installer.ts";
 import messageZhCN from "./locales/message.zh-CN.yml";
 import schemaZhCN from "./locales/schema.zh-CN.yml";
@@ -31,15 +42,25 @@ declare module "@koishi-ce/console" {
 	}
 
 	interface Events {
-		"market/install"(deps: Dict<string>, forced?: boolean): Promise<number>;
+		"market/install"(
+			deps: Dict<string>,
+			forced?: boolean,
+		): Promise<number>;
 		"market/registry"(
 			names: string[],
-		): Promise<Dict<Dict<Pick<RemotePackage, DependencyMetaKey>>>>;
+		): Promise<
+			Dict<Dict<Pick<RemotePackage, DependencyMetaKey>>>
+		>;
 	}
 }
 
 export const name = "market";
-export const inject = ["http"];
+// loader 由宿主以 builtin 服务提供，生产恒存在；测试等裸 App 环境可缺席，
+// 声明为非必需注入以免 cordis 报「property loader is not registered」
+export const inject = {
+	http: { required: true },
+	loader: { required: false },
+};
 
 export const usage = `
 如果插件市场页面提示「无法连接到插件市场」，则可以选择一个 Koishi 社区提供的镜像地址，填入下方对应的配置项中。
@@ -101,12 +122,18 @@ export function apply(ctx: Context, config: Config) {
 					return session.text(".already-installed");
 
 				// find proper version
-				const result = await ctx.installer.findVersion(names);
+				const result =
+					await ctx.installer.findVersion(names);
 				if (!result) return session.text(".not-found");
 
 				// set restart message
 				ctx.loader.envData.message = {
-					...pick(session, ["sid", "channelId", "guildId", "isDirect"]),
+					...pick(session, [
+						"sid",
+						"channelId",
+						"guildId",
+						"isDirect",
+					]),
 					content: session.text(".success"),
 				};
 				await ctx.installer.install(result);
@@ -125,7 +152,8 @@ export function apply(ctx: Context, config: Config) {
 				const names = ctx.installer.resolveName(name);
 				const deps = await ctx.installer.getDeps();
 				const installed = names.find((name) => deps[name]);
-				if (!installed) return session.text(".not-installed");
+				if (!installed)
+					return session.text(".not-installed");
 
 				await ctx.installer.install({ [installed]: null });
 				return session.text(".success");
@@ -145,7 +173,9 @@ export function apply(ctx: Context, config: Config) {
 							const names = ctx.installer.resolveName(name);
 							return names.find((name) => deps[name]);
 						})
-						.filter((name): name is string => name !== undefined);
+						.filter(
+							(name): name is string => name !== undefined,
+						);
 					if (options?.self) resolved.push("koishi");
 					return resolved;
 				}
@@ -154,17 +184,25 @@ export function apply(ctx: Context, config: Config) {
 				ctx.installer.refresh(true);
 				const deps = await ctx.installer.getDeps();
 				names = (
-					await getPackages(names.filter((name): name is string => !!name))
+					await getPackages(
+						names.filter((name): name is string => !!name),
+					)
 				).filter((name) => {
-					const { latest, resolved, invalid } = deps[name] ?? {};
-					if (latest === undefined || resolved === undefined) return false;
+					const { latest, resolved, invalid } =
+						deps[name] ?? {};
+					if (
+						latest === undefined ||
+						resolved === undefined
+					)
+						return false;
 					try {
 						return !invalid && gt(latest, resolved);
 					} catch {
 						return false;
 					}
 				});
-				if (!names.length) return session.text(".all-updated");
+				if (!names.length)
+					return session.text(".all-updated");
 
 				const output = names.map((name) => {
 					const { latest, resolved } = deps[name] ?? {};
@@ -180,15 +218,24 @@ export function apply(ctx: Context, config: Config) {
 				}
 
 				ctx.loader.envData.message = {
-					...pick(session, ["sid", "channelId", "guildId", "isDirect"]),
+					...pick(session, [
+						"sid",
+						"channelId",
+						"guildId",
+						"isDirect",
+					]),
 					content: session.text(".success"),
 				};
 				await ctx.installer.install(
-					names.reduce<Dict<string | null>>((result, name) => {
-						const latest = deps[name]?.latest;
-						if (latest !== undefined) result[name] = latest;
-						return result;
-					}, {}),
+					names.reduce<Dict<string | null>>(
+						(result, name) => {
+							const latest = deps[name]?.latest;
+							if (latest !== undefined)
+								result[name] = latest;
+							return result;
+						},
+						{},
+					),
 				);
 				ctx.loader.envData.message = null;
 				return session.text(".success");
@@ -210,7 +257,10 @@ export function apply(ctx: Context, config: Config) {
 		ctx.console.addListener(
 			"market/install",
 			async (deps, forced) => {
-				const code = await ctx.installer.install(deps, forced);
+				const code = await ctx.installer.install(
+					deps,
+					forced,
+				);
 				ctx.get("console")?.refresh("dependencies");
 				ctx.get("console")?.refresh("registry");
 				ctx.get("console")?.refresh("packages");
@@ -223,7 +273,9 @@ export function apply(ctx: Context, config: Config) {
 			"market/registry",
 			async (names) => {
 				const meta = await Promise.all(
-					names.map((name) => ctx.installer.getPackage(name)),
+					names.map((name) =>
+						ctx.installer.getPackage(name),
+					),
 				);
 				return Object.fromEntries(
 					meta.map((meta, index) => [names[index], meta]),

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");
 
@@ -45,7 +44,9 @@ const logger = new Logger("market");
  * 两者被覆盖或删除都会让 peer 解析失去归属，重新拉下 npm 官方包形成
  * 第二份框架副本。
  */
-function isGuardedRequest(request: string | undefined): boolean {
+function isGuardedRequest(
+	request: string | undefined,
+): boolean {
 	return (
 		request?.startsWith("workspace:") === true ||
 		request?.startsWith("npm:@koishi-ce") === true
@@ -53,10 +54,16 @@ function isGuardedRequest(request: string | undefined): boolean {
 }
 
 /** 从单个 .npmrc 文件提取 registry 配置项；文件不存在或读取出错一律视为未配置 */
-function readNpmrcRegistry(file: string): string | undefined {
+function readNpmrcRegistry(
+	file: string,
+): string | undefined {
 	try {
-		for (const line of readFileSync(file, "utf8").split(/\r?\n/)) {
-			const matched = /^\s*registry\s*=\s*(\S+)\s*$/.exec(line);
+		for (const line of readFileSync(file, "utf8").split(
+			/\r?\n/,
+		)) {
+			const matched = /^\s*registry\s*=\s*(\S+)\s*$/.exec(
+				line,
+			);
 			const value = matched?.[1];
 			if (value) return value;
 		}
@@ -73,26 +80,26 @@ function readNpmrcRegistry(file: string): string | undefined {
  * 源（对齐被移除的 get-registry 的默认值），保证 http 恒有 endpoint
  * 可拼接相对 URL——缺省时相对请求会在 resolveURL 抛 Invalid URL。
  */
-function getLocalRegistry(cwd: string, userHome: string = homedir()): string {
+function getLocalRegistry(
+	cwd: string,
+	userHome: string = homedir(),
+): string {
 	const candidates = [
 		process.env["npm_config_registry"],
 		readNpmrcRegistry(join(cwd, ".npmrc")),
 		readNpmrcRegistry(join(userHome, ".npmrc")),
 	];
 	for (const candidate of candidates) {
-		if (candidate?.startsWith("https://") || candidate?.startsWith("http://")) {
+		if (
+			candidate?.startsWith("https://") ||
+			candidate?.startsWith("http://")
+		) {
 			return candidate;
 		}
 	}
 	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,34 +119,26 @@ 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);
-	const meta: LocalPackage = JSON.parse(readFileSync(filename, "utf8"));
+	const meta: LocalPackage = JSON.parse(
+		readFileSync(filename, "utf8"),
+	);
 	meta.dependencies ||= {};
-	defineProperty(meta, "$workspace", !filename.includes("node_modules"));
+	defineProperty(
+		meta,
+		"$workspace",
+		!filename.includes("node_modules"),
+	);
 	return meta;
 }
 
@@ -164,13 +163,16 @@ function getVersions(versions: RemotePackage[]) {
 class Installer extends Service {
 	declare http: HTTP;
 	declare endpoint: string | undefined;
-	public fullCache: Dict<Dict<Pick<RemotePackage, DependencyMetaKey>>> = {};
-	public tempCache: Dict<Dict<Pick<RemotePackage, DependencyMetaKey>>> = {};
+	public fullCache: Dict<
+		Dict<Pick<RemotePackage, DependencyMetaKey>>
+	> = {};
+	public tempCache: Dict<
+		Dict<Pick<RemotePackage, DependencyMetaKey>>
+	> = {};
 
 	private pkgTasks: Dict<
 		Promise<Dict<Pick<RemotePackage, DependencyMetaKey>>>
 	> = {};
-	private agent = whichPMRuns();
 	private manifest: LocalPackage;
 	private declare depTask: Promise<Dict<Dependency>>;
 	private flushData: () => void;
@@ -182,7 +184,9 @@ class Installer extends Service {
 		this.config = config;
 		this.manifest = loadManifest(this.cwd);
 		this.flushData = ctx.throttle(() => {
-			ctx.get("console")?.broadcast("market/registry", this.tempCache);
+			ctx
+				.get("console")
+				?.broadcast("market/registry", this.tempCache);
 			this.tempCache = {};
 		}, 500);
 	}
@@ -207,7 +211,10 @@ class Installer extends Service {
 			const [left, right] = name.split("/");
 			return [`${left}/koishi-plugin-${right}`];
 		} else {
-			return [`@koishijs/plugin-${name}`, `koishi-plugin-${name}`];
+			return [
+				`@koishijs/plugin-${name}`,
+				`koishi-plugin-${name}`,
+			];
 		}
 	}
 
@@ -215,7 +222,9 @@ class Installer extends Service {
 		const entries = await Promise.all(
 			names.map(async (name) => {
 				try {
-					const versions = Object.entries(await this.getPackage(name));
+					const versions = Object.entries(
+						await this.getPackage(name),
+					);
 					const [latest] = versions;
 					if (!latest) return undefined;
 					return { [name]: latest[0] };
@@ -224,19 +233,30 @@ class Installer extends Service {
 				}
 			}),
 		);
-		return entries.find((entry): entry is Dict<string> => entry !== undefined);
+		return entries.find(
+			(entry): entry is Dict<string> => entry !== undefined,
+		);
 	}
 
 	private async _getPackage(name: string) {
 		try {
-			const registry = await this.http.get<Registry>(`/${name}`);
+			const registry = await this.http.get<Registry>(
+				`/${name}`,
+			);
 			const versions = getVersions(
-				Object.values(registry.versions).filter((remote) => {
-					if (name === "koishi") return satisfies(remote.version, "4");
-					return !Scanner.isPlugin(name) || Scanner.isCompatible("4", remote);
-				}),
+				Object.values(registry.versions).filter(
+					(remote) => {
+						if (name === "koishi")
+							return satisfies(remote.version, "4");
+						return (
+							!Scanner.isPlugin(name) ||
+							Scanner.isCompatible("4", remote)
+						);
+					},
+				),
 			);
-			this.fullCache[name] = this.tempCache[name] = versions;
+			this.fullCache[name] = this.tempCache[name] =
+				versions;
 			this.flushData();
 			return versions;
 		} catch (error) {
@@ -246,9 +266,12 @@ class Installer extends Service {
 	}
 
 	setPackage(name: string, versions: RemotePackage[]) {
-		this.fullCache[name] = this.tempCache[name] = getVersions(versions);
+		this.fullCache[name] = this.tempCache[name] =
+			getVersions(versions);
 		this.flushData();
-		this.pkgTasks[name] = Promise.resolve(this.fullCache[name]);
+		this.pkgTasks[name] = Promise.resolve(
+			this.fullCache[name],
+		);
 	}
 
 	getPackage(name: string) {
@@ -256,11 +279,17 @@ class Installer extends Service {
 	}
 
 	private async _getDeps() {
-		const result = valueMap(this.manifest.dependencies, (request) => {
-			return { request: request.replace(/^[~^]/, "") } as Dependency;
-		});
-		await pMap(
+		const result = valueMap(
+			this.manifest.dependencies,
+			(request) => {
+				return {
+					request: request.replace(/^[~^]/, ""),
+				} as Dependency;
+			},
+		);
+		await mapLimit(
 			Object.keys(result),
+			10,
 			async (name) => {
 				const dep = result[name];
 				if (!dep) return;
@@ -279,7 +308,6 @@ class Installer extends Service {
 				const versions = await this.getPackage(name);
 				if (versions) dep.latest = Object.keys(versions)[0];
 			},
-			{ concurrency: 10 },
 		);
 		return result;
 	}
@@ -303,19 +331,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 +351,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);
 				}
 			});
 		});
@@ -350,26 +365,35 @@ class Installer extends Service {
 		const filename = resolve(this.cwd, "package.json");
 		// 现读现写：this.manifest 原为构造期的启动快照，运行期间根
 		// package.json 可能已被外部更新，基于快照整体重写会抹掉变更
-		this.manifest = JSON.parse(readFileSync(filename, "utf8")) as LocalPackage;
+		this.manifest = JSON.parse(
+			readFileSync(filename, "utf8"),
+		) as LocalPackage;
 		this.manifest.dependencies ||= {};
 		for (const key in deps) {
 			if (deps[key]) {
-				if (isGuardedRequest(this.manifest.dependencies[key])) {
+				if (
+					isGuardedRequest(this.manifest.dependencies[key])
+				) {
 					continue;
 				}
 				this.manifest.dependencies[key] = deps[key];
-			} else if (!isGuardedRequest(this.manifest.dependencies[key])) {
+			} else if (
+				!isGuardedRequest(this.manifest.dependencies[key])
+			) {
 				delete this.manifest.dependencies[key];
 			}
 		}
 		this.manifest.dependencies = Object.fromEntries(
-			Object.entries(this.manifest.dependencies).sort((a, b) =>
-				a[0].localeCompare(b[0]),
+			Object.entries(this.manifest.dependencies).sort(
+				(a, b) => a[0].localeCompare(b[0]),
 			),
 		);
 		// 仓库格式权威是 biome（tab 缩进），按 tab 写出避免装插件后
 		// package.json 被重排成空格、lint 报格式漂移
-		await Bun.write(filename, `${JSON.stringify(this.manifest, null, "\t")}\n`);
+		await Bun.write(
+			filename,
+			`${JSON.stringify(this.manifest, null, "\t")}\n`,
+		);
 	}
 
 	private _install() {
@@ -392,7 +416,10 @@ class Installer extends Service {
 		});
 	}
 
-	async install(deps: Dict<string | null>, forced?: boolean) {
+	async install(
+		deps: Dict<string | null>,
+		forced?: boolean,
+	) {
 		const localDeps = this._getLocalDeps(deps);
 		await this.override(deps);
 
@@ -404,7 +431,9 @@ class Installer extends Service {
 				local?.workspace ||
 				(request &&
 					local?.resolved &&
-					satisfies(local.resolved, request, { includePrerelease: true }))
+					satisfies(local.resolved, request, {
+						includePrerelease: true,
+					}))
 			)
 				continue;
 			shouldInstall = true;
@@ -425,7 +454,8 @@ class Installer extends Service {
 			if (newDep.resolved === local.resolved) continue;
 			// 版本变化且旧版本仍驻留内存时才需要整进程重载（判定不走
 			// 解析 API，规避 Bun 负缓存，见 isResidentInCache）
-			if (isResidentInCache(name)) this.ctx.loader.fullReload();
+			if (isResidentInCache(name))
+				this.ctx.loader.fullReload();
 		}
 		this.refreshData();