refactor: extract runtime email hydration

Author: ndycode

index.ts

@@ -183,6 +183,7 @@ import {
 import { buildCapabilityBoostByAccount } from "./lib/runtime/capability-boost.js";
 import { createRuntimeEventHandler } from "./lib/runtime/event-handler.js";
 import { createFlaggedVerificationState } from "./lib/runtime/flagged-verify-types.js";
+import { hydrateRuntimeEmails } from "./lib/runtime/hydrate-emails.js";
 import { ensureRuntimeLiveAccountSync } from "./lib/runtime/live-sync.js";
 import { buildManualOAuthFlow } from "./lib/runtime/manual-oauth-flow.js";
 import {
@@ -346,75 +347,17 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 
 	const hydrateEmails = async (
 		storage: AccountStorageV3 | null,
-	): Promise<AccountStorageV3 | null> => {
-		if (!storage) return storage;
-		const skipHydrate =
-			process.env.VITEST_WORKER_ID !== undefined ||
-			process.env.NODE_ENV === "test" ||
-			process.env.CODEX_SKIP_EMAIL_HYDRATE === "1";
-		if (skipHydrate) return storage;
-
-		const accountsCopy = storage.accounts.map((account) =>
-			account ? { ...account } : account,
-		);
-		const accountsToHydrate = accountsCopy.filter(
-			(account) => account && !account.email,
-		);
-		if (accountsToHydrate.length === 0) return storage;
-
-		let changed = false;
-		await Promise.all(
-			accountsToHydrate.map(async (account) => {
-				try {
-					const refreshed = await queuedRefresh(account.refreshToken);
-					if (refreshed.type !== "success") return;
-					const id = extractAccountId(refreshed.access);
-					const email = sanitizeEmail(
-						extractAccountEmail(refreshed.access, refreshed.idToken),
-					);
-					if (
-						id &&
-						id !== account.accountId &&
-						shouldUpdateAccountIdFromToken(
-							account.accountIdSource,
-							account.accountId,
-						)
-					) {
-						account.accountId = id;
-						account.accountIdSource = "token";
-						changed = true;
-					}
-					if (email && email !== account.email) {
-						account.email = email;
-						changed = true;
-					}
-					if (refreshed.access && refreshed.access !== account.accessToken) {
-						account.accessToken = refreshed.access;
-						changed = true;
-					}
-					if (
-						typeof refreshed.expires === "number" &&
-						refreshed.expires !== account.expiresAt
-					) {
-						account.expiresAt = refreshed.expires;
-						changed = true;
-					}
-					if (refreshed.refresh && refreshed.refresh !== account.refreshToken) {
-						account.refreshToken = refreshed.refresh;
-						changed = true;
-					}
-				} catch {
-					logWarn(`[${PLUGIN_NAME}] Failed to hydrate email for account`);
-				}
-			}),
-		);
-
-		if (changed) {
-			storage.accounts = accountsCopy;
-			await saveAccounts(storage);
-		}
-		return storage;
-	};
+	): Promise<AccountStorageV3 | null> =>
+		hydrateRuntimeEmails(storage, {
+			queuedRefresh,
+			extractAccountId,
+			sanitizeEmail,
+			extractAccountEmail,
+			shouldUpdateAccountIdFromToken,
+			saveAccounts,
+			logWarn,
+			pluginName: PLUGIN_NAME,
+		});
 
 	const applyUiRuntimeFromConfig = (
 		pluginConfig: ReturnType<typeof loadPluginConfig>,

lib/runtime/hydrate-emails.ts

@@ -0,0 +1,92 @@
+import type { AccountStorageV3 } from "../storage.js";
+import type { AccountIdSource, TokenResult } from "../types.js";
+
+export async function hydrateRuntimeEmails(
+	storage: AccountStorageV3 | null,
+	deps: {
+		queuedRefresh: (refreshToken: string) => Promise<TokenResult>;
+		extractAccountId: (accessToken: string | undefined) => string | undefined;
+		sanitizeEmail: (email: string | undefined) => string | undefined;
+		extractAccountEmail: (
+			accessToken: string | undefined,
+			idToken?: string | undefined,
+		) => string | undefined;
+		shouldUpdateAccountIdFromToken: (
+			accountIdSource: AccountIdSource | undefined,
+			accountId: string | undefined,
+		) => boolean;
+		saveAccounts: (storage: AccountStorageV3) => Promise<void>;
+		logWarn: (message: string) => void;
+		pluginName: string;
+	},
+): Promise<AccountStorageV3 | null> {
+	if (!storage) return storage;
+	const skipHydrate =
+		process.env.VITEST_WORKER_ID !== undefined ||
+		process.env.NODE_ENV === "test" ||
+		process.env.CODEX_SKIP_EMAIL_HYDRATE === "1";
+	if (skipHydrate) return storage;
+
+	const accountsCopy = storage.accounts.map((account) =>
+		account ? { ...account } : account,
+	);
+	const accountsToHydrate = accountsCopy.filter(
+		(account) => account && !account.email,
+	);
+	if (accountsToHydrate.length === 0) return storage;
+
+	let changed = false;
+	await Promise.all(
+		accountsToHydrate.map(async (account) => {
+			try {
+				const refreshed = await deps.queuedRefresh(account.refreshToken);
+				if (refreshed.type !== "success") return;
+				const id = deps.extractAccountId(refreshed.access);
+				const email = deps.sanitizeEmail(
+					deps.extractAccountEmail(refreshed.access, refreshed.idToken),
+				);
+				if (
+					id &&
+					id !== account.accountId &&
+					deps.shouldUpdateAccountIdFromToken(
+						account.accountIdSource,
+						account.accountId,
+					)
+				) {
+					account.accountId = id;
+					account.accountIdSource = "token";
+					changed = true;
+				}
+				if (email && email !== account.email) {
+					account.email = email;
+					changed = true;
+				}
+				if (refreshed.access && refreshed.access !== account.accessToken) {
+					account.accessToken = refreshed.access;
+					changed = true;
+				}
+				if (
+					typeof refreshed.expires === "number" &&
+					refreshed.expires !== account.expiresAt
+				) {
+					account.expiresAt = refreshed.expires;
+					changed = true;
+				}
+				if (refreshed.refresh && refreshed.refresh !== account.refreshToken) {
+					account.refreshToken = refreshed.refresh;
+					changed = true;
+				}
+			} catch {
+				deps.logWarn(
+					`[${deps.pluginName}] Failed to hydrate email for account`,
+				);
+			}
+		}),
+	);
+
+	if (changed) {
+		storage.accounts = accountsCopy;
+		await deps.saveAccounts(storage);
+	}
+	return storage;
+}