@koishi-ce/plugin-market 1.0.8 → 1.0.10

package/src/node/market.ts

@@ -41,7 +41,8 @@ class MarketProvider extends BaseMarketProvider {
 	constructor(ctx: Context, config: MarketProvider.Config) {
 		super(ctx);
 		this.config = config;
-		if (config.endpoint) this.http = ctx.http.extend(config);
+		if (config.endpoint)
+			this.http = ctx.http.extend(config);
 		this.flushData = ctx.throttle(() => {
 			ctx.console.broadcast("market/patch", {
 				data: this.tempCache,
@@ -88,7 +89,11 @@ class MarketProvider extends BaseMarketProvider {
 				// 可调用的 HTTP 实例本身），须包一层保持绑定
 				return await http.get<T>(url, config);
 			} catch (error) {
-				if (attempt >= maxRetries || !this.isRetryable(error)) throw error;
+				if (
+					attempt >= maxRetries ||
+					!this.isRetryable(error)
+				)
+					throw error;
 				const retryAfter = Number(
 					error.response?.headers.get("retry-after") ?? "",
 				);
@@ -113,16 +118,25 @@ class MarketProvider extends BaseMarketProvider {
 		const registry = this.ctx.installer.http;
 
 		this.failed = [];
-		this.scanner = new Scanner(<T>(url: string, config?: RequestConfig) =>
-			this.request<T>(registry, url, config),
+		this.scanner = new Scanner(
+			<T>(url: string, config?: RequestConfig) =>
+				this.request<T>(registry, url, config),
 		);
 		if (this.http) {
-			const result = await this.request<SearchResult>(this.http, "");
-			this.scanner.objects = result.objects.filter((object) => !object.ignored);
+			const result = await this.request<SearchResult>(
+				this.http,
+				"",
+			);
+			this.scanner.objects = result.objects.filter(
+				(object) => !object.ignored,
+			);
 			this.scanner.total = this.scanner.objects.length;
-			if (result.version !== undefined) this.scanner.version = result.version;
+			if (result.version !== undefined)
+				this.scanner.version = result.version;
 		} else {
-			await this.scanner.collect(timeout !== undefined ? { timeout } : {});
+			await this.scanner.collect(
+				timeout !== undefined ? { timeout } : {},
+			);
 		}
 
 		if (!this.scanner.version) {
@@ -150,16 +164,18 @@ class MarketProvider extends BaseMarketProvider {
 					}
 				},
 				onRegistry: (registry, versions) => {
-					this.ctx.installer.setPackage(registry.name, versions);
+					this.ctx.installer.setPackage(
+						registry.name,
+						versions,
+					);
 				},
 				onSuccess: (object, _versions) => {
 					// npmmirror lacks `links` field
 					object.package.links ||= {
 						npm: `${registry.config.endpoint?.replace("registry.", "www.") ?? ""}/package/${object.package.name}`,
 					};
-					this.fullCache[object.package.name] = this.tempCache[
-						object.package.name
-					] = object;
+					this.fullCache[object.package.name] =
+						this.tempCache[object.package.name] = object;
 				},
 				after: () => this.flushData(),
 			});
@@ -170,13 +186,17 @@ class MarketProvider extends BaseMarketProvider {
 
 	override async get() {
 		await this.prepare();
-		if (this._error) return { data: {}, failed: 0, total: 0, progress: 0 };
+		if (this._error)
+			return { data: {}, failed: 0, total: 0, progress: 0 };
 		const gravatar = process.env["GRAVATAR_MIRROR"];
 		return this.scanner.version
 			? {
 					registry: this.ctx.installer.endpoint,
 					data: Object.fromEntries(
-						this.scanner.objects.map((item) => [item.package.name, item]),
+						this.scanner.objects.map((item) => [
+							item.package.name,
+							item,
+						]),
 					),
 					failed: 0,
 					total: this.scanner.total,
@@ -195,13 +215,14 @@ class MarketProvider extends BaseMarketProvider {
 
 	// erasableSyntaxOnly 禁止含运行时值的 namespace，
 	// 原 namespace 内的 Config 常量移到此处的静态字段，对外形状不变
-	static Config: Schema<MarketProvider.Config> = Schema.object({
-		endpoint: Schema.string().role("link"),
-		timeout: Schema.number()
-			.role("time")
-			.default(Time.second * 30),
-		proxyAgent: Schema.string().role("link"),
-	});
+	static Config: Schema<MarketProvider.Config> =
+		Schema.object({
+			endpoint: Schema.string().role("link"),
+			timeout: Schema.number()
+				.role("time")
+				.default(Time.second * 30),
+			proxyAgent: Schema.string().role("link"),
+		});
 }
 
 declare namespace MarketProvider {

package/src/node/proc.ts

@@ -0,0 +1,31 @@
+// 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 });
+}

package/src/shared/index.ts

@@ -10,7 +10,10 @@ import {
 	Logger,
 	Time,
 } from "@koishi-ce/koishi";
-import type { SearchObject, SearchResult } from "@koishi-ce/registry";
+import type {
+	SearchObject,
+	SearchResult,
+} from "@koishi-ce/registry";
 
 declare module "@koishi-ce/console" {
 	interface Events {
@@ -27,21 +30,31 @@ declare module "@koishi-ce/console" {
 const logger = new Logger("market");
 
 export abstract class MarketProvider extends DataService<MarketProvider.Payload> {
-	private _task: Promise<SearchResult | undefined> | null = null;
+	private _task: Promise<SearchResult | undefined> | null =
+		null;
 	private _timestamp = 0;
 	protected _error: unknown;
 
 	constructor(ctx: Context) {
 		super(ctx, "market", { authority: 4 });
 
-		ctx.console.addListener("market/refresh", () => this.start(true), {
-			authority: 4,
-		});
+		ctx.console.addListener(
+			"market/refresh",
+			() => this.start(true),
+			{
+				authority: 4,
+			},
+		);
 
 		ctx.on("console/connection", async (client) => {
 			if (!ctx.console.clients[client.id]) return;
-			if (Date.now() - this._timestamp <= Time.hour * 12) return;
-			if (await this.ctx.serial("console/intercept", client, { authority: 4 }))
+			if (Date.now() - this._timestamp <= Time.hour * 12)
+				return;
+			if (
+				await this.ctx.serial("console/intercept", client, {
+					authority: 4,
+				})
+			)
 				return;
 			this.start();
 		});
@@ -57,11 +70,13 @@ export abstract class MarketProvider extends DataService<MarketProvider.Payload>
 	abstract collect(): Promise<SearchResult | undefined>;
 
 	async prepare(): Promise<SearchResult | undefined> {
-		return (this._task ||= this.collect().catch((error: unknown) => {
-			logger.warn(error);
-			this._error = error;
-			return undefined;
-		}));
+		return (this._task ||= this.collect().catch(
+			(error: unknown) => {
+				logger.warn(error);
+				this._error = error;
+				return undefined;
+			},
+		));
 	}
 }