dsh-codex-subscription 1.12.2 → 1.13.0

package/lib/index.js

@@ -21,6 +21,40 @@ import { dirname, join, resolve } from "node:path";
 const VERSION = 1;
 const DEFAULT_LABEL = "Account 1";
 const clone$1 = (value) => value === void 0 ? void 0 : structuredClone(value);
+const EMAIL_MAX_LENGTH = 254;
+const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/u;
+/** Keep only a bounded, display-safe email address from a trusted OAuth result. */
+function normalizeAccountEmail(value) {
+	if (typeof value !== "string") return void 0;
+	const email = value.trim();
+	return email.length > 0 && email.length <= EMAIL_MAX_LENGTH && EMAIL_PATTERN.test(email) ? email : void 0;
+}
+function decodeJwtPayload(access) {
+	if (typeof access !== "string") return void 0;
+	const encoded = access.split(".")[1];
+	if (typeof encoded !== "string" || encoded.length === 0) return void 0;
+	try {
+		return JSON.parse(Buffer.from(encoded, "base64url").toString("utf8"));
+	} catch {
+		return;
+	}
+}
+function emailFromAccessToken(access) {
+	return normalizeAccountEmail(decodeJwtPayload(access)?.email);
+}
+/** Normalize the one non-secret account attribute that may cross the UI boundary. */
+function sanitizeOAuthCredential(value) {
+	const credential = assertOAuthCredential$1(value);
+	const email = emailFromAccessToken(credential.access) ?? normalizeAccountEmail(credential.email);
+	if (email === void 0) {
+		delete credential.email;
+		return credential;
+	}
+	return {
+		...credential,
+		email
+	};
+}
 function assertOAuthCredential$1(value) {
 	if (value === null || typeof value !== "object" || value.type !== "oauth" || typeof value.access !== "string" || value.access.length === 0 || typeof value.refresh !== "string" || value.refresh.length === 0 || typeof value.expires !== "number" || !Number.isFinite(value.expires)) throw new Error("Codex account vault received a malformed OAuth credential");
 	return clone$1(value);
@@ -48,7 +82,7 @@ function assertVaultRecord(record) {
 		return {
 			id: account.id,
 			label: normalizeLabel(account.label),
-			credential: assertOAuthCredential$1(account.credential)
+			credential: sanitizeOAuthCredential(account.credential)
 		};
 	});
 	if (!ids.has(record.payload.activeId)) throw new Error("Codex account vault active account is missing");
@@ -80,7 +114,7 @@ var PendingOAuthCredentialStore = class {
 	async modify(providerId, update) {
 		if (providerId !== "openai-codex") throw new Error("Pending Codex login received an unknown provider");
 		const next = await update(clone$1(this.#credential));
-		if (next !== void 0) this.#credential = assertOAuthCredential$1(next);
+		if (next !== void 0) this.#credential = sanitizeOAuthCredential(next);
 		return clone$1(this.#credential);
 	}
 	async delete(providerId) {
@@ -170,7 +204,8 @@ var DshOAuthAccountVault = class {
 				id: account.id,
 				label: account.label,
 				active: account.id === payload.activeId,
-				expiresAt: account.credential.expires
+				expiresAt: account.credential.expires,
+				...account.credential.email === void 0 ? {} : { email: account.credential.email }
 			}));
 		});
 	}
@@ -186,7 +221,7 @@ var DshOAuthAccountVault = class {
 	add(label, credential) {
 		return this.#enqueue(async () => {
 			const normalizedLabel = normalizeLabel(label);
-			const validated = assertOAuthCredential$1(credential);
+			const validated = sanitizeOAuthCredential(credential);
 			await this.#ensurePayload();
 			const id = this.createId();
 			const account = (await this.#modifyPayload((current) => ({
@@ -202,7 +237,8 @@ var DshOAuthAccountVault = class {
 				id,
 				label: account.label,
 				active: true,
-				expiresAt: account.credential.expires
+				expiresAt: account.credential.expires,
+				...account.credential.email === void 0 ? {} : { email: account.credential.email }
 			};
 		});
 	}
@@ -222,7 +258,7 @@ var DshOAuthAccountVault = class {
 			if (await this.#ensurePayload() === void 0) {
 				const initial = await update(void 0);
 				if (initial === void 0) return void 0;
-				const credential = assertOAuthCredential$1(initial);
+				const credential = sanitizeOAuthCredential(initial);
 				await this.credentials.set(this.legacyRef, JSON.stringify(credential));
 				await this.#ensurePayload();
 				return clone$1(credential);
@@ -236,7 +272,8 @@ var DshOAuthAccountVault = class {
 					result = previous;
 					return current;
 				}
-				const credential = assertOAuthCredential$1(next);
+				const credential = sanitizeOAuthCredential(next);
+				if (credential.email === void 0 && previous.email !== void 0) credential.email = previous.email;
 				const accounts = [...current.accounts];
 				accounts[index] = {
 					...accounts[index],
@@ -1265,7 +1302,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "1.12.2";
+const PACKAGE_VERSION = "1.13.0";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -2244,15 +2281,23 @@ function resetCreditsOf(value) {
 	if (value === void 0 || value === null) return void 0;
 	if (!record$1(value) || !Number.isSafeInteger(value.available_count) || value.available_count < 0) throw new Error("Codex returned malformed reset credit details");
 	if (value.credits !== void 0 && value.credits !== null && !Array.isArray(value.credits)) throw new Error("Codex returned malformed reset credit details");
-	const expirations = (value.credits ?? []).filter((credit) => record$1(credit) && credit.status?.toLowerCase?.() === "available").map((credit) => {
-		if (Number.isSafeInteger(credit.expires_at) && credit.expires_at > 0) return credit.expires_at * 1e3;
-		if (typeof credit.expires_at === "string" && credit.expires_at.length <= 64) {
+	const available = (value.credits ?? []).filter((credit) => record$1(credit) && credit.status?.toLowerCase?.() === "available").map((credit) => {
+		const name = typeof credit.title === "string" && credit.title.trim().length > 0 ? credit.title.trim().slice(0, 120) : void 0;
+		let expiresAt;
+		if (Number.isSafeInteger(credit.expires_at) && credit.expires_at > 0) expiresAt = credit.expires_at * 1e3;
+		else if (typeof credit.expires_at === "string" && credit.expires_at.length <= 64) {
 			const parsed = Date.parse(credit.expires_at);
-			if (Number.isFinite(parsed) && parsed > 0) return parsed;
+			if (Number.isFinite(parsed) && parsed > 0) expiresAt = parsed;
 		}
-	}).filter((expiration) => expiration !== void 0);
+		return {
+			...name === void 0 ? {} : { name },
+			...expiresAt === void 0 ? {} : { expiresAt }
+		};
+	});
+	const expirations = available.map((credit) => credit.expiresAt).filter((expiration) => expiration !== void 0);
 	return {
 		availableCount: value.available_count,
+		...available.length === 0 ? {} : { credits: available },
 		...expirations.length === 0 ? {} : { nextExpiresAt: Math.min(...expirations) }
 	};
 }
@@ -2691,10 +2736,13 @@ function parseDetails(value, now) {
 	if (available.length === 0) throw new Error("No usable quota reset is available");
 	return {
 		availableCount: value.available_count,
-		creditId: available[0].credit.id,
-		title: safeCopy(available[0].credit.title),
-		description: safeCopy(available[0].credit.description),
-		creditExpiresAt: available[0].expiresAt
+		credits: available.map(({ credit, expiresAt }, index) => ({
+			creditId: credit.id,
+			title: safeCopy(credit.title),
+			description: safeCopy(credit.description),
+			creditExpiresAt: expiresAt,
+			index
+		}))
 	};
 }
 function parseConsumeResult(value) {
@@ -2728,6 +2776,23 @@ function createCodexResetCreditService(options) {
 	const challengeTtlMs = options.challengeTtlMs ?? DEFAULT_CHALLENGE_TTL_MS;
 	const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
 	const challenges = /* @__PURE__ */ new Map();
+	const creditRefs = /* @__PURE__ */ new Map();
+	let creditRefSequence = 0;
+	const rememberCreditRef = (accountId, credit) => {
+		const ref = `${randomUUID$1()}-${++creditRefSequence}`;
+		creditRefs.set(ref, {
+			accountId,
+			creditId: credit.creditId,
+			index: credit.index
+		});
+		while (creditRefs.size > 64) creditRefs.delete(creditRefs.keys().next().value);
+		return ref;
+	};
+	const publicCredit = (accountId, credit) => ({
+		ref: rememberCreditRef(accountId, credit),
+		...credit.title === void 0 ? {} : { name: credit.title },
+		...credit.creditExpiresAt === void 0 ? {} : { expiresAt: credit.creditExpiresAt }
+	});
 	const resolveCredentials = async (signal) => credentialsOf(await getAuth({ signal }), await readCredential({ signal }));
 	const readDetails = async (signal, credentials) => {
 		const { access, accountId } = credentials ?? await resolveCredentials(signal);
@@ -2757,16 +2822,27 @@ function createCodexResetCreditService(options) {
 	};
 	return Object.freeze({
 		async inspect({ signal } = {}) {
-			const { details } = await readDetails(signal);
+			const { accountId, details } = await readDetails(signal);
 			return {
 				availableCount: details.availableCount,
-				...details.creditExpiresAt === void 0 ? {} : { nextExpiresAt: details.creditExpiresAt }
+				credits: details.credits.map((credit) => publicCredit(accountId, credit)),
+				...details.credits[0]?.creditExpiresAt === void 0 ? {} : { nextExpiresAt: details.credits[0].creditExpiresAt }
 			};
 		},
-		async prepare({ signal } = {}) {
+		async prepare({ creditRef, signal } = {}) {
 			const credentials = await resolveCredentials(signal);
 			for (const [challengeId, challenge] of challenges) {
-				if (challenge.accountId !== credentials.accountId || challenge.uncertain !== true) continue;
+				if (challenge.accountId === credentials.accountId && challenge.uncertain === false && challenge.creditRef === creditRef) if (now() > challenge.expiresAt) challenges.delete(challengeId);
+				else return {
+					challengeId,
+					availableCount: challenge.availableCount,
+					readyAt: challenge.readyAt,
+					expiresAt: challenge.expiresAt,
+					...challenge.creditExpiresAt === void 0 ? {} : { creditExpiresAt: challenge.creditExpiresAt },
+					...challenge.title === void 0 ? {} : { title: challenge.title },
+					...challenge.description === void 0 ? {} : { description: challenge.description }
+				};
+				if (challenge.accountId !== credentials.accountId || challenge.uncertain !== true || creditRef !== void 0 && challenge.creditRef !== creditRef) continue;
 				if (now() > challenge.expiresAt) {
 					challenges.delete(challengeId);
 					continue;
@@ -2782,22 +2858,31 @@ function createCodexResetCreditService(options) {
 				};
 			}
 			const { accountId, details } = await readDetails(signal, credentials);
+			let selected = details.credits[0];
+			if (creditRef !== void 0) {
+				const reference = typeof creditRef === "string" ? creditRefs.get(creditRef) : void 0;
+				if (reference === void 0 || reference.accountId !== accountId) throw new Error("This quota reset confirmation is no longer valid");
+				selected = details.credits.find((credit) => credit.creditId === reference.creditId && credit.index === reference.index);
+				if (selected === void 0) throw new Error("This quota reset confirmation is no longer valid");
+			}
+			if (selected === void 0) throw new Error("No usable quota reset is available");
 			const preparedAt = now();
 			const readyAt = preparedAt + confirmDelayMs;
-			const expiresAt = Math.min(preparedAt + challengeTtlMs, details.creditExpiresAt ?? Number.MAX_SAFE_INTEGER);
+			const expiresAt = Math.min(preparedAt + challengeTtlMs, selected.creditExpiresAt ?? Number.MAX_SAFE_INTEGER);
 			if (expiresAt <= readyAt) throw new Error("The available quota reset expires too soon");
 			const challengeId = randomUUID$1();
 			challenges.set(challengeId, {
 				state: "prepared",
 				accountId,
-				creditId: details.creditId,
+				creditRef,
+				creditId: selected.creditId,
 				redeemRequestId: randomUUID$1(),
 				readyAt,
 				expiresAt,
 				availableCount: details.availableCount,
-				creditExpiresAt: details.creditExpiresAt,
-				title: details.title,
-				description: details.description,
+				creditExpiresAt: selected.creditExpiresAt,
+				title: selected.title,
+				description: selected.description,
 				uncertain: false
 			});
 			return {
@@ -2805,9 +2890,9 @@ function createCodexResetCreditService(options) {
 				availableCount: details.availableCount,
 				readyAt,
 				expiresAt,
-				...details.creditExpiresAt === void 0 ? {} : { creditExpiresAt: details.creditExpiresAt },
-				...details.title === void 0 ? {} : { title: details.title },
-				...details.description === void 0 ? {} : { description: details.description }
+				...selected.creditExpiresAt === void 0 ? {} : { creditExpiresAt: selected.creditExpiresAt },
+				...selected.title === void 0 ? {} : { title: selected.title },
+				...selected.description === void 0 ? {} : { description: selected.description }
 			};
 		},
 		async consume({ challengeId, acknowledged, signal } = {}) {
@@ -2885,6 +2970,7 @@ function createCodexResetCreditService(options) {
 		},
 		clear() {
 			challenges.clear();
+			creditRefs.clear();
 		}
 	});
 }
@@ -3026,7 +3112,10 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 			signal.throwIfAborted();
 			return {
 				ok: true,
-				value: endpoint === "reset-credit/inspect" ? await resetCreditService.inspect({ signal }) : endpoint === "reset-credit/prepare" ? await resetCreditService.prepare({ signal }) : await resetCreditService.consume({
+				value: endpoint === "reset-credit/inspect" ? await resetCreditService.inspect({ signal }) : endpoint === "reset-credit/prepare" ? await resetCreditService.prepare({
+					creditRef: payload?.creditRef,
+					signal
+				}) : await resetCreditService.consume({
 					challengeId: payload?.challengeId,
 					acknowledged: payload?.acknowledged,
 					signal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "1.12.2",
+  "version": "1.13.0",
   "description": "Use ChatGPT and Codex subscriptions in DeepSeek Harness with OAuth, quota, safe resets, web search, images, and Fast mode",
   "type": "module",
   "main": "./lib/index.js",