@koishi-ce/plugin-market 1.0.12 → 1.0.13

package/lib/index.d.ts

@@ -113,6 +113,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

@@ -359,10 +359,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.13",
     "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(
@@ -1014,9 +1014,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 +1070,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

@@ -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

@@ -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 ||