@lyogvce/dsh-codex-subscription 0.2.8 → 0.2.9

package/lib/client.js

@@ -157,35 +157,49 @@ window.__ModuleLoader__.load({
 				loading: false,
 				error: null
 			};
+			let confirmedSessionFastModes = {};
+			let lastConfirmedFastSeq = 0;
+			const latestSeqBySession = new Map();
+			const pendingBySession = new Map();
 			let inflight = null;
 			let inflightForce = false;
 			let requestSeq = 0;
 			let fastModeSeq = 0;
+			let fastMutationEpoch = 0;
 			const listeners = new Set();
 			function setState(next) {
 				state = next;
 				for (const listener of listeners) listener();
 			}
+			function deriveSessionFastModes() {
+				if (pendingBySession.size === 0) return confirmedSessionFastModes;
+				const merged = { ...confirmedSessionFastModes };
+				for (const [k, pending] of pendingBySession) merged[k] = pending.enabled;
+				return merged;
+			}
+			function parseServerSessionFastModes(raw) {
+				if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+				const nextMap = {};
+				for (const [k, v] of Object.entries(raw)) if (typeof k === "string" && k !== "" && typeof v === "boolean") nextMap[k] = v;
+				return nextMap;
+			}
 			function mergeFastStateFromPayload(payload, allowSessionReplace) {
 				const defaultFastMode = typeof payload?.defaultFastMode === "boolean" ? payload.defaultFastMode : state.defaultFastMode;
-				if (allowSessionReplace && payload?.sessionFastModes && typeof payload.sessionFastModes === "object" && !Array.isArray(payload.sessionFastModes)) {
-					const nextMap = {};
-					for (const [k, v] of Object.entries(payload.sessionFastModes)) if (typeof k === "string" && k !== "" && typeof v === "boolean") nextMap[k] = v;
-					return {
-						defaultFastMode,
-						sessionFastModes: nextMap
-					};
+				if (allowSessionReplace) {
+					const parsedMap = parseServerSessionFastModes(payload?.sessionFastModes);
+					if (parsedMap !== void 0) confirmedSessionFastModes = parsedMap;
 				}
 				return {
 					defaultFastMode,
-					sessionFastModes: state.sessionFastModes
+					sessionFastModes: deriveSessionFastModes()
 				};
 			}
 			async function refresh(force = false) {
 				if (!force && state.quota !== null && nowFn() - state.quota.fetchedAt < ttlMs) return;
 				if (inflight !== null && (!force || inflightForce)) return inflight;
 				const seq = ++requestSeq;
-				const fastSeqAtStart = fastModeSeq;
+				const canReplaceFastAtStart = pendingBySession.size === 0;
+				const fastEpochAtStart = fastMutationEpoch;
 				inflightForce = force;
 				setState({
 					...state,
@@ -210,7 +224,7 @@ window.__ModuleLoader__.load({
 						}
 						const payload = await response.json();
 						if (seq !== requestSeq) return;
-						const fastState = mergeFastStateFromPayload(payload, fastSeqAtStart === fastModeSeq);
+						const fastState = mergeFastStateFromPayload(payload, canReplaceFastAtStart && pendingBySession.size === 0 && fastEpochAtStart === fastMutationEpoch);
 						if (payload && payload.ok === true && payload.quota) setState({
 							quota: payload.quota,
 							...fastState,
@@ -248,12 +262,26 @@ window.__ModuleLoader__.load({
 				const nextFastMode = Boolean(enabled);
 				const key = normalizeCodexSessionId(sessionId) ?? DEFAULT_SESSION_KEY;
 				const seq = ++fastModeSeq;
+				fastMutationEpoch += 1;
+				latestSeqBySession.set(key, seq);
+				pendingBySession.set(key, {
+					seq,
+					enabled: nextFastMode
+				});
+				const rollback = (errorMsg) => {
+					if (latestSeqBySession.get(key) !== seq) return;
+					fastMutationEpoch += 1;
+					pendingBySession.delete(key);
+					setState({
+						...state,
+						sessionFastModes: deriveSessionFastModes(),
+						error: errorMsg
+					});
+				};
 				setState({
 					...state,
-					sessionFastModes: {
-						...state.sessionFastModes,
-						[key]: nextFastMode
-					}
+					sessionFastModes: deriveSessionFastModes(),
+					error: null
 				});
 				try {
 					const response = await fetchFn(USAGE_ROUTE_PATH, {
@@ -267,13 +295,38 @@ window.__ModuleLoader__.load({
 							fastMode: nextFastMode
 						})
 					});
-					if (seq !== fastModeSeq || !response.ok) return;
+					if (latestSeqBySession.get(key) !== seq) return;
+					if (!response.ok) {
+						const errPayload = await response.json().catch(() => null);
+						rollback(typeof errPayload?.error === "string" && errPayload.error !== "" ? errPayload.error : `HTTP ${response.status}`);
+						return;
+					}
 					const payload = await response.json();
-					if (seq === fastModeSeq) setState({
+					if (latestSeqBySession.get(key) !== seq) return;
+					if (!payload || payload.ok === false) {
+						rollback(typeof payload?.error === "string" && payload.error !== "" ? payload.error : "Invalid response");
+						return;
+					}
+					fastMutationEpoch += 1;
+					pendingBySession.delete(key);
+					const parsedMap = parseServerSessionFastModes(payload.sessionFastModes);
+					if (seq > lastConfirmedFastSeq && parsedMap !== void 0) {
+						lastConfirmedFastSeq = seq;
+						confirmedSessionFastModes = parsedMap;
+					} else confirmedSessionFastModes = {
+						...confirmedSessionFastModes,
+						[key]: parsedMap?.[key] ?? nextFastMode
+					};
+					const defaultFastMode = typeof payload.defaultFastMode === "boolean" ? payload.defaultFastMode : state.defaultFastMode;
+					setState({
 						...state,
-						...mergeFastStateFromPayload(payload, true)
+						defaultFastMode,
+						sessionFastModes: deriveSessionFastModes(),
+						error: null
 					});
-				} catch {}
+				} catch (error) {
+					rollback(safeErrorMessage(error));
+				}
 			}
 			return {
 				getSnapshot: () => state,
@@ -359,6 +412,18 @@ window.__ModuleLoader__.load({
 			getSnapshot: () => null,
 			subscribe: () => () => {}
 		};
+		function renderFastBolt(size) {
+			return h("svg", {
+				className: "dsh-codex-quota-fast-bolt",
+				viewBox: "0 0 12 12",
+				width: size,
+				height: size,
+				"aria-hidden": true
+			}, h("path", {
+				d: "M6.8 1L2.5 6.8h3.1L4.8 11l4.7-5.8H6.4L6.8 1z",
+				fill: "currentColor"
+			}));
+		}
 		function CodexQuotaPill(props) {
 			const { sessionId, quotaStore, getModelStore, useProjection, useSession, t, getLocale } = props;
 			const modelStore = getModelStore(sessionId);
@@ -462,16 +527,7 @@ window.__ModuleLoader__.load({
 				r: 5.5,
 				strokeDasharray: ringDash,
 				transform: "rotate(-90 7 7)"
-			})), isFastMode ? h("svg", {
-				className: "dsh-codex-quota-fast-bolt",
-				viewBox: "0 0 12 12",
-				width: 11,
-				height: 11,
-				"aria-hidden": true
-			}, h("path", {
-				d: "M6.8 1L2.5 6.8h3.1L4.8 11l4.7-5.8H6.4L6.8 1z",
-				fill: "currentColor"
-			})) : null, h("span", { className: "dsh-codex-quota-text" }, pillText)), open ? h("div", {
+			})), isFastMode ? renderFastBolt(11) : null, h("span", { className: "dsh-codex-quota-text" }, pillText)), open ? h("div", {
 				className: "dsh-codex-quota-popover",
 				role: "dialog",
 				"aria-label": t("quota.title"),
@@ -485,16 +541,7 @@ window.__ModuleLoader__.load({
 				onClick: () => {
 					quotaStore.refresh(true);
 				}
-			}, quotaSnap.loading ? t("quota.refreshing") : t("quota.refresh"))), quota !== null ? renderWindowSection(formatWindowTitle(quota.primary.windowSeconds, locale, DEFAULT_PRIMARY_WINDOW_SECONDS), quota.primary, primaryReached) : quotaSnap.loading || quotaSnap.error === null ? h("div", { className: "dsh-codex-quota-meta" }, t("quota.loading")) : null, quota?.secondary !== null && quota?.secondary !== void 0 ? renderWindowSection(formatWindowTitle(quota.secondary.windowSeconds, locale, DEFAULT_SECONDARY_WINDOW_SECONDS), quota.secondary, secondaryReached) : null, h("div", { className: "dsh-codex-fast-row" }, h("div", { className: "dsh-codex-fast-info" }, h("div", { className: "dsh-codex-fast-title" }, h("svg", {
-				className: "dsh-codex-quota-fast-bolt",
-				viewBox: "0 0 12 12",
-				width: 12,
-				height: 12,
-				"aria-hidden": true
-			}, h("path", {
-				d: "M6.8 1L2.5 6.8h3.1L4.8 11l4.7-5.8H6.4L6.8 1z",
-				fill: "currentColor"
-			})), h("span", null, t("quota.fastTitle"))), h("div", { className: "dsh-codex-fast-desc" }, t("quota.fastDesc"))), h("button", {
+			}, quotaSnap.loading ? t("quota.refreshing") : t("quota.refresh"))), quota !== null ? renderWindowSection(formatWindowTitle(quota.primary.windowSeconds, locale, DEFAULT_PRIMARY_WINDOW_SECONDS), quota.primary, primaryReached) : quotaSnap.loading || quotaSnap.error === null ? h("div", { className: "dsh-codex-quota-meta" }, t("quota.loading")) : null, quota?.secondary !== null && quota?.secondary !== void 0 ? renderWindowSection(formatWindowTitle(quota.secondary.windowSeconds, locale, DEFAULT_SECONDARY_WINDOW_SECONDS), quota.secondary, secondaryReached) : null, h("div", { className: "dsh-codex-fast-row" }, h("div", { className: "dsh-codex-fast-info" }, h("div", { className: "dsh-codex-fast-title" }, renderFastBolt(12), h("span", null, t("quota.fastTitle"))), h("div", { className: "dsh-codex-fast-desc" }, t("quota.fastDesc"))), h("button", {
 				type: "button",
 				role: "switch",
 				className: "dsh-codex-fast-switch",

package/lib/index.js

@@ -35,6 +35,8 @@ const DEFAULT_DISABLED_MODELS = Object.freeze([
 function parseRawModelsCache(rawText) {
 	const parsed = JSON.parse(rawText);
 	if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) throw new SyntaxError("models_cache.json root must be a JSON object");
+	const models = parsed.models;
+	if (!Array.isArray(models) || !models.some((entry) => entry !== null && typeof entry === "object" && typeof entry.slug === "string" && entry.slug.trim() !== "" && entry.visibility === "list")) throw new SyntaxError("models_cache.json must contain at least one visible model entry");
 	return parsed;
 }
 function normalizeCodexSessionId(sessionId) {
@@ -94,7 +96,7 @@ function resolveFastServiceTier(entry) {
 		if (entry.service_tiers.length === 0 && Array.isArray(entry.additional_speed_tiers)) return entry.additional_speed_tiers.some((t) => typeof t === "string" && t.trim().toLowerCase() === "fast") ? "priority" : void 0;
 		return;
 	}
-	if (Array.isArray(entry.additional_speed_tiers) && entry.additional_speed_tiers.some((t) => typeof t === "string" && t.trim().toLowerCase() === "fast")) return "priority";
+	if (Array.isArray(entry.additional_speed_tiers)) return entry.additional_speed_tiers.some((t) => typeof t === "string" && t.trim().toLowerCase() === "fast") ? "priority" : void 0;
 	return "priority";
 }
 function parseModelsCache(rawCache, baseModels, disabledModels = [], contextWindows = {}) {
@@ -218,7 +220,7 @@ function sanitizeCodexPayload(payload, modelMeta, fastMode = false) {
 		const tier = modelMeta === void 0 ? "priority" : modelMeta.fastServiceTier;
 		if (typeof tier === "string" && tier !== "") cleaned.service_tier = tier;
 		else delete cleaned.service_tier;
-	} else if (cleaned.service_tier !== "priority" && cleaned.service_tier !== "ultrafast") delete cleaned.service_tier;
+	} else delete cleaned.service_tier;
 	const currentText = cleaned.text && typeof cleaned.text === "object" && !Array.isArray(cleaned.text) ? { ...cleaned.text } : void 0;
 	if (modelMeta?.supportVerbosity === false) {
 		if (currentText !== void 0) {
@@ -591,6 +593,12 @@ const DEFAULT_SESSION_KEY = "__default__";
 function resolvePluginCacheDir(codexHome) {
 	return join(codexHome, PLUGIN_CACHE_DIR_NAME);
 }
+function sliceUtf8Prefix(buf, maxBytes) {
+	if (buf.length <= maxBytes) return buf;
+	let end = maxBytes;
+	while (end > 0 && (buf[end] & 192) === 128) end -= 1;
+	return buf.subarray(0, end);
+}
 function appendPluginLog(codexHome, ctx, level, event, detail) {
 	const line = `[${new Date().toISOString()}] [${level}] ${event} ${JSON.stringify(detail)}\n`;
 	if (level === "ERROR") {
@@ -598,6 +606,7 @@ function appendPluginLog(codexHome, ctx, level, event, detail) {
 		else console.error(`[dsh-codex-subscription] ${event}: ${JSON.stringify(detail)}`);
 	} else if (level === "WARN") {
 		if (typeof ctx.logger?.warn === "function") ctx.logger.warn(`[dsh-codex-subscription] ${event}: ${JSON.stringify(detail)}`);
+		else console.warn(`[dsh-codex-subscription] ${event}: ${JSON.stringify(detail)}`);
 	}
 	try {
 		const cacheDir = resolvePluginCacheDir(codexHome);
@@ -606,18 +615,24 @@ function appendPluginLog(codexHome, ctx, level, event, detail) {
 			mode: 448
 		});
 		const logPath = join(cacheDir, LOG_FILE_NAME);
+		const rawLineBuf = Buffer.from(line, "utf8");
+		const lineBuf = rawLineBuf.length <= MAX_LOG_FILE_BYTES ? rawLineBuf : Buffer.concat([sliceUtf8Prefix(rawLineBuf, 524287), Buffer.from("\n", "utf8")]);
+		let st;
 		try {
-			if (statSync(logPath).size > MAX_LOG_FILE_BYTES) {
-				const buf = readFileSync(logPath);
-				const halfOffset = Math.max(0, buf.length - Math.floor(MAX_LOG_FILE_BYTES / 2));
-				const newlineIdx = buf.indexOf(10, halfOffset);
-				writeFileAtomicSync(logPath, buf.subarray(newlineIdx >= 0 && newlineIdx + 1 < buf.length ? newlineIdx + 1 : halfOffset));
-			}
-		} catch {}
-		appendFileSync(logPath, line, {
-			encoding: "utf8",
-			mode: 384
-		});
+			st = statSync(logPath);
+		} catch {
+			st = void 0;
+		}
+		if (st !== void 0 && st.size + lineBuf.length > MAX_LOG_FILE_BYTES) {
+			const buf = readFileSync(logPath);
+			const keepBudget = Math.max(0, Math.floor(MAX_LOG_FILE_BYTES / 2) - lineBuf.length);
+			const startOffset = Math.max(0, buf.length - keepBudget);
+			const newlineIdx = keepBudget > 0 ? buf.indexOf(10, startOffset) : -1;
+			const tail = newlineIdx >= 0 && newlineIdx + 1 < buf.length ? buf.subarray(newlineIdx + 1) : Buffer.alloc(0);
+			writeFileAtomicSync(logPath, Buffer.concat([tail, lineBuf]));
+			return;
+		}
+		appendFileSync(logPath, lineBuf, { mode: 384 });
 	} catch {}
 }
 function readBackupCache(codexHome) {
@@ -627,10 +642,12 @@ function readBackupCache(codexHome) {
 		return;
 	}
 }
-function writeBackupCache(codexHome, raw) {
+function writeBackupCache(codexHome, ctx, raw) {
 	try {
 		writeFileAtomicSync(join(resolvePluginCacheDir(codexHome), BACKUP_CACHE_FILE_NAME), `${JSON.stringify(raw, null, 2)}\n`);
-	} catch {}
+	} catch (error) {
+		appendPluginLog(codexHome, ctx, "WARN", "catalog.backup_write_error", { error: safeErrorMessage(error) });
+	}
 }
 function readPersistedSessionFastModes(codexHome) {
 	const result = new Map();
@@ -642,10 +659,12 @@ function readPersistedSessionFastModes(codexHome) {
 	} catch {}
 	return result;
 }
-function writePersistedSessionFastModes(codexHome, sessionFastModes) {
+function writePersistedSessionFastModes(codexHome, ctx, sessionFastModes) {
 	try {
 		writeFileAtomicSync(join(resolvePluginCacheDir(codexHome), RUNTIME_STATE_FILE_NAME), `${JSON.stringify({ sessionFastModes: Object.fromEntries(sessionFastModes) }, null, 2)}\n`);
-	} catch {}
+	} catch (error) {
+		appendPluginLog(codexHome, ctx, "WARN", "fast_mode.persist_error", { error: safeErrorMessage(error) });
+	}
 }
 const Config = z.object({
 	fastMode: z.boolean().default(false).description("新会话默认是否开启 Fast 极速模式（未填时默认 false；单会话可在右下角限额弹窗内独立切换）").volatile(),
@@ -706,7 +725,7 @@ function apply(ctx, config = {}) {
 			if (oldest === void 0) break;
 			sessionFastModes.delete(oldest);
 		}
-		writePersistedSessionFastModes(codexHome, sessionFastModes);
+		writePersistedSessionFastModes(codexHome, ctx, sessionFastModes);
 		appendPluginLog(codexHome, ctx, "INFO", "fast_mode.updated", {
 			sessionId: key,
 			fastMode: nextFastMode
@@ -719,6 +738,7 @@ function apply(ctx, config = {}) {
 	});
 	let fileSignature;
 	let cachedRaw;
+	let lastRejectedRaw;
 	let rawRevision = 0;
 	let snapshotSignature;
 	let currentCatalog = {
@@ -782,6 +802,7 @@ function apply(ctx, config = {}) {
 		const contextWindows = getContextWindows();
 		const setActiveRaw = (next) => {
 			cachedRaw = next;
+			lastRejectedRaw = void 0;
 			rawRevision += 1;
 		};
 		const tryRestoreFromBackup = (extra, minVersion) => {
@@ -820,16 +841,20 @@ function apply(ctx, config = {}) {
 				fileSignature = nextFileSig;
 				try {
 					const incomingRaw = parseRawModelsCache(readFileSync(cachePath, "utf8"));
-					if (cachedRaw !== void 0 && compareClientVersions(incomingRaw.client_version, cachedRaw.client_version) < 0) appendPluginLog(codexHome, ctx, "WARN", "catalog.downgrade_rejected", {
-						cachePath,
-						keptVersion: cachedRaw.client_version ?? "0.163.0",
-						rejectedVersion: incomingRaw.client_version ?? "unknown",
-						incomingFetchedAt: incomingRaw.fetched_at ?? null
-					});
-					else if (cachedRaw !== void 0 || !tryRestoreFromBackup({ diskVersion: incomingRaw.client_version ?? "unknown" }, incomingRaw.client_version)) {
+					if (cachedRaw !== void 0 && compareClientVersions(incomingRaw.client_version, cachedRaw.client_version) < 0) {
+						if (!isSameModelsCatalogPayload(lastRejectedRaw, incomingRaw)) {
+							lastRejectedRaw = incomingRaw;
+							appendPluginLog(codexHome, ctx, "WARN", "catalog.downgrade_rejected", {
+								cachePath,
+								keptVersion: cachedRaw.client_version ?? "0.163.0",
+								rejectedVersion: incomingRaw.client_version ?? "unknown",
+								incomingFetchedAt: incomingRaw.fetched_at ?? null
+							});
+						}
+					} else if (cachedRaw !== void 0 || !tryRestoreFromBackup({ diskVersion: incomingRaw.client_version ?? "unknown" }, incomingRaw.client_version)) {
 						if (!isSameModelsCatalogPayload(cachedRaw, incomingRaw)) {
 							setActiveRaw(incomingRaw);
-							writeBackupCache(codexHome, incomingRaw);
+							writeBackupCache(codexHome, ctx, incomingRaw);
 							appendPluginLog(codexHome, ctx, "INFO", "catalog.load", {
 								cachePath,
 								clientVersion: incomingRaw.client_version ?? "0.163.0",
@@ -917,8 +942,21 @@ function apply(ctx, config = {}) {
 			requestBody: "buffered",
 			fetch: async (request) => {
 				if (request.method === "POST") {
-					const body = await request.json().catch(() => null);
-					if (typeof body?.fastMode === "boolean") setSessionFastMode(typeof body.sessionId === "string" ? body.sessionId : void 0, body.fastMode);
+					let body;
+					try {
+						body = await request.json();
+					} catch {
+						body = null;
+					}
+					const record = body !== null && typeof body === "object" && !Array.isArray(body) ? body : null;
+					if (record === null || typeof record.fastMode !== "boolean" || record.sessionId !== void 0 && typeof record.sessionId !== "string") return new Response(JSON.stringify({
+						ok: false,
+						error: "Invalid request body: boolean fastMode is required"
+					}), {
+						status: 400,
+						headers: { "content-type": "application/json" }
+					});
+					setSessionFastMode(record.sessionId, record.fastMode);
 					return new Response(JSON.stringify({
 						ok: true,
 						defaultFastMode: getConfigFastMode(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lyogvce/dsh-codex-subscription",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "复用本机 ~/.codex 订阅凭证与 models_cache.json 模型缓存，在 DSH 中通过 SSE 直连调用 Codex 模型。",
   "type": "module",
   "main": "./lib/index.js",