refactor: extract runtime account manager cache

Author: ndycode

index.ts

@@ -160,6 +160,10 @@ import { applyFastSessionDefaults } from "./lib/request/request-transformer.js";
 import { isEmptyResponse } from "./lib/request/response-handler.js";
 import { withStreamingFailover } from "./lib/request/stream-failover.js";
 import { addJitter } from "./lib/rotation.js";
+import {
+	invalidateRuntimeAccountManagerCache,
+	reloadRuntimeAccountManager,
+} from "./lib/runtime/account-manager-cache.js";
 import { persistAccountPool } from "./lib/runtime/account-pool.js";
 import { applyAccountStorageScope } from "./lib/runtime/account-scope.js";
 import { handleAccountSelectEvent } from "./lib/runtime/account-select-event.js";
@@ -413,28 +417,33 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 	): string => getRuntimeStatusMarker(ui, status);
 
 	const invalidateAccountManagerCache = (): void => {
-		cachedAccountManager = null;
-		accountManagerPromise = null;
+		invalidateRuntimeAccountManagerCache({
+			setCachedAccountManager: (value) => {
+				cachedAccountManager = value as AccountManager | null;
+			},
+			setAccountManagerPromise: (value) => {
+				accountManagerPromise = value as Promise<AccountManager> | null;
+			},
+		});
 	};
 
 	const reloadAccountManagerFromDisk = async (
 		authFallback?: OAuthAuthDetails,
-	): Promise<AccountManager> => {
-		if (accountReloadInFlight) {
-			return accountReloadInFlight;
-		}
-		accountReloadInFlight = (async () => {
-			const reloaded = await AccountManager.loadFromDisk(authFallback);
-			cachedAccountManager = reloaded;
-			accountManagerPromise = Promise.resolve(reloaded);
-			return reloaded;
-		})();
-		try {
-			return await accountReloadInFlight;
-		} finally {
-			accountReloadInFlight = null;
-		}
-	};
+	): Promise<AccountManager> =>
+		reloadRuntimeAccountManager<AccountManager>({
+			currentReloadInFlight: accountReloadInFlight,
+			loadFromDisk: (fallback) => AccountManager.loadFromDisk(fallback),
+			setCachedAccountManager: (value) => {
+				cachedAccountManager = value;
+			},
+			setAccountManagerPromise: (value) => {
+				accountManagerPromise = value;
+			},
+			setReloadInFlight: (value) => {
+				accountReloadInFlight = value;
+			},
+			authFallback,
+		});
 
 	const applyStorageScope = (
 		pluginConfig: ReturnType<typeof loadPluginConfig>,

lib/runtime/account-manager-cache.ts

@@ -0,0 +1,36 @@
+import type { OAuthAuthDetails } from "../types.js";
+
+export function invalidateRuntimeAccountManagerCache(deps: {
+	setCachedAccountManager: (value: unknown) => void;
+	setAccountManagerPromise: (value: Promise<unknown> | null) => void;
+}): void {
+	deps.setCachedAccountManager(null);
+	deps.setAccountManagerPromise(null);
+}
+
+export async function reloadRuntimeAccountManager<TAccountManager>(deps: {
+	currentReloadInFlight: Promise<TAccountManager> | null;
+	loadFromDisk: (authFallback?: OAuthAuthDetails) => Promise<TAccountManager>;
+	setCachedAccountManager: (value: TAccountManager) => void;
+	setAccountManagerPromise: (value: Promise<TAccountManager> | null) => void;
+	setReloadInFlight: (value: Promise<TAccountManager> | null) => void;
+	authFallback?: OAuthAuthDetails;
+}): Promise<TAccountManager> {
+	if (deps.currentReloadInFlight) {
+		return deps.currentReloadInFlight;
+	}
+
+	const reloadInFlight = (async () => {
+		const reloaded = await deps.loadFromDisk(deps.authFallback);
+		deps.setCachedAccountManager(reloaded);
+		deps.setAccountManagerPromise(Promise.resolve(reloaded));
+		return reloaded;
+	})();
+
+	deps.setReloadInFlight(reloadInFlight);
+	try {
+		return await reloadInFlight;
+	} finally {
+		deps.setReloadInFlight(null);
+	}
+}