refactor: extract refresh guardian wrapper

Author: ndycode

index.ts

@@ -215,6 +215,7 @@ import {
 	applyPreemptiveQuotaSettingsFromConfig,
 	resolveUiRuntimeFromConfig,
 } from "./lib/runtime/quota-settings.js";
+import { ensureRefreshGuardianEntry } from "./lib/runtime/refresh-guardian-entry.js";
 import {
 	ensureLiveAccountSyncState,
 	ensureRefreshGuardianState,
@@ -591,18 +592,20 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 	const ensureRefreshGuardian = (
 		pluginConfig: ReturnType<typeof loadPluginConfig>,
 	): void => {
-		const next = ensureRefreshGuardianState({
-			enabled: getProactiveRefreshGuardian(pluginConfig),
-			intervalMs: getProactiveRefreshIntervalMs(pluginConfig),
-			bufferMs: getProactiveRefreshBufferMs(pluginConfig),
+		const next = ensureRefreshGuardianEntry({
+			pluginConfig,
 			currentGuardian: refreshGuardian,
 			currentConfigKey: refreshGuardianConfigKey,
+			getProactiveRefreshGuardian,
+			getProactiveRefreshIntervalMs,
+			getProactiveRefreshBufferMs,
 			createGuardian: ({ intervalMs, bufferMs }) =>
 				new RefreshGuardian(() => cachedAccountManager, {
 					intervalMs,
 					bufferMs,
 				}),
 			registerCleanup,
+			ensureRefreshGuardianState,
 		});
 		refreshGuardian = next.refreshGuardian;
 		refreshGuardianConfigKey = next.refreshGuardianConfigKey;

lib/runtime/refresh-guardian-entry.ts

@@ -0,0 +1,47 @@
+export function ensureRefreshGuardianEntry<TGuardian>(params: {
+	pluginConfig: ReturnType<typeof import("../config.js").loadPluginConfig>;
+	currentGuardian: TGuardian | null;
+	currentConfigKey: string | null;
+	getProactiveRefreshGuardian: (
+		config: ReturnType<typeof import("../config.js").loadPluginConfig>,
+	) => boolean;
+	getProactiveRefreshIntervalMs: (
+		config: ReturnType<typeof import("../config.js").loadPluginConfig>,
+	) => number;
+	getProactiveRefreshBufferMs: (
+		config: ReturnType<typeof import("../config.js").loadPluginConfig>,
+	) => number;
+	createGuardian: (options: {
+		intervalMs: number;
+		bufferMs: number;
+	}) => TGuardian;
+	registerCleanup: (cleanup: () => void) => void;
+	ensureRefreshGuardianState: (args: {
+		enabled: boolean;
+		intervalMs: number;
+		bufferMs: number;
+		currentGuardian: TGuardian | null;
+		currentConfigKey: string | null;
+		createGuardian: (options: {
+			intervalMs: number;
+			bufferMs: number;
+		}) => TGuardian;
+		registerCleanup: (cleanup: () => void) => void;
+	}) => {
+		refreshGuardian: TGuardian | null;
+		refreshGuardianConfigKey: string | null;
+	};
+}): {
+	refreshGuardian: TGuardian | null;
+	refreshGuardianConfigKey: string | null;
+} {
+	return params.ensureRefreshGuardianState({
+		enabled: params.getProactiveRefreshGuardian(params.pluginConfig),
+		intervalMs: params.getProactiveRefreshIntervalMs(params.pluginConfig),
+		bufferMs: params.getProactiveRefreshBufferMs(params.pluginConfig),
+		currentGuardian: params.currentGuardian,
+		currentConfigKey: params.currentConfigKey,
+		createGuardian: params.createGuardian,
+		registerCleanup: params.registerCleanup,
+	});
+}

test/refresh-guardian-entry.test.ts

@@ -0,0 +1,37 @@
+import { describe, expect, it, vi } from "vitest";
+import { ensureRefreshGuardianEntry } from "../lib/runtime/refresh-guardian-entry.js";
+
+describe("refresh guardian entry", () => {
+	it("delegates config-derived arguments into the refresh guardian state helper", () => {
+		const ensureRefreshGuardianState = vi.fn(() => ({
+			refreshGuardian: { id: 1 },
+			refreshGuardianConfigKey: "1000:100",
+		}));
+
+		const result = ensureRefreshGuardianEntry({
+			pluginConfig: {} as never,
+			currentGuardian: null,
+			currentConfigKey: null,
+			getProactiveRefreshGuardian: () => true,
+			getProactiveRefreshIntervalMs: () => 1000,
+			getProactiveRefreshBufferMs: () => 100,
+			createGuardian: vi.fn(() => ({ id: 1 })),
+			registerCleanup: vi.fn(),
+			ensureRefreshGuardianState,
+		});
+
+		expect(ensureRefreshGuardianState).toHaveBeenCalledWith({
+			enabled: true,
+			intervalMs: 1000,
+			bufferMs: 100,
+			currentGuardian: null,
+			currentConfigKey: null,
+			createGuardian: expect.any(Function),
+			registerCleanup: expect.any(Function),
+		});
+		expect(result).toEqual({
+			refreshGuardian: { id: 1 },
+			refreshGuardianConfigKey: "1000:100",
+		});
+	});
+});