refactor: extract experimental target loader wrapper

Author: ndycode

lib/codex-manager/experimental-sync-target-entry.ts

@@ -0,0 +1,64 @@
+import type { AccountStorageV3 } from "../storage.js";
+
+export async function loadExperimentalSyncTargetEntry(params: {
+	loadExperimentalSyncTargetState: (args: {
+		detectTarget: () => ReturnType<
+			typeof import("../oc-chatgpt-target-detection.js").detectOcChatgptMultiAuthTarget
+		>;
+		readJson: (path: string) => Promise<unknown>;
+		normalizeAccountStorage: (value: unknown) => AccountStorageV3 | null;
+	}) => Promise<
+		| {
+				kind: "blocked-ambiguous";
+				detection: ReturnType<
+					typeof import("../oc-chatgpt-target-detection.js").detectOcChatgptMultiAuthTarget
+				>;
+		  }
+		| {
+				kind: "blocked-none";
+				detection: ReturnType<
+					typeof import("../oc-chatgpt-target-detection.js").detectOcChatgptMultiAuthTarget
+				>;
+		  }
+		| { kind: "error"; message: string }
+		| {
+				kind: "target";
+				detection: ReturnType<
+					typeof import("../oc-chatgpt-target-detection.js").detectOcChatgptMultiAuthTarget
+				>;
+				destination: AccountStorageV3 | null;
+		  }
+	>;
+	detectTarget: () => ReturnType<
+		typeof import("../oc-chatgpt-target-detection.js").detectOcChatgptMultiAuthTarget
+	>;
+	readFileWithRetry: (
+		path: string,
+		options: {
+			retryableCodes: Set<string>;
+			maxAttempts: number;
+			sleep: (ms: number) => Promise<void>;
+		},
+	) => Promise<string>;
+	normalizeAccountStorage: (value: unknown) => AccountStorageV3 | null;
+	sleep: (ms: number) => Promise<void>;
+}): ReturnType<typeof params.loadExperimentalSyncTargetState> {
+	return params.loadExperimentalSyncTargetState({
+		detectTarget: params.detectTarget,
+		readJson: async (path) =>
+			JSON.parse(
+				await params.readFileWithRetry(path, {
+					retryableCodes: new Set([
+						"EBUSY",
+						"EPERM",
+						"EAGAIN",
+						"ENOTEMPTY",
+						"EACCES",
+					]),
+					maxAttempts: 4,
+					sleep: params.sleep,
+				}),
+			),
+		normalizeAccountStorage: params.normalizeAccountStorage,
+	});
+}

lib/codex-manager/settings-hub.ts

@@ -69,6 +69,7 @@ import {
 	mapExperimentalStatusHotkey,
 } from "./experimental-settings-schema.js";
 import { loadExperimentalSyncTargetState } from "./experimental-sync-target.js";
+import { loadExperimentalSyncTargetEntry } from "./experimental-sync-target-entry.js";
 import {
 	buildSettingsHubItems,
 	findSettingsHubInitialCursor,
@@ -654,23 +655,12 @@ async function loadExperimentalSyncTarget(): Promise<
 			destination: import("../storage.js").AccountStorageV3 | null;
 	  }
 > {
-	return loadExperimentalSyncTargetState({
+	return loadExperimentalSyncTargetEntry({
+		loadExperimentalSyncTargetState,
 		detectTarget: detectOcChatgptMultiAuthTarget,
-		readJson: async (path) =>
-			JSON.parse(
-				await readFileWithRetry(path, {
-					retryableCodes: new Set([
-						"EBUSY",
-						"EPERM",
-						"EAGAIN",
-						"ENOTEMPTY",
-						"EACCES",
-					]),
-					maxAttempts: 4,
-					sleep,
-				}),
-			),
+		readFileWithRetry,
 		normalizeAccountStorage,
+		sleep,
 	});
 }
 

test/experimental-sync-target-entry.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it, vi } from "vitest";
+import { loadExperimentalSyncTargetEntry } from "../lib/codex-manager/experimental-sync-target-entry.js";
+
+describe("experimental sync target entry", () => {
+	it("delegates retrying file read and normalization through the target loader", async () => {
+		const loadExperimentalSyncTargetState = vi.fn(async () => ({
+			kind: "target",
+			detection: { kind: "target" },
+			destination: null,
+		}));
+
+		const result = await loadExperimentalSyncTargetEntry({
+			loadExperimentalSyncTargetState,
+			detectTarget: () => ({ kind: "target" }) as never,
+			readFileWithRetry: vi.fn(async () => "{}"),
+			normalizeAccountStorage: vi.fn(() => null),
+			sleep: vi.fn(async () => undefined),
+		});
+
+		expect(loadExperimentalSyncTargetState).toHaveBeenCalled();
+		expect(result).toEqual({
+			kind: "target",
+			detection: { kind: "target" },
+			destination: null,
+		});
+	});
+});