@narumitw/pi-sync 0.48.0 → 0.49.0

package/README.md

@@ -292,6 +292,7 @@ extensions/pi-sync/
 │   ├── file-selection.ts
 │   ├── sync-operations.ts
 │   ├── sync-backend.ts
+│   ├── backend-factory.ts      # lazy selected-backend loader
 │   ├── s3-backend.ts
 │   ├── webdav-backend.ts
 │   ├── git-backend.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-sync",
-	"version": "0.48.0",
+	"version": "0.49.0",
 	"description": "Pi extension that syncs Pi configuration through Git, WebDAV, Cloudflare R2, or S3-compatible storage.",
 	"type": "module",
 	"license": "MIT",
@@ -36,7 +36,7 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@narumitw/pi-tui-kit": "^0.45.0",
+		"@narumitw/pi-tui-kit": "^0.46.0",
 		"fast-xml-parser": "^5.10.1",
 		"proper-lockfile": "^4.1.2"
 	},

package/src/backend-factory.ts

@@ -1,20 +1,23 @@
-import { GitSyncBackend } from "./git-backend.js";
-import { S3SyncBackend } from "./s3-backend.js";
 import type { SyncBackend } from "./sync-backend.js";
 import type { AnySyncConfig } from "./types.js";
-import { WebDavSyncBackend } from "./webdav-backend.js";
 
 export type SyncBackendFactory = {
-	bivarianceHack(config: AnySyncConfig): SyncBackend;
+	bivarianceHack(config: AnySyncConfig): SyncBackend | Promise<SyncBackend>;
 }["bivarianceHack"];
 
-export const createSyncBackend: SyncBackendFactory = (config) => {
+export const createSyncBackend: SyncBackendFactory = async (config) => {
 	switch (config.backend.type) {
-		case "s3":
+		case "s3": {
+			const { S3SyncBackend } = await import("./s3-backend.js");
 			return new S3SyncBackend(config.backend);
-		case "webdav":
+		}
+		case "webdav": {
+			const { WebDavSyncBackend } = await import("./webdav-backend.js");
 			return new WebDavSyncBackend(config.backend);
-		case "git":
+		}
+		case "git": {
+			const { GitSyncBackend } = await import("./git-backend.js");
 			return new GitSyncBackend(config.backend);
+		}
 	}
 };

package/src/sync-operations.ts

@@ -114,7 +114,7 @@ export async function status(
 	const config = await loadConfig(options.setup);
 	throwIfAborted(options.signal);
 	ctx.ui.setStatus(STATUS_KEY, `checking ${config.setupName}`);
-	const backend = backendFor(config, factory);
+	const backend = await backendFor(config, factory);
 	const local = await createSnapshot(
 		config.snapshotIdentity,
 		snapshotOptionsForContext(ctx, config),
@@ -160,7 +160,7 @@ export async function diff(
 	const config = await loadConfig(options.setup);
 	throwIfAborted(options.signal);
 	ctx.ui.setStatus(STATUS_KEY, `checking ${config.setupName}`);
-	const backend = backendFor(config, factory);
+	const backend = await backendFor(config, factory);
 	const local = await createSnapshot(
 		config.snapshotIdentity,
 		snapshotOptionsForContext(ctx, config),
@@ -206,7 +206,7 @@ export async function doctor(
 	try {
 		const config = await loadConfig(options.setup);
 		throwIfAborted(options.signal);
-		backend = backendFor(config, factory);
+		backend = await backendFor(config, factory);
 		profile = config.snapshotIdentity;
 		snapshotOptions = snapshotOptionsForContext(ctx, config);
 		messages.push(
@@ -283,7 +283,7 @@ export async function push(
 	const config = input?.config ?? (await loadConfig(options.setup));
 	throwIfAborted(options.signal);
 	ctx.ui.setStatus(STATUS_KEY, `pushing ${config.setupName}`);
-	const backend = input?.backend ?? backendFor(config, factory);
+	const backend = input?.backend ?? (await backendFor(config, factory));
 	const state = input?.state ?? (await readStateForConfig(config));
 	throwIfAborted(options.signal);
 	const local =
@@ -415,7 +415,7 @@ export async function pull(
 	const config = await loadConfig(options.setup);
 	throwIfAborted(options.signal);
 	ctx.ui.setStatus(STATUS_KEY, `pulling ${config.setupName}`);
-	const backend = backendFor(config, factory);
+	const backend = await backendFor(config, factory);
 	const state = await readStateForConfig(config);
 	throwIfAborted(options.signal);
 	const local = await createSnapshot(
@@ -520,7 +520,7 @@ export async function syncBoth(
 ) {
 	const config = await loadConfig(options.setup);
 	throwIfAborted(options.signal);
-	const backend = backendFor(config, factory);
+	const backend = await backendFor(config, factory);
 	const state = await readStateForConfig(config);
 	throwIfAborted(options.signal);
 	const local = await createSnapshot(
@@ -645,7 +645,7 @@ export async function history(
 ) {
 	const config = await loadConfig(options.setup);
 	throwIfAborted(options.signal);
-	const backend = backendFor(config, factory);
+	const backend = await backendFor(config, factory);
 	const snapshots = (await backend.listHistory(options.signal)).slice(-20).reverse();
 	throwIfAborted(options.signal);
 	if (snapshots.length === 0) {
@@ -695,7 +695,7 @@ export async function rollback(
 
 	const config = await loadConfig(options.setup);
 	throwIfAborted(options.signal);
-	const backend = backendFor(config, factory);
+	const backend = await backendFor(config, factory);
 	if (
 		expectedSelection &&
 		(backend.identity !== expectedSelection.backendIdentity ||

package/src/sync.ts

@@ -28,29 +28,30 @@ import {
 	sessionTokenWarnings,
 	syncSessionsWarnings,
 } from "./config.js";
-import { showFileSelection } from "./file-selection.js";
 import { unlock, withLock } from "./lock.js";
-import { showSetupWizard, showSyncManager } from "./manager-ui.js";
 import { SetupPullRequiresUiError, useSyncSetup } from "./setup-switch.js";
 import { createSnapshot } from "./snapshot.js";
 import { recoverSnapshotTransactionsOnStartup } from "./snapshot-transaction.js";
 import { isSyncDecisionRequiredError } from "./sync-decision.js";
 import { errorMessage } from "./sync-format.js";
-import {
-	diff,
-	doctor,
-	history,
-	pull,
-	push,
-	rollback,
-	status,
-	syncBoth,
-} from "./sync-operations.js";
 import { hasLocalChanges } from "./sync-state.js";
 import type { AnySyncConfig, CommandOptions, SnapshotOptions } from "./types.js";
 
 const STATUS_KEY = "sync";
 
+type SyncOperations = typeof import("./sync-operations.js");
+let syncOperationsPromise: Promise<SyncOperations> | undefined;
+
+function loadSyncOperations(): Promise<SyncOperations> {
+	if (!syncOperationsPromise) {
+		syncOperationsPromise = import("./sync-operations.js").catch((error) => {
+			syncOperationsPromise = undefined;
+			throw error;
+		});
+	}
+	return syncOperationsPromise;
+}
+
 const AUTO_SYNC_OPTIONS: CommandOptions = {
 	yes: true,
 	force: false,
@@ -130,6 +131,8 @@ async function handleCommand(
 ) {
 	if (!rawArgs.trim()) {
 		try {
+			const { showSyncManager } = await import("./manager-ui.js");
+			if (sessionSignal.aborted) return;
 			await showSyncManager(
 				ctx,
 				(route, signal, onCommit, target) =>
@@ -174,8 +177,13 @@ async function executeCommand(
 				await useSyncSetup(
 					ctx,
 					options.args[0] ?? "",
-					(selectedSetup) =>
-						withLock("pull", () => pull(ctx, { ...options, setup: selectedSetup })),
+					async (selectedSetup) => {
+						const operations = await loadSyncOperations();
+						throwIfAborted(options.signal);
+						return withLock("pull", () =>
+							operations.pull(ctx, { ...options, setup: selectedSetup }),
+						);
+					},
 					undefined,
 					options.signal,
 				);
@@ -187,34 +195,48 @@ async function executeCommand(
 				await showConfig(ctx, options);
 				return { kind: "completed" };
 			case "files":
-				await showFileSelection(ctx, options.setup, options.signal);
+				await (await import("./file-selection.js")).showFileSelection(
+					ctx,
+					options.setup,
+					options.signal,
+				);
 				return { kind: "completed" };
 			case "status":
-				await status(ctx, options);
+				await (await loadSyncOperations()).status(ctx, options);
 				return { kind: "completed" };
 			case "diff":
-				await diff(ctx, options);
+				await (await loadSyncOperations()).diff(ctx, options);
 				return { kind: "completed" };
 			case "doctor":
-				await doctor(ctx, options);
+				await (await loadSyncOperations()).doctor(ctx, options);
 				return { kind: "completed" };
 			case "push": {
-				const outcome = await withLock("push", () => push(ctx, options));
+				const operations = await loadSyncOperations();
+				throwIfAborted(options.signal);
+				const outcome = await withLock("push", () => operations.push(ctx, options));
 				return { kind: "completed", ...(outcome ? { outcome } : {}) };
 			}
 			case "pull": {
-				const outcome = await withLock("pull", () => pull(ctx, options));
+				const operations = await loadSyncOperations();
+				throwIfAborted(options.signal);
+				const outcome = await withLock("pull", () => operations.pull(ctx, options));
 				return { kind: "completed", ...(outcome ? { outcome } : {}) };
 			}
-			case "sync":
-				await withLock("sync", () => syncBoth(ctx, options));
+			case "sync": {
+				const operations = await loadSyncOperations();
+				throwIfAborted(options.signal);
+				await withLock("sync", () => operations.syncBoth(ctx, options));
 				return { kind: "completed" };
+			}
 			case "history":
-				await history(ctx, options);
+				await (await loadSyncOperations()).history(ctx, options);
 				return { kind: "completed" };
-			case "rollback":
-				await withLock("rollback", () => rollback(ctx, options));
+			case "rollback": {
+				const operations = await loadSyncOperations();
+				throwIfAborted(options.signal);
+				await withLock("rollback", () => operations.rollback(ctx, options));
 				return { kind: "completed" };
+			}
 			case "unlock":
 				await unlock(ctx, options);
 				return { kind: "completed" };
@@ -243,9 +265,11 @@ async function autoSync(ctx: ExtensionContext, signal: AbortSignal) {
 		throwIfAborted(signal);
 		await loadConfig();
 		throwIfAborted(signal);
+		const operations = await loadSyncOperations();
+		throwIfAborted(signal);
 		await withLock("auto-sync", () => {
 			throwIfAborted(signal);
-			return syncBoth(ctx, { ...AUTO_SYNC_OPTIONS, signal });
+			return operations.syncBoth(ctx, { ...AUTO_SYNC_OPTIONS, signal });
 		});
 	} catch (error) {
 		if (signal.aborted || isMissingConfigError(error)) return;
@@ -265,6 +289,8 @@ async function autoPushSessions(ctx: ExtensionContext, signal: AbortSignal) {
 		const config = await loadConfig();
 		throwIfAborted(signal);
 		if (!config.include.includes("sessions")) return;
+		const operations = await loadSyncOperations();
+		throwIfAborted(signal);
 		await withLock("auto-session-push", async () => {
 			throwIfAborted(signal);
 			const state = await readStateForConfig(config);
@@ -275,7 +301,7 @@ async function autoPushSessions(ctx: ExtensionContext, signal: AbortSignal) {
 			);
 			throwIfAborted(signal);
 			if (!hasLocalChanges(local, state, config)) return;
-			await push(ctx, { ...AUTO_SYNC_OPTIONS, signal }, { config, state, local });
+			await operations.push(ctx, { ...AUTO_SYNC_OPTIONS, signal }, { config, state, local });
 		});
 	} catch (error) {
 		if (signal.aborted || isMissingConfigError(error)) return;
@@ -292,6 +318,8 @@ async function initConfig(ctx: ExtensionCommandContext, signal?: AbortSignal) {
 	}
 
 	if (ctx.mode === "tui") {
+		const { showSetupWizard } = await import("./manager-ui.js");
+		throwIfAborted(signal);
 		await showSetupWizard(ctx, signal);
 		return;
 	}
@@ -383,8 +411,8 @@ function displayWebDavUrl(value: string | undefined, username: string | undefine
 	}
 }
 
-function throwIfAborted(signal: AbortSignal) {
-	if (!signal.aborted) return;
+function throwIfAborted(signal?: AbortSignal) {
+	if (!signal?.aborted) return;
 	throw signal.reason instanceof Error
 		? signal.reason
 		: new DOMException("The operation was aborted", "AbortError");
@@ -446,7 +474,6 @@ export {
 	preflightSnapshotApply,
 	protectSnapshotApplyPlan,
 } from "./snapshot-apply.js";
-export { backupLocal } from "./sync-operations.js";
 export {
 	canPullRemoteSessionsOnFirstSync,
 	canPullRemoteSettingsOnFirstSync,