@koishi-ce/plugin-market 1.0.11 → 1.0.13

package/lib/index.d.ts

@@ -77,7 +77,7 @@ declare module "@koishi-ce/console" {
     }
   }
 }
-declare abstract class MarketProvider extends DataService<MarketProvider.Payload> {
+export declare abstract class MarketProvider extends DataService<MarketProvider.Payload> {
   private _task;
   private _timestamp;
   protected _error: unknown;
@@ -86,7 +86,7 @@ declare abstract class MarketProvider extends DataService<MarketProvider.Payload
   abstract collect(): Promise<SearchResult | undefined>;
   prepare(): Promise<SearchResult | undefined>;
 }
-declare namespace MarketProvider {
+export declare namespace MarketProvider {
   interface Payload {
     registry?: string | undefined;
     data: Dict<SearchObject>;
@@ -108,7 +108,16 @@ declare class MarketProvider$1 extends MarketProvider {
   config: MarketProvider$1.Config;
   constructor(ctx: Context, config: MarketProvider$1.Config);
   start(refresh?: boolean): Promise<void>;
-  /** 限流（429）与请求超时、服务端瞬态错误（408 / 5xx）可安全重试 */
+  /**
+   * 限流（429）、请求超时（abort 后无 response，code 为 ETIMEDOUT）、
+   * 服务端瞬态错误（408 / 5xx）可安全重试；allowNotFound 时把 404
+   * 也视为瞬态——镜像索引以「302 指向版本化文件」方式发布，切换文件
+   * 的部署窗口会出现短时 404。
+   *
+   * 无 code 且无 response 的 HTTP.Error 是 plugin-http 对 fetch 网络层
+   * 异常（证书验证失败、连接重置、DNS 等）的统一包装——代理节点切换
+   * 等瞬态网络抖动即此形态，重试可自愈。
+   */
   private isRetryable;
   /**
    * 带退避重试的 registry 请求。优先遵循服务端的 Retry-After 响应头
@@ -160,8 +169,8 @@ declare module "@koishi-ce/console" {
     "market/registry"(names: string[]): Promise<Dict<Dict<Pick<RemotePackage, DependencyMetaKey>>>>;
   }
 }
-declare const name = "market";
-declare const inject: {
+export declare const name = "market";
+export declare const inject: {
   http: {
     required: boolean;
   };
@@ -169,12 +178,12 @@ declare const inject: {
     required: boolean;
   };
 };
-declare const usage = "\n如果插件市场页面提示「无法连接到插件市场」，则可以选择一个 Koishi 社区提供的镜像地址，填入下方对应的配置项中。\n\n## 插件市场（填入 search.endpoint）\n\n- Koishi（全球）：https://registry.koishi.chat/index.json\n- [t4wefan](https://k.ilharp.cc/2611)（大陆）：https://registry.koishi.t4wefan.pub/index.json\n- [Lipraty](https://k.ilharp.cc/3530)（大陆）：https://koi.nyan.zone/registry/index.json\n- [itzdrli](https://k.ilharp.cc/9975)（全球）：https://kp.itzdrli.cc\n- [Q78KG](https://k.ilharp.cc/10042)（全球）：https://koishi-registry.yumetsuki.moe/index.json\n\n要浏览更多社区镜像，请访问 [Koishi 论坛上的镜像一览](https://k.ilharp.cc/4000)。";
-interface Config {
+export declare const usage = "\n如果插件市场页面提示「无法连接到插件市场」，则可以选择一个 Koishi 社区提供的镜像地址，填入下方对应的配置项中。\n\n## 插件市场（填入 search.endpoint）\n\n- Koishi（全球）：https://registry.koishi.chat/index.json\n- [t4wefan](https://k.ilharp.cc/2611)（大陆）：https://registry.koishi.t4wefan.pub/index.json\n- [Lipraty](https://k.ilharp.cc/3530)（大陆）：https://koi.nyan.zone/registry/index.json\n- [itzdrli](https://k.ilharp.cc/9975)（全球）：https://kp.itzdrli.cc\n- [Q78KG](https://k.ilharp.cc/10042)（全球）：https://koishi-registry.yumetsuki.moe/index.json\n\n要浏览更多社区镜像，请访问 [Koishi 论坛上的镜像一览](https://k.ilharp.cc/4000)。";
+export interface Config {
   registry?: Installer.Config;
   search?: MarketProvider$1.Config;
 }
-declare const Config: Schema<Config>;
-declare function apply(ctx: Context, config: Config): void;
+export declare const Config: Schema<Config>;
+export declare function apply(ctx: Context, config: Config): void;
 //#endregion
-export { Config, DependencyProvider, Installer, MarketProvider, RegistryProvider, apply, inject, name, usage };
+export { DependencyProvider, Installer, RegistryProvider };

package/lib/index.mjs

@@ -354,21 +354,31 @@ var MarketProvider$1 = class extends MarketProvider {
 		await this.prepare();
 		super.start();
 	}
-	/** 限流（429）与请求超时、服务端瞬态错误（408 / 5xx）可安全重试 */
-	isRetryable(error) {
+	/**
+	* 限流（429）、请求超时（abort 后无 response，code 为 ETIMEDOUT）、
+	* 服务端瞬态错误（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;
-		const { status } = error.response ?? {};
-		return status === 429 || status === 408 || status !== void 0 && status >= 500;
+		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;
 	}
 	/**
 	* 带退避重试的 registry 请求。优先遵循服务端的 Retry-After 响应头
 	* （秒数），缺省时按基础时长指数退避。
 	*/
-	async request(http, url, config) {
+	async request(http, url, config, allowNotFound = false) {
 		for (let attempt = 0;; attempt++) try {
 			return await http.get(url, config);
 		} catch (error) {
-			if (attempt >= maxRetries || !this.isRetryable(error)) throw error;
+			if (attempt >= maxRetries || !this.isRetryable(error, allowNotFound)) throw error;
 			const retryAfter = Number(error.response?.headers.get("retry-after") ?? "");
 			const delay = Number.isFinite(retryAfter) && retryAfter > 0 ? retryAfter * Time.second : retryBaseDelay * 2 ** attempt;
 			logger.debug("请求 %s 失败（%s），%d 秒后重试（第 %d 次）", url, error.message, delay / Time.second, attempt + 1);
@@ -381,7 +391,7 @@ var MarketProvider$1 = class extends MarketProvider {
 		this.failed = [];
 		this.scanner = new Scanner((url, config) => this.request(registry, url, config));
 		if (this.http) {
-			const result = await this.request(this.http, "");
+			const result = await this.request(this.http, "", void 0, true);
 			this.scanner.objects = result.objects.filter((object) => !object.ignored);
 			this.scanner.total = this.scanner.objects.length;
 			if (result.version !== void 0) this.scanner.version = result.version;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@koishi-ce/plugin-market",
     "description": "Manage your bots and plugins with console",
-    "version": "1.0.11",
+    "version": "1.0.13",
     "type": "module",
     "main": "lib/index.mjs",
     "typings": "lib/index.d.ts",
@@ -60,9 +60,10 @@
         }
     },
     "devDependencies": {
-        "@koishi-ce/client": "^1.0.4",
-        "@koishi-ce/loader": "^1.0.5",
-        "@koishi-ce/plugin-config": "^1.0.9",
+        "@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 插件测试：
@@ -139,6 +140,12 @@ let searchResponse: {
 	total: 0,
 };
 
+/** flaky-index 镜像索引桩：已发生的请求计数与计划内的 404 次数。 */
+let flakyIndexHits = 0;
+let flakyIndexMisses = 0;
+/** slow-index 慢响应桩：已发生的请求计数。 */
+let slowIndexHits = 0;
+
 /** 声明预期触发 market 域告警（404 / 限流等桩失败路径）的用例：执行期间静默该域。 */
 const itQuiet = (
 	name: string,
@@ -173,6 +180,33 @@ const registryServer = Bun.serve({
 			}
 			return Response.json(searchResponse);
 		}
+		// 模拟镜像索引的部署窗口：前 flakyIndexMisses 次 404，随后返回完整索引
+		if (url.pathname === "/flaky-index") {
+			if (flakyIndexHits++ < flakyIndexMisses) {
+				return new Response("not found", { status: 404 });
+			}
+			return Response.json({
+				version: "4",
+				objects: [
+					{
+						package: {
+							name: "koishi-plugin-demo",
+							version: "2.0.0",
+							date: "2024-06-01T00:00:00Z",
+							keywords: ["koishi", "plugin"],
+						},
+					},
+				],
+			});
+		}
+		// 模拟镜像索引挂起：延迟超过用例配置的 timeout，驱动超时重试路径
+		if (url.pathname === "/slow-index") {
+			slowIndexHits++;
+			await new Promise((resolve) =>
+				setTimeout(resolve, 300),
+			);
+			return Response.json({ version: "4", objects: [] });
+		}
 		// 模拟 registry 限流：恒定 429 + 极短的 Retry-After，驱动重试后失败
 		if (
 			url.pathname.includes("koishi-plugin-ratelimited")
@@ -264,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(
@@ -973,3 +1006,135 @@ describe("market 进阶链路", () => {
 		20000,
 	);
 });
+
+describe("镜像索引瞬态重试", () => {
+	/** 搭建配了 search.endpoint 的独立宿主（镜像索引经本测试桩提供）。 */
+	async function createMirrorApp(search: {
+		endpoint: string;
+		timeout?: number;
+	}) {
+		const mirror = new App();
+		mirror.plugin(memory);
+		mirror.plugin(http);
+		mirror.plugin(
+			FakeConsole as unknown as Plugin.Constructor<TestApp>,
+		);
+		mirror.plugin(FakeLoader);
+		mirror.plugin(market, {
+			registry: {
+				endpoint: `http://127.0.0.1:${registryServer.port}/`,
+			},
+			search,
+		});
+		await mirror.start();
+		return mirror;
+	}
+
+	it("镜像索引部署窗口 404 经退避重试后恢复", async () => {
+		flakyIndexHits = 0;
+		flakyIndexMisses = 2;
+		const mirror = await createMirrorApp({
+			endpoint: `http://127.0.0.1:${registryServer.port}/flaky-index`,
+		});
+		const svc = mirror.get("console.services.market");
+		// start(true) 内部 await prepare：前两次 404，退避重试后第三次成功
+		await svc?.start(true);
+		expect(flakyIndexHits).toBeGreaterThanOrEqual(3);
+		const payload = await svc?.get();
+		expect(Object.keys(payload?.data ?? {})).toEqual([
+			"koishi-plugin-demo",
+		]);
+		expect(payload?.total).toBe(1);
+		await mirror.stop();
+	}, 10000);
+
+	itQuiet(
+		"镜像索引持续超时经重试后优雅失败",
+		async () => {
+			slowIndexHits = 0;
+			const mirror = await createMirrorApp({
+				endpoint: `http://127.0.0.1:${registryServer.port}/slow-index`,
+				timeout: 50,
+			});
+			const svc = mirror.get("console.services.market");
+			// 每次尝试 50ms 即超时，退避 1s + 2s 后仍失败；重试确实发生
+			await svc?.start(true);
+			expect(slowIndexHits).toBeGreaterThanOrEqual(3);
+			// start 末尾的 refresh 会再触发一轮 collect，等待其失败落地
+			await new Promise((resolve) =>
+				setTimeout(resolve, 3600),
+			);
+			const error = svc?.["_error" as keyof typeof svc];
+			expect(error).toBeDefined();
+			await mirror.stop();
+		},
+		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

@@ -174,7 +174,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;

package/src/node/market.ts

@@ -21,8 +21,9 @@ import { MarketProvider as BaseMarketProvider } from "../shared/index.ts";
 const logger = new Logger("market");
 
 // registry 接口对无认证请求有速率限制：搜索接口（/-/v1/search）超频时
-// 返回 429，collect 首页搜索一旦失败会中断整个市场数据刷新（prepare
-// 置 _error，页面清空）。对限流与 5xx 瞬态错误做指数退避重试。
+// 返回 429，collect 一旦失败会中断整个市场数据刷新（prepare 置 _error，
+// 页面清空）。对限流、请求超时、fetch 网络层瞬态错误与 5xx 做指数退避
+// 重试；镜像索引的 404（部署窗口内版本化文件尚未就绪）同样按瞬态处理。
 /** 首次请求失败后的最大重试次数 */
 const maxRetries = 2;
 /** 重试的基础退避时长，按尝试次数指数放大 */
@@ -63,13 +64,31 @@ class MarketProvider extends BaseMarketProvider {
 		super.start();
 	}
 
-	/** 限流（429）与请求超时、服务端瞬态错误（408 / 5xx）可安全重试 */
-	private isRetryable(error: unknown): error is HTTP.Error {
+	/**
+	 * 限流（429）、请求超时（abort 后无 response，code 为 ETIMEDOUT）、
+	 * 服务端瞬态错误（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;
-		const { status } = error.response ?? {};
+		if (!error.response)
+			return (
+				error.code === undefined ||
+				error.code === "ETIMEDOUT"
+			);
+		const { status } = error.response;
 		return (
 			status === 429 ||
 			status === 408 ||
+			(allowNotFound && status === 404) ||
 			(status !== undefined && status >= 500)
 		);
 	}
@@ -82,6 +101,7 @@ class MarketProvider extends BaseMarketProvider {
 		http: HTTP,
 		url: string,
 		config?: RequestConfig,
+		allowNotFound = false,
 	): Promise<T> {
 		for (let attempt = 0; ; attempt++) {
 			try {
@@ -91,7 +111,7 @@ class MarketProvider extends BaseMarketProvider {
 			} catch (error) {
 				if (
 					attempt >= maxRetries ||
-					!this.isRetryable(error)
+					!this.isRetryable(error, allowNotFound)
 				)
 					throw error;
 				const retryAfter = Number(
@@ -126,6 +146,8 @@ class MarketProvider extends BaseMarketProvider {
 			const result = await this.request<SearchResult>(
 				this.http,
 				"",
+				undefined,
+				true,
 			);
 			this.scanner.objects = result.objects.filter(
 				(object) => !object.ignored,