wip

frontend/local-client-cli/src/cli.ts

@@ -1,19 +1,18 @@
 import * as path from "path";
 import * as fs from "fs/promises";
 import * as fsSync from "fs";
-import type { NetworkConnectionStatus ,
-    Logger} from "sync-client";
+import type { NetworkConnectionStatus, Logger } from "sync-client";
 import {
     SyncClient,
     DEFAULT_SETTINGS,
     LogLevel,
     LogLine,
-    type SyncSettings,
-    type StoredDatabase
+    type SyncSettings
 } from "sync-client";
-import { parseArgs, type LineEndingMode } from "./args";
+import { parseArgs } from "./args";
 import { NodeFileSystemOperations, VAULTLINK_DIR } from "./node-filesystem";
 import { FileWatcher } from "./file-watcher";
+import { ClientPersistence } from "./client-persistence";
 import { formatLogLine } from "./logger-formatter";
 import packageJson from "../package.json";
 
@@ -41,7 +40,6 @@ const LOG_LEVEL_ORDER = {
 function createLogHandler(minLevel: LogLevel): (logLine: LogLine) => void {
     return (logLine: LogLine): void => {
         if (LOG_LEVEL_ORDER[logLine.level] >= LOG_LEVEL_ORDER[minLevel]) {
-             
             console.log(formatLogLine(logLine));
         }
     };
@@ -50,17 +48,6 @@ function createLogHandler(minLevel: LogLevel): (logLine: LogLine) => void {
 const HEALTH_CHECK_INTERVAL_MS = 30 * 1000;
 const PROGRESS_LOG_INTERVAL_MS = 2000;
 
-function resolveLineEndings(mode: LineEndingMode): string {
-    switch (mode) {
-        case "lf":
-            return "\n";
-        case "crlf":
-            return "\r\n";
-        case "auto":
-            return process.platform === "win32" ? "\r\n" : "\n";
-    }
-}
-
 async function main(): Promise<void> {
     const args = parseArgs(process.argv);
     const absolutePath = path.resolve(args.localPath);
@@ -96,12 +83,6 @@ async function main(): Promise<void> {
         emitBoot(LogLevel.INFO, `Local path: ${absolutePath}`);
         emitBoot(LogLevel.INFO, `Remote URI: ${args.remoteUri}`);
         emitBoot(LogLevel.INFO, `Vault name: ${args.vaultName}`);
-        if (args.lineEndings !== "auto") {
-            emitBoot(
-                LogLevel.INFO,
-                `Line endings: ${args.lineEndings.toUpperCase()}`
-            );
-        }
     }
 
     const dataDir = path.join(absolutePath, VAULTLINK_DIR);
@@ -133,33 +114,7 @@ async function main(): Promise<void> {
 
     const client = await SyncClient.create({
         fs: fileSystem,
-        persistence: {
-            load: async () => {
-                let database: Partial<StoredDatabase> | undefined = undefined;
-                try {
-                    const content = await fs.readFile(dataFile, "utf-8");
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-                    database = JSON.parse(content) as Partial<StoredDatabase>;
-                } catch {
-                    emitBoot(
-                        LogLevel.WARNING,
-                        `Cannot read data file at ${dataFile}`
-                    );
-                }
-
-                return {
-                    settings,
-                    database
-                };
-            },
-            save: async ({ database: persistedDatabase }) => {
-                await fs.writeFile(
-                    dataFile,
-                    JSON.stringify(persistedDatabase, null, 2)
-                );
-            }
-        },
-        nativeLineEndings: resolveLineEndings(args.lineEndings)
+        persistence: new ClientPersistence(dataFile, settings)
     });
 
     if (args.health !== undefined) {
@@ -232,7 +187,6 @@ async function main(): Promise<void> {
         client.logger.info(`${signal} received, shutting down gracefully`);
 
         fileWatcher.stop();
-        await client.waitUntilFinished();
         await client.destroy();
 
         if (totalSyncOps > 0) {
@@ -279,7 +233,6 @@ async function main(): Promise<void> {
 }
 
 main().catch((error: unknown) => {
-     
     console.error(
         `Unexpected error: ${error instanceof Error ? error.message : String(error)}`
     );