dsh-sub2api-sync 0.2.2 → 0.2.4

package/lib/icon.d.ts

@@ -41,9 +41,19 @@ export declare function parseSiteTitle(html: string): string | undefined;
  * the closure, so the icon and site-name consumers share one HTML read per
  * TTL window. Errors never throw — an unavailable answer resolves to
  * `undefined` and the client keeps its fallbacks.
+ *
+ * Title caching is two-tier: a RESOLVED title rides the shared 10-minute
+ * window, while a title-less result is only trusted for
+ * {@link NEGATIVE_TTL_MS} and one in-call retry backs the first read — the
+ * login-to-first-sync window is exactly when a cold connection would
+ * otherwise brand every provider with the `sub2api` fallback name.
  */
 export declare function createInstanceProbe(options?: {
     fetchImpl?: typeof fetch;
+    /** Test knob: the title-less retry wait (default {@link RETRY_DELAY_MS}). */
+    retryDelayMs?: number;
+    /** Test knob: the title-less negative-cache window (default {@link NEGATIVE_TTL_MS}). */
+    negativeTtlMs?: number;
 }): {
     icon: (instance: string) => Promise<IconPayload | undefined>;
     siteName: (instance: string) => Promise<string | undefined>;

package/lib/index.js

@@ -305,12 +305,13 @@ function buildProviderProfile(input) {
 	const reasoning = input.template?.reasoningEfforts;
 	const override = input.retryPolicy ?? {};
 	const retryPolicy = {
-		...SUB2API_RETRY_POLICY,
-		...override,
-		retryableCodes: [...override.retryableCodes ?? SUB2API_RETRY_POLICY.retryableCodes],
+		mode: override.mode ?? SUB2API_RETRY_POLICY.mode,
+		maxRetries: override.maxRetries ?? SUB2API_RETRY_POLICY.maxRetries,
+		retryableCodes: override.retryableCodes !== undefined && override.retryableCodes.length > 0 ? [...override.retryableCodes] : [...SUB2API_RETRY_POLICY.retryableCodes],
 		backoff: {
-			...SUB2API_RETRY_POLICY.backoff,
-			...override.backoff
+			initialDelayMs: override.backoff?.initialDelayMs ?? SUB2API_RETRY_POLICY.backoff.initialDelayMs,
+			maxDelayMs: override.backoff?.maxDelayMs ?? SUB2API_RETRY_POLICY.backoff.maxDelayMs,
+			jitterRatio: override.backoff?.jitterRatio ?? SUB2API_RETRY_POLICY.backoff.jitterRatio
 		}
 	};
 	return {
@@ -894,6 +895,7 @@ var Sub2apiSyncEngine = class {
 		const site = await this.siteName?.().catch(() => undefined);
 		const syncWarnings = [];
 		if (keyWalkTruncated) syncWarnings.push("面板 key 数量超过单次同步的读取上限（10 页 × 100 = 1000 把）——超出部分未参与同步，也不会被移除");
+		if (site === undefined && this.siteName !== undefined && (config.providerNameTemplate ?? "").includes("{siteName}")) syncWarnings.push("实例站点名探测失败（实例不可达或页面 <title> 缺失）——displayName 暂用回退名 sub2api，站点名可解析后的同步会自动更正");
 		const effective = {
 			...config,
 			selectedKeys: selection ?? config.selectedKeys
@@ -1167,6 +1169,14 @@ else if (isOwnedRoute(route)) {
 //#region src/icon.ts
 /** How long a resolved icon URL is trusted before re-reading the HTML. */
 const URL_TTL_MS = 6e5;
+/** How long a TITLE-LESS probe result is trusted before re-reading: the sync
+* that renders `{siteName}` must not pin a 10-minute negative on a cold
+* connection, or the first sync after login names every provider with the
+* `sub2api` fallback until the cache expires. */
+const NEGATIVE_TTL_MS = 15e3;
+/** One in-call retry wait when a fresh probe still answers without a title
+* (cold DNS/TLS or a momentary gateway hiccup — not proof the title is absent). */
+const RETRY_DELAY_MS = 1200;
 /** Discovery + byte fetches cap, so an offline instance cannot stall callers. */
 const TIMEOUT_MS = 2500;
 /** Refuse to proxy absurd payloads. */
@@ -1251,6 +1261,8 @@ function guessContentType(url) {
 }
 function createInstanceProbe(options = {}) {
 	const fetchImpl = options.fetchImpl ?? globalThis.fetch;
+	const retryDelayMs = options.retryDelayMs ?? RETRY_DELAY_MS;
+	const negativeTtlMs = options.negativeTtlMs ?? NEGATIVE_TTL_MS;
 	const cache = new Map();
 	const metaOf = async (instance) => {
 		const base = instance.trim().replace(/\/+$/, "");
@@ -1265,6 +1277,9 @@ function createInstanceProbe(options = {}) {
 		});
 		return meta;
 	};
+	const wait = (ms) => new Promise((resolve) => {
+		setTimeout(resolve, ms);
+	});
 	return {
 		icon: async (instance) => {
 			const meta = await metaOf(instance);
@@ -1283,7 +1298,27 @@ function createInstanceProbe(options = {}) {
 				return undefined;
 			}
 		},
-		siteName: async (instance) => (await metaOf(instance))?.title
+		siteName: async (instance) => {
+			const base = instance.trim().replace(/\/+$/, "");
+			if (!/^https?:\/\//i.test(base)) return undefined;
+			const now = Date.now();
+			const hit = cache.get(base);
+			if (hit !== undefined && hit.meta.title !== undefined && now - hit.at < URL_TTL_MS) return hit.meta.title;
+			if (hit !== undefined && hit.meta.title === undefined && now - hit.at < negativeTtlMs) return undefined;
+			const first = await probeInstance(base, fetchImpl);
+			cache.set(base, {
+				meta: first,
+				at: Date.now()
+			});
+			if (first.title !== undefined) return first.title;
+			await wait(retryDelayMs);
+			const second = await probeInstance(base, fetchImpl);
+			cache.set(base, {
+				meta: second,
+				at: Date.now()
+			});
+			return second.title;
+		}
 	};
 }
 
@@ -2635,6 +2670,14 @@ function apply(ctx, config) {
 	const mutateOwn = (ops) => mutateWithRetry(ctx.settings, OWN_NS, () => ops, { missingError: "sub2api-sync: 自身 settings 命名空间未注册" });
 	const instance = () => source().baseURL?.trim() ?? "";
 	const instanceProbe = createInstanceProbe();
+	/** Warm the site-name cache at auth events. The first sync right after a
+	* login/authorization renders `{siteName}` — a cold probe there would
+	* brand the providers with the `sub2api` fallback name. Fire-and-forget:
+	* the probe's own negative-TTL window bounds any retry fetching. */
+	const warmProbe = () => {
+		const base = instance();
+		if (/^https?:\/\//i.test(base)) void instanceProbe.siteName(base).catch(() => undefined);
+	};
 	const oauthAttempts = new OAuthAttemptStore();
 	const deps = {
 		instance,
@@ -2649,6 +2692,7 @@ function apply(ctx, config) {
 				value: email
 			}]).catch(() => undefined);
 			const outcome = await gateway.login(email, pwd);
+			warmProbe();
 			if (outcome.kind === "2fa") {
 				pendingTypedPassword = typed;
 				return {
@@ -2666,6 +2710,7 @@ function apply(ctx, config) {
 		},
 		login2FA: async (code) => {
 			await gateway.login2FA(code);
+			warmProbe();
 			if (pendingTypedPassword !== undefined) {
 				await credentials.set(panelPasswordRef(instance()), pendingTypedPassword).catch(() => undefined);
 				pendingTypedPassword = undefined;
@@ -2824,6 +2869,7 @@ function apply(ctx, config) {
 				});
 				await gateway.storeOAuthTokens(pair);
 				oauthAttempts.settle(attempt.id, "completed");
+				warmProbe();
 				const successMessage = lang === "en" ? "You can close this page and return to the desktop app to continue." : "你可以关闭此页面，返回桌面端继续工作。";
 				return { html: callbackPageHtml("success", successMessage, lang) };
 			} catch (cause) {
@@ -2833,6 +2879,7 @@ function apply(ctx, config) {
 			}
 		},
 		oauthStatus: async (attemptId) => {
+			warmProbe();
 			const attempt = attemptId !== undefined ? oauthAttempts.peek(attemptId) : undefined;
 			const email = source().email;
 			return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-sub2api-sync",
   "description": "Sync one sub2api instance's groups, keys, and models into dsh-llm-pi-ai provider routes: panel-driven login (password / OAuth), one relay key one provider.",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "license": "MIT",
   "author": "Shuai-S",
   "homepage": "https://github.com/Shuai-S/dsh-sub2api-sync#readme",