Align host settings with the 1.0 lifecycle

src/apps/cli/README.md

@@ -337,7 +337,7 @@ Options:
 
 Commands:
   daemon                  (default) Run mirror scan then continuously sync CouchDB <-> local filesystem
-  init-settings [path]    Create settings JSON from DEFAULT_SETTINGS
+  init-settings [path]    Create unconfigured settings JSON with the new-Vault recommendations
   sync                    Run one replication cycle and exit
   p2p-peers <timeout>     Show discovered peers as [peer]<TAB><peer-id><TAB><peer-name>
   p2p-sync <peer> <timeout>   Synchronise with specified peer-id or peer-name

src/apps/cli/cliSettingsDefaults.ts

@@ -0,0 +1,10 @@
+import type { ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/types";
+import { createNewVaultSettings } from "@vrtmrz/livesync-commonlib/settings";
+
+export function createDefaultCliSettings(): ObsidianLiveSyncSettings {
+    return {
+        ...createNewVaultSettings(),
+        useIndexedDBAdapter: false,
+        isConfigured: false,
+    };
+}

src/apps/cli/cliSettingsDefaults.unit.spec.ts

@@ -0,0 +1,16 @@
+import { describe, expect, it } from "vitest";
+import { createNewVaultSettings } from "@vrtmrz/livesync-commonlib/settings";
+import { createDefaultCliSettings } from "./cliSettingsDefaults.ts";
+
+describe("createDefaultCliSettings", () => {
+    it("uses the recommended new-Vault settings with the Node database adapter", () => {
+        const settings = createDefaultCliSettings();
+        const recommended = createNewVaultSettings();
+
+        expect(settings).toEqual({
+            ...recommended,
+            useIndexedDBAdapter: false,
+            isConfigured: false,
+        });
+    });
+});

src/apps/cli/main.ts

@@ -3,7 +3,6 @@ import { configureNodeLocalStorage, ensureGlobalNodeLocalStorage } from "./servi
 import { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import { initialiseServiceModulesCLI } from "./serviceModules/CLIServiceModules";
 import {
-    DEFAULT_SETTINGS,
     LOG_LEVEL_VERBOSE,
     type LOG_LEVEL,
     type ObsidianLiveSyncSettings,
@@ -28,6 +27,7 @@ import { useP2PReplicatorFeature } from "@vrtmrz/livesync-commonlib/compat/repli
 import { createNodeStandardIo, fsPromises as fs, path, fs as fsSync } from "@vrtmrz/livesync-commonlib/node";
 import type { StandardIo } from "@vrtmrz/livesync-commonlib/context";
 import { writeStderrLine, writeStdoutLine } from "./cliOutput";
+import { createDefaultCliSettings } from "./cliSettingsDefaults";
 
 const SETTINGS_FILE = ".livesync/settings.json";
 ensureGlobalNodeLocalStorage();
@@ -257,10 +257,7 @@ async function createDefaultSettingsFile(options: CLIOptions, standardIo: Standa
         }
     }
 
-    const settings = {
-        ...DEFAULT_SETTINGS,
-        useIndexedDBAdapter: false,
-    } as ObsidianLiveSyncSettings;
+    const settings = createDefaultCliSettings();
 
     await fs.mkdir(path.dirname(targetPath), { recursive: true });
     await fs.writeFile(targetPath, JSON.stringify(settings, null, 2), "utf-8");

src/apps/cli/test/test-p2p-upload-download-repro-linux.sh

@@ -93,9 +93,8 @@ data.encrypt = true;
 data.passphrase = process.env.PASSPHRASE_VAL;
 data.usePathObfuscation = true;
 data.handleFilenameCaseSensitive = false;
-data.customChunkSize = 50;
+data.customChunkSize = 60;
 data.usePluginSyncV2 = true;
-data.doNotUseFixedRevisionForChunks = false;
 data.P2P_DevicePeerName = process.env.DEVICE_NAME;
 data.isConfigured = true;
 

src/apps/cli/testdeno/helpers/settings.ts

@@ -195,9 +195,8 @@ export async function applyP2pTestTweaks(settingsFile: string, deviceName: strin
     data.passphrase = passphrase;
     data.usePathObfuscation = true;
     data.handleFilenameCaseSensitive = false;
-    data.customChunkSize = 50;
+    data.customChunkSize = 60;
     data.usePluginSyncV2 = true;
-    data.doNotUseFixedRevisionForChunks = false;
     data.P2P_DevicePeerName = deviceName;
     data.isConfigured = true;
     await Deno.writeTextFile(settingsFile, JSON.stringify(data, null, 2));