bump again

19th July, 2025

### Refined and New Features
- Fetching the remote database on `RedFlag` now also retrieves remote configurations optionally.
- The setup wizard using Set-up URI and QR code has been improved.

### Changes
- The Set-up URI is now encrypted with a new encryption algorithm (mostly the same as `V2`).

manifest-beta.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.24.0",
+    "version": "0.25.2",
     "minAppVersion": "0.9.12",
     "description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "author": "vorotamoroz",

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.24.30",
+    "version": "0.25.2",
     "minAppVersion": "0.9.12",
     "description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "author": "vorotamoroz",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.24.30",
+    "version": "0.25.2",
     "description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "main": "main.js",
     "type": "module",
@@ -89,7 +89,7 @@
         "fflate": "^0.8.2",
         "idb": "^8.0.3",
         "minimatch": "^10.0.1",
-        "octagonal-wheels": "^0.1.31",
+        "octagonal-wheels": "^0.1.37",
         "qrcode-generator": "^1.4.4",
         "svelte-check": "^4.1.7",
         "trystero": "^0.21.5",

src/main.ts

@@ -292,7 +292,8 @@ export default class ObsidianLiveSyncPlugin
         skipInfo: boolean,
         compression: boolean,
         customHeaders: Record<string, string>,
-        useRequestAPI: boolean
+        useRequestAPI: boolean,
+        getPBKDF2Salt: () => Promise<Uint8Array>
     ): Promise<
         | string
         | {
@@ -471,6 +472,14 @@ export default class ObsidianLiveSyncPlugin
     $$clearUsedPassphrase(): void {
         throwShouldBeOverridden();
     }
+
+    $$decryptSettings(settings: ObsidianLiveSyncSettings): Promise<ObsidianLiveSyncSettings> {
+        throwShouldBeOverridden();
+    }
+    $$adjustSettings(settings: ObsidianLiveSyncSettings): Promise<ObsidianLiveSyncSettings> {
+        throwShouldBeOverridden();
+    }
+
     $$loadSettings(): Promise<void> {
         throwShouldBeOverridden();
     }
@@ -545,6 +554,10 @@ export default class ObsidianLiveSyncPlugin
     $everyAfterResumeProcess(): Promise<boolean> {
         return InterceptiveEvery;
     }
+
+    $$fetchRemotePreferredTweakValues(trialSetting: RemoteDBSettings): Promise<TweakValues | false> {
+        throwShouldBeOverridden();
+    }
     $$checkAndAskResolvingMismatchedTweaks(preferred: Partial<TweakValues>): Promise<[TweakValues | boolean, boolean]> {
         throwShouldBeOverridden();
     }

src/modules/core/ModuleRebuilder.ts

@@ -11,7 +11,7 @@ import { AbstractModule } from "../AbstractModule.ts";
 import type { Rebuilder } from "../interfaces/DatabaseRebuilder.ts";
 import type { ICoreModule } from "../ModuleTypes.ts";
 import type { LiveSyncCouchDBReplicator } from "../../lib/src/replication/couchdb/LiveSyncReplicator.ts";
-import { fetchAllUsedChunks } from "../../lib/src/pouchdb/utils_couchdb.ts";
+import { fetchAllUsedChunks } from "@/lib/src/pouchdb/chunks.ts";
 import { EVENT_DATABASE_REBUILT, eventHub } from "src/common/events.ts";
 
 export class ModuleRebuilder extends AbstractModule implements ICoreModule, Rebuilder {
@@ -90,8 +90,8 @@ export class ModuleRebuilder extends AbstractModule implements ICoreModule, Rebu
         return this.rebuildEverything();
     }
 
-    $fetchLocal(makeLocalChunkBeforeSync?: boolean): Promise<void> {
-        return this.fetchLocal(makeLocalChunkBeforeSync);
+    $fetchLocal(makeLocalChunkBeforeSync?: boolean, preventMakeLocalFilesBeforeSync?: boolean): Promise<void> {
+        return this.fetchLocal(makeLocalChunkBeforeSync, preventMakeLocalFilesBeforeSync);
     }
 
     async scheduleRebuild(): Promise<void> {

src/modules/core/ModuleReplicator.ts

@@ -4,7 +4,8 @@ import { AbstractModule } from "../AbstractModule";
 import type { ICoreModule } from "../ModuleTypes";
 import { Logger, LOG_LEVEL_NOTICE, LOG_LEVEL_INFO, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
 import { isLockAcquired, shareRunningResult, skipIfDuplicated } from "octagonal-wheels/concurrency/lock";
-import { purgeUnreferencedChunks, balanceChunkPurgedDBs } from "../../lib/src/pouchdb/utils_couchdb";
+import { balanceChunkPurgedDBs } from "@/lib/src/pouchdb/chunks";
+import { purgeUnreferencedChunks } from "@/lib/src/pouchdb/chunks";
 import { LiveSyncCouchDBReplicator } from "../../lib/src/replication/couchdb/LiveSyncReplicator";
 import { throttle } from "octagonal-wheels/function";
 import { arrayToChunkedArray } from "octagonal-wheels/collection";
@@ -79,8 +80,18 @@ export class ModuleReplicator extends AbstractModule implements ICoreModule {
     $everyOnResetDatabase(db: LiveSyncLocalDB): Promise<boolean> {
         return this.setReplicator();
     }
+    async ensureReplicatorPBKDF2Salt(showMessage: boolean = false): Promise<boolean> {
+        // Checking salt
+        const replicator = this.core.$$getReplicator();
+        return await replicator.ensurePBKDF2Salt(this.settings, showMessage, true);
+    }
 
     async $everyBeforeReplicate(showMessage: boolean): Promise<boolean> {
+        // Checking salt
+        if (!(await this.ensureReplicatorPBKDF2Salt(showMessage))) {
+            Logger("Failed to ensure PBKDF2 salt for replication.", LOG_LEVEL_NOTICE);
+            return false;
+        }
         await this.loadQueuedFiles();
         return true;
     }

src/modules/coreFeatures/ModuleConflictChecker.ts

@@ -37,13 +37,17 @@ export class ModuleConflictChecker extends AbstractModule implements ICoreModule
     // TODO-> Move to ModuleConflictResolver?
     conflictResolveQueue = new QueueProcessor(
         async (filenames: FilePathWithPrefix[]) => {
-            await this.core.$$resolveConflict(filenames[0]);
+            const filename = filenames[0];
+            return await this.core.$$resolveConflict(filename);
         },
         {
             suspended: false,
             batchSize: 1,
-            concurrentLimit: 1,
-            delay: 10,
+            // No need to limit concurrency to `1` here, subsequent process will handle it,
+            // And, some cases, we do not need to synchronised. (e.g., auto-merge available).
+            // Therefore, limiting global concurrency is performed on resolver with the UI.
+            concurrentLimit: 10,
+            delay: 0,
             keepResultUntilDownstreamConnected: false,
         }
     ).replaceEnqueueProcessor((queue, newEntity) => {
@@ -57,19 +61,13 @@ export class ModuleConflictChecker extends AbstractModule implements ICoreModule
         new QueueProcessor(
             (files: FilePathWithPrefix[]) => {
                 const filename = files[0];
-                // const file = await this.core.storageAccess.isExists(filename);
-                // if (!file) return [];
-                // if (!(file instanceof TFile)) return;
-                // if ((file instanceof TFolder)) return [];
-                // Check again?
                 return Promise.resolve([filename]);
-                // this.conflictResolveQueue.enqueueWithKey(filename, { filename, file });
             },
             {
                 suspended: false,
                 batchSize: 1,
-                concurrentLimit: 5,
-                delay: 10,
+                concurrentLimit: 10,
+                delay: 0,
                 keepResultUntilDownstreamConnected: true,
                 pipeTo: this.conflictResolveQueue,
                 totalRemainingReactiveSource: this.core.conflictProcessQueueCount,

src/modules/coreFeatures/ModuleRedFlag.ts

@@ -6,6 +6,7 @@ import {
     FLAGMD_REDFLAG2_HR,
     FLAGMD_REDFLAG3,
     FLAGMD_REDFLAG3_HR,
+    type ObsidianLiveSyncSettings,
 } from "../../lib/src/common/types.ts";
 import { AbstractModule } from "../AbstractModule.ts";
 import type { ICoreModule } from "../ModuleTypes.ts";
@@ -121,9 +122,9 @@ export class ModuleRedFlag extends AbstractModule implements ICoreModule {
                         }
                     );
                     let makeLocalChunkBeforeSync = false;
-                    let preventMakeLocalFilesBeforeSync = false;
+                    let makeLocalFilesBeforeSync = false;
                     if (chunkMode === method1) {
-                        preventMakeLocalFilesBeforeSync = true;
+                        makeLocalFilesBeforeSync = true;
                     } else if (chunkMode === method2) {
                         makeLocalChunkBeforeSync = true;
                     } else if (chunkMode === method3) {
@@ -133,7 +134,35 @@ export class ModuleRedFlag extends AbstractModule implements ICoreModule {
                         return false;
                     }
 
-                    await this.core.rebuilder.$fetchLocal(makeLocalChunkBeforeSync, preventMakeLocalFilesBeforeSync);
+                    const optionFetchRemoteConf = $msg("RedFlag.FetchRemoteConfig.Buttons.Fetch");
+                    const optionCancel = $msg("RedFlag.FetchRemoteConfig.Buttons.Cancel");
+                    const fetchRemote = await this.core.confirm.askSelectStringDialogue(
+                        $msg("RedFlag.FetchRemoteConfig.Message"),
+                        [optionFetchRemoteConf, optionCancel],
+                        {
+                            defaultAction: optionFetchRemoteConf,
+                            timeout: 0,
+                            title: $msg("RedFlag.FetchRemoteConfig.Title"),
+                        }
+                    );
+                    if (fetchRemote === optionFetchRemoteConf) {
+                        this._log("Fetching remote configuration", LOG_LEVEL_NOTICE);
+                        const newSettings = JSON.parse(JSON.stringify(this.core.settings)) as ObsidianLiveSyncSettings;
+                        const remoteConfig = await this.core.$$fetchRemotePreferredTweakValues(newSettings);
+                        if (remoteConfig) {
+                            this._log("Remote configuration found.", LOG_LEVEL_NOTICE);
+                            const mergedSettings = {
+                                ...this.core.settings,
+                                ...remoteConfig,
+                            } satisfies ObsidianLiveSyncSettings;
+                            this._log("Remote configuration applied.", LOG_LEVEL_NOTICE);
+                            this.core.settings = mergedSettings;
+                        } else {
+                            this._log("Remote configuration not applied.", LOG_LEVEL_NOTICE);
+                        }
+                    }
+
+                    await this.core.rebuilder.$fetchLocal(makeLocalChunkBeforeSync, !makeLocalFilesBeforeSync);
 
                     await this.deleteRedFlag3();
                     if (this.settings.suspendFileWatching) {

src/modules/coreFeatures/ModuleResolveMismatchedTweaks.ts

@@ -164,22 +164,28 @@ export class ModuleResolvingMismatchedTweaks extends AbstractModule implements I
         return "IGNORE";
     }
 
-    async $$checkAndAskUseRemoteConfiguration(
-        trialSetting: RemoteDBSettings
-    ): Promise<{ result: false | TweakValues; requireFetch: boolean }> {
-        const replicator = await this.core.$anyNewReplicator(trialSetting);
+    async $$fetchRemotePreferredTweakValues(trialSetting: RemoteDBSettings): Promise<TweakValues | false> {
+        const replicator = await this.core.$anyNewReplicator();
         if (await replicator.tryConnectRemote(trialSetting)) {
             const preferred = await replicator.getRemotePreferredTweakValues(trialSetting);
             if (preferred) {
-                return await this.$$askUseRemoteConfiguration(trialSetting, preferred);
-            } else {
-                this._log("Failed to get the preferred tweak values from the remote server.", LOG_LEVEL_NOTICE);
+                return preferred;
             }
-            return { result: false, requireFetch: false };
-        } else {
-            this._log("Failed to connect to the remote server.", LOG_LEVEL_NOTICE);
-            return { result: false, requireFetch: false };
+            this._log("Failed to get the preferred tweak values from the remote server.", LOG_LEVEL_NOTICE);
+            return false;
         }
+        this._log("Failed to connect to the remote server.", LOG_LEVEL_NOTICE);
+        return false;
+    }
+
+    async $$checkAndAskUseRemoteConfiguration(
+        trialSetting: RemoteDBSettings
+    ): Promise<{ result: false | TweakValues; requireFetch: boolean }> {
+        const preferred = await this.core.$$fetchRemotePreferredTweakValues(trialSetting);
+        if (preferred) {
+            return await this.$$askUseRemoteConfiguration(trialSetting, preferred);
+        }
+        return { result: false, requireFetch: false };
     }
 
     async $$askUseRemoteConfiguration(

src/modules/essential/ModuleMigration.ts

@@ -1,5 +1,4 @@
-import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
-import { type ObsidianLiveSyncSettings } from "../../lib/src/common/types.js";
+import { LOG_LEVEL_NOTICE } from "octagonal-wheels/common/logger";
 import {
     EVENT_REQUEST_OPEN_P2P,
     EVENT_REQUEST_OPEN_SETTING_WIZARD,
@@ -11,131 +10,28 @@ import {
 import { AbstractModule } from "../AbstractModule.ts";
 import type { ICoreModule } from "../ModuleTypes.ts";
 import { $msg } from "src/lib/src/common/i18n.ts";
-import { checkUnsuitableValues, RuleLevel, type RuleForType } from "../../lib/src/common/configForDoc.ts";
-import { getConfName, type AllSettingItemKey } from "../features/SettingDialogue/settingConstants.ts";
+import { performDoctorConsultation, RebuildOptions } from "../../lib/src/common/configForDoc.ts";
 
 export class ModuleMigration extends AbstractModule implements ICoreModule {
     async migrateUsingDoctor(skipRebuild: boolean = false, activateReason = "updated", forceRescan = false) {
-        const r = checkUnsuitableValues(this.core.settings);
-        if (!forceRescan && r.version == this.settings.doctorProcessedVersion) {
-            const isIssueFound = Object.keys(r.rules).length > 0;
-            const msg = isIssueFound ? "Issues found" : "No issues found";
-            this._log(`${msg} but marked as to be silent`, LOG_LEVEL_VERBOSE);
-            return;
-        }
-        const issues = Object.entries(r.rules);
-        if (issues.length == 0) {
-            this._log(
-                $msg("Doctor.Message.NoIssues"),
-                activateReason !== "updated" ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO
-            );
-            return;
-        } else {
-            const OPT_YES = `${$msg("Doctor.Button.Yes")}` as const;
-            const OPT_NO = `${$msg("Doctor.Button.No")}` as const;
-            const OPT_DISMISS = `${$msg("Doctor.Button.DismissThisVersion")}` as const;
-            // this._log(`Issues found in ${key}`, LOG_LEVEL_VERBOSE);
-            const issues = Object.keys(r.rules)
-                .map((key) => `- ${getConfName(key as AllSettingItemKey)}`)
-                .join("\n");
-            const msg = await this.core.confirm.askSelectStringDialogue(
-                $msg("Doctor.Dialogue.Main", { activateReason, issues }),
-                [OPT_YES, OPT_NO, OPT_DISMISS],
-                {
-                    title: $msg("Doctor.Dialogue.Title"),
-                    defaultAction: OPT_YES,
-                }
-            );
-            if (msg == OPT_DISMISS) {
-                this.settings.doctorProcessedVersion = r.version;
-                await this.core.saveSettings();
-                this._log("Marked as to be silent", LOG_LEVEL_VERBOSE);
-                return;
+        const { shouldRebuild, shouldRebuildLocal, isModified } = await performDoctorConsultation(
+            this.core,
+            this.settings,
+            {
+                localRebuild: skipRebuild ? RebuildOptions.SkipEvenIfRequired : RebuildOptions.AutomaticAcceptable,
+                remoteRebuild: skipRebuild ? RebuildOptions.SkipEvenIfRequired : RebuildOptions.AutomaticAcceptable,
+                activateReason,
+                forceRescan,
             }
-            if (msg != OPT_YES) return;
-            let shouldRebuild = false;
-            let shouldRebuildLocal = false;
-            const issueItems = Object.entries(r.rules) as [keyof ObsidianLiveSyncSettings, RuleForType<any>][];
-            this._log(`${issueItems.length} Issue(s) found `, LOG_LEVEL_VERBOSE);
-            let idx = 0;
-            const applySettings = {} as Partial<ObsidianLiveSyncSettings>;
-            const OPT_FIX = `${$msg("Doctor.Button.Fix")}` as const;
-            const OPT_SKIP = `${$msg("Doctor.Button.Skip")}` as const;
-            const OPT_FIXBUTNOREBUILD = `${$msg("Doctor.Button.FixButNoRebuild")}` as const;
-            let skipped = 0;
-            for (const [key, value] of issueItems) {
-                const levelMap = {
-                    [RuleLevel.Necessary]: $msg("Doctor.Level.Necessary"),
-                    [RuleLevel.Recommended]: $msg("Doctor.Level.Recommended"),
-                    [RuleLevel.Optional]: $msg("Doctor.Level.Optional"),
-                    [RuleLevel.Must]: $msg("Doctor.Level.Must"),
-                };
-                const level = value.level ? levelMap[value.level] : "Unknown";
-                const options = [OPT_FIX] as [typeof OPT_FIX | typeof OPT_SKIP | typeof OPT_FIXBUTNOREBUILD];
-                if ((!skipRebuild && value.requireRebuild) || value.requireRebuildLocal) {
-                    options.push(OPT_FIXBUTNOREBUILD);
-                }
-                options.push(OPT_SKIP);
-                const note = skipRebuild
-                    ? ""
-                    : `${value.requireRebuild ? $msg("Doctor.Message.RebuildRequired") : ""}${value.requireRebuildLocal ? $msg("Doctor.Message.RebuildLocalRequired") : ""}`;
-
-                const ret = await this.core.confirm.askSelectStringDialogue(
-                    $msg("Doctor.Dialogue.MainFix", {
-                        name: getConfName(key as AllSettingItemKey),
-                        current: `${this.settings[key]}`,
-                        reason: value.reason ?? " N/A ",
-                        ideal: `${value.valueDisplay ?? value.value}`,
-                        //@ts-ignore
-                        level: `${level}`,
-                        note: note,
-                    }),
-                    options,
-                    {
-                        title: $msg("Doctor.Dialogue.TitleFix", { current: `${++idx}`, total: `${issueItems.length}` }),
-                        defaultAction: OPT_FIX,
-                    }
-                );
-
-                if (ret == OPT_FIX || ret == OPT_FIXBUTNOREBUILD) {
-                    //@ts-ignore
-                    applySettings[key] = value.value;
-                    if (ret == OPT_FIX) {
-                        shouldRebuild = shouldRebuild || value.requireRebuild || false;
-                        shouldRebuildLocal = shouldRebuildLocal || value.requireRebuildLocal || false;
-                    }
-                } else {
-                    skipped++;
-                }
-            }
-            if (Object.keys(applySettings).length > 0) {
-                this.settings = {
-                    ...this.settings,
-                    ...applySettings,
-                };
-            }
-            if (skipped == 0) {
-                this.settings.doctorProcessedVersion = r.version;
-            } else {
-                if (
-                    (await this.core.confirm.askYesNoDialog($msg("Doctor.Message.SomeSkipped"), {
-                        title: $msg("Doctor.Dialogue.TitleAlmostDone"),
-                        defaultOption: "No",
-                    })) == "no"
-                ) {
-                    // Some skipped, and user wants
-                    this.settings.doctorProcessedVersion = r.version;
-                }
-            }
-            await this.core.saveSettings();
-            if (!skipRebuild) {
-                if (shouldRebuild) {
-                    await this.core.rebuilder.scheduleRebuild();
-                    await this.core.$$performRestart();
-                } else if (shouldRebuildLocal) {
-                    await this.core.rebuilder.scheduleFetch();
-                    await this.core.$$performRestart();
-                }
+        );
+        if (isModified) await this.core.saveSettings();
+        if (!skipRebuild) {
+            if (shouldRebuild) {
+                await this.core.rebuilder.scheduleRebuild();
+                await this.core.$$performRestart();
+            } else if (shouldRebuildLocal) {
+                await this.core.rebuilder.scheduleFetch();
+                await this.core.$$performRestart();
             }
         }
     }

src/modules/essentialObsidian/ModuleObsidianAPI.ts

@@ -3,13 +3,10 @@ import { LOG_LEVEL_DEBUG, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-
 import { Notice, requestUrl, type RequestUrlParam, type RequestUrlResponse } from "../../deps.ts";
 import { type CouchDBCredentials, type EntryDoc, type FilePathWithPrefix } from "../../lib/src/common/types.ts";
 import { getPathFromTFile } from "../../common/utils.ts";
-import {
-    disableEncryption,
-    enableEncryption,
-    isCloudantURI,
-    isValidRemoteCouchDBURI,
-    replicationFilter,
-} from "../../lib/src/pouchdb/utils_couchdb.ts";
+import { isCloudantURI, isValidRemoteCouchDBURI } from "../../lib/src/pouchdb/utils_couchdb.ts";
+import { replicationFilter } from "@/lib/src/pouchdb/compress.ts";
+import { disableEncryption } from "@/lib/src/pouchdb/encryption.ts";
+import { enableEncryption } from "@/lib/src/pouchdb/encryption.ts";
 import { setNoticeClass } from "../../lib/src/mock_and_interop/wrapper.ts";
 import { ObsHttpHandler } from "./APILib/ObsHttpHandler.ts";
 import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser.ts";
@@ -103,7 +100,8 @@ export class ModuleObsidianAPI extends AbstractObsidianModule implements IObsidi
         skipInfo: boolean,
         compression: boolean,
         customHeaders: Record<string, string>,
-        useRequestAPI: boolean
+        useRequestAPI: boolean,
+        getPBKDF2Salt: () => Promise<Uint8Array>
     ): Promise<string | { db: PouchDB.Database<EntryDoc>; info: PouchDB.Core.DatabaseInfo }> {
         if (!isValidRemoteCouchDBURI(uri)) return "Remote URI is not valid";
         if (uri.toLowerCase() != uri) return "Remote URI and database name could not contain capital letters.";
@@ -229,7 +227,14 @@ export class ModuleObsidianAPI extends AbstractObsidianModule implements IObsidi
         replicationFilter(db, compression);
         disableEncryption();
         if (passphrase !== "false" && typeof passphrase === "string") {
-            enableEncryption(db, passphrase, useDynamicIterationCount, false);
+            enableEncryption(
+                db,
+                passphrase,
+                useDynamicIterationCount,
+                false,
+                getPBKDF2Salt,
+                this.settings.E2EEAlgorithm
+            );
         }
         if (skipInfo) {
             return { db: db, info: { db_name: "", doc_count: 0, update_seq: "" } };

src/modules/features/ModuleInteractiveConflictResolver.ts

@@ -13,6 +13,7 @@ import { ConflictResolveModal } from "./InteractiveConflictResolving/ConflictRes
 import { AbstractObsidianModule, type IObsidianModule } from "../AbstractObsidianModule.ts";
 import { displayRev, getPath, getPathWithoutPrefix } from "../../common/utils.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
+import { serialized } from "../../lib/src/concurrency/lock.ts";
 
 export class ModuleInteractiveConflictResolver extends AbstractObsidianModule implements IObsidianModule {
     $everyOnloadStart(): Promise<boolean> {
@@ -34,67 +35,71 @@ export class ModuleInteractiveConflictResolver extends AbstractObsidianModule im
     }
 
     async $anyResolveConflictByUI(filename: FilePathWithPrefix, conflictCheckResult: diff_result): Promise<boolean> {
-        this._log("Merge:open conflict dialog", LOG_LEVEL_VERBOSE);
-        const dialog = new ConflictResolveModal(this.app, filename, conflictCheckResult);
-        dialog.open();
-        const selected = await dialog.waitForResult();
-        if (selected === CANCELLED) {
-            // Cancelled by UI, or another conflict.
-            this._log(`Merge: Cancelled ${filename}`, LOG_LEVEL_INFO);
-            return false;
-        }
-        const testDoc = await this.localDatabase.getDBEntry(filename, { conflicts: true }, false, true, true);
-        if (testDoc === false) {
-            this._log(`Merge: Could not read ${filename} from the local database`, LOG_LEVEL_VERBOSE);
-            return false;
-        }
-        if (!testDoc._conflicts) {
-            this._log(`Merge: Nothing to do ${filename}`, LOG_LEVEL_VERBOSE);
-            return false;
-        }
-        const toDelete = selected;
-        // const toKeep = conflictCheckResult.left.rev != toDelete ? conflictCheckResult.left.rev : conflictCheckResult.right.rev;
-        if (toDelete === LEAVE_TO_SUBSEQUENT) {
-            // Concatenate both conflicted revisions.
-            // Create a new file by concatenating both conflicted revisions.
-            const p = conflictCheckResult.diff.map((e) => e[1]).join("");
-            const delRev = testDoc._conflicts[0];
-            if (!(await this.core.databaseFileAccess.storeContent(filename, p))) {
-                this._log(`Concatenated content cannot be stored:${filename}`, LOG_LEVEL_NOTICE);
+        // UI for resolving conflicts should one-by-one.
+        return await serialized(`conflict-resolve-ui`, async () => {
+            this._log("Merge:open conflict dialog", LOG_LEVEL_VERBOSE);
+            const dialog = new ConflictResolveModal(this.app, filename, conflictCheckResult);
+            dialog.open();
+            const selected = await dialog.waitForResult();
+            if (selected === CANCELLED) {
+                // Cancelled by UI, or another conflict.
+                this._log(`Merge: Cancelled ${filename}`, LOG_LEVEL_INFO);
                 return false;
             }
-            // 2. As usual, delete the conflicted revision and if there are no conflicts, write the resolved content to the storage.
-            if (
-                (await this.core.$$resolveConflictByDeletingRev(filename, delRev, "UI Concatenated")) ==
-                MISSING_OR_ERROR
-            ) {
-                this._log(
-                    `Concatenated saved, but cannot delete conflicted revisions: ${filename}, (${displayRev(delRev)})`,
-                    LOG_LEVEL_NOTICE
-                );
+            const testDoc = await this.localDatabase.getDBEntry(filename, { conflicts: true }, false, true, true);
+            if (testDoc === false) {
+                this._log(`Merge: Could not read ${filename} from the local database`, LOG_LEVEL_VERBOSE);
                 return false;
             }
-        } else if (typeof toDelete === "string") {
-            // Select one of the conflicted revision to delete.
-            if (
-                (await this.core.$$resolveConflictByDeletingRev(filename, toDelete, "UI Selected")) == MISSING_OR_ERROR
-            ) {
+            if (!testDoc._conflicts) {
+                this._log(`Merge: Nothing to do ${filename}`, LOG_LEVEL_VERBOSE);
+                return false;
+            }
+            const toDelete = selected;
+            // const toKeep = conflictCheckResult.left.rev != toDelete ? conflictCheckResult.left.rev : conflictCheckResult.right.rev;
+            if (toDelete === LEAVE_TO_SUBSEQUENT) {
+                // Concatenate both conflicted revisions.
+                // Create a new file by concatenating both conflicted revisions.
+                const p = conflictCheckResult.diff.map((e) => e[1]).join("");
+                const delRev = testDoc._conflicts[0];
+                if (!(await this.core.databaseFileAccess.storeContent(filename, p))) {
+                    this._log(`Concatenated content cannot be stored:${filename}`, LOG_LEVEL_NOTICE);
+                    return false;
+                }
+                // 2. As usual, delete the conflicted revision and if there are no conflicts, write the resolved content to the storage.
+                if (
+                    (await this.core.$$resolveConflictByDeletingRev(filename, delRev, "UI Concatenated")) ==
+                    MISSING_OR_ERROR
+                ) {
+                    this._log(
+                        `Concatenated saved, but cannot delete conflicted revisions: ${filename}, (${displayRev(delRev)})`,
+                        LOG_LEVEL_NOTICE
+                    );
+                    return false;
+                }
+            } else if (typeof toDelete === "string") {
+                // Select one of the conflicted revision to delete.
+                if (
+                    (await this.core.$$resolveConflictByDeletingRev(filename, toDelete, "UI Selected")) ==
+                    MISSING_OR_ERROR
+                ) {
+                    this._log(`Merge: Something went wrong: ${filename}, (${toDelete})`, LOG_LEVEL_NOTICE);
+                    return false;
+                }
+            } else {
                 this._log(`Merge: Something went wrong: ${filename}, (${toDelete})`, LOG_LEVEL_NOTICE);
                 return false;
             }
-        } else {
-            this._log(`Merge: Something went wrong: ${filename}, (${toDelete})`, LOG_LEVEL_NOTICE);
+            // In here, some merge has been processed.
+            // So we have to run replication if configured.
+            // TODO: Make this is as a event request
+            if (this.settings.syncAfterMerge && !this.core.$$isSuspended()) {
+                await this.core.$$replicateByEvent();
+            }
+            // And, check it again.
+            await this.core.$$queueConflictCheck(filename);
             return false;
-        }
-        // In here, some merge has been processed.
-        // So we have to run replication if configured.
-        // TODO: Make this is as a event request
-        if (this.settings.syncAfterMerge && !this.core.$$isSuspended()) {
-            await this.core.$$replicateByEvent();
-        }
-        // And, check it again.
-        await this.core.$$queueConflictCheck(filename);
-        return false;
+        });
     }
     async allConflictCheck() {
         while (await this.pickFileForResolve());

src/modules/features/ModuleObsidianSetting.ts

@@ -11,11 +11,11 @@ import {
     SALT_OF_PASSPHRASE,
 } from "../../lib/src/common/types";
 import { LOG_LEVEL_NOTICE, LOG_LEVEL_URGENT } from "octagonal-wheels/common/logger";
-import { encrypt, tryDecrypt } from "octagonal-wheels/encryption";
 import { $msg, setLang } from "../../lib/src/common/i18n";
 import { isCloudantURI } from "../../lib/src/pouchdb/utils_couchdb";
 import { getLanguage } from "obsidian";
 import { SUPPORTED_I18N_LANGS, type I18N_LANGS } from "../../lib/src/common/rosetta.ts";
+import { decryptString, encryptString } from "@/lib/src/encryption/stringEncryption.ts";
 export class ModuleObsidianSettings extends AbstractObsidianModule implements IObsidianModule {
     async $everyOnLayoutReady(): Promise<boolean> {
         let isChanged = false;
@@ -73,7 +73,7 @@ export class ModuleObsidianSettings extends AbstractObsidianModule implements IO
     }
 
     async decryptConfigurationItem(encrypted: string, passphrase: string) {
-        const dec = await tryDecrypt(encrypted, passphrase + SALT_OF_PASSPHRASE, false);
+        const dec = await decryptString(encrypted, passphrase + SALT_OF_PASSPHRASE);
         if (dec) {
             this.usedPassphrase = passphrase;
             return dec;
@@ -83,7 +83,7 @@ export class ModuleObsidianSettings extends AbstractObsidianModule implements IO
 
     async encryptConfigurationItem(src: string, settings: ObsidianLiveSyncSettings) {
         if (this.usedPassphrase != "") {
-            return await encrypt(src, this.usedPassphrase + SALT_OF_PASSPHRASE, false);
+            return await encryptString(src, this.usedPassphrase + SALT_OF_PASSPHRASE);
         }
 
         const passphrase = await this.getPassphrase(settings);
@@ -94,7 +94,7 @@ export class ModuleObsidianSettings extends AbstractObsidianModule implements IO
             );
             return "";
         }
-        const dec = await encrypt(src, passphrase + SALT_OF_PASSPHRASE, false);
+        const dec = await encryptString(src, passphrase + SALT_OF_PASSPHRASE);
         if (dec) {
             this.usedPassphrase = passphrase;
             return dec;
@@ -174,18 +174,7 @@ export class ModuleObsidianSettings extends AbstractObsidianModule implements IO
         }
     }
 
-    async $$loadSettings(): Promise<void> {
-        const settings = Object.assign({}, DEFAULT_SETTINGS, await this.core.loadData()) as ObsidianLiveSyncSettings;
-
-        if (typeof settings.isConfigured == "undefined") {
-            // If migrated, mark true
-            if (JSON.stringify(settings) !== JSON.stringify(DEFAULT_SETTINGS)) {
-                settings.isConfigured = true;
-            } else {
-                settings.additionalSuffixOfDatabaseName = this.appId;
-                settings.isConfigured = false;
-            }
-        }
+    async $$decryptSettings(settings: ObsidianLiveSyncSettings): Promise<ObsidianLiveSyncSettings> {
         const passphrase = await this.getPassphrase(settings);
         if (passphrase === false) {
             this._log("No passphrase found for data.json! Verify configuration before syncing.", LOG_LEVEL_URGENT);
@@ -237,20 +226,62 @@ export class ModuleObsidianSettings extends AbstractObsidianModule implements IO
                 }
             }
         }
-        this.settings = settings;
+        return settings;
+    }
+
+    /**
+     * This method mutates the settings object.
+     * @param settings
+     * @returns
+     */
+    $$adjustSettings(settings: ObsidianLiveSyncSettings): Promise<ObsidianLiveSyncSettings> {
+        // Adjust settings as needed
+
+        // Delete this feature to avoid problems on mobile.
+        settings.disableRequestURI = true;
+
+        // GC is disabled.
+        settings.gcDelay = 0;
+        // So, use history is always enabled.
+        settings.useHistory = true;
+
+        if ("workingEncrypt" in settings) delete settings.workingEncrypt;
+        if ("workingPassphrase" in settings) delete settings.workingPassphrase;
+        // Splitter configurations have been replaced with chunkSplitterVersion.
+        if (settings.chunkSplitterVersion == "") {
+            if (settings.enableChunkSplitterV2) {
+                if (settings.useSegmenter) {
+                    settings.chunkSplitterVersion = "v2-segmenter";
+                } else {
+                    settings.chunkSplitterVersion = "v2";
+                }
+            } else {
+                settings.chunkSplitterVersion = "";
+            }
+        } else if (!(settings.chunkSplitterVersion in ChunkAlgorithmNames)) {
+            settings.chunkSplitterVersion = "";
+        }
+        return Promise.resolve(settings);
+    }
+
+    async $$loadSettings(): Promise<void> {
+        const settings = Object.assign({}, DEFAULT_SETTINGS, await this.core.loadData()) as ObsidianLiveSyncSettings;
+
+        if (typeof settings.isConfigured == "undefined") {
+            // If migrated, mark true
+            if (JSON.stringify(settings) !== JSON.stringify(DEFAULT_SETTINGS)) {
+                settings.isConfigured = true;
+            } else {
+                settings.additionalSuffixOfDatabaseName = this.appId;
+                settings.isConfigured = false;
+            }
+        }
+
+        this.settings = await this.core.$$decryptSettings(settings);
 
         setLang(this.settings.displayLanguage);
 
-        if ("workingEncrypt" in this.settings) delete this.settings.workingEncrypt;
-        if ("workingPassphrase" in this.settings) delete this.settings.workingPassphrase;
-
-        // Delete this feature to avoid problems on mobile.
-        this.settings.disableRequestURI = true;
-
-        // GC is disabled.
-        this.settings.gcDelay = 0;
-        // So, use history is always enabled.
-        this.settings.useHistory = true;
+        await this.core.$$adjustSettings(this.settings);
 
         const lsKey = "obsidian-live-sync-vaultanddevicename-" + this.core.$$getVaultName();
         if (this.settings.deviceAndVaultName != "") {
@@ -275,21 +306,6 @@ export class ModuleObsidianSettings extends AbstractObsidianModule implements IO
             }
         }
 
-        // Splitter configurations have been replaced with chunkSplitterVersion.
-        if (this.settings.chunkSplitterVersion == "") {
-            if (this.settings.enableChunkSplitterV2) {
-                if (this.settings.useSegmenter) {
-                    this.settings.chunkSplitterVersion = "v2-segmenter";
-                } else {
-                    this.settings.chunkSplitterVersion = "v2";
-                }
-            } else {
-                this.settings.chunkSplitterVersion = "";
-            }
-        } else if (!(this.settings.chunkSplitterVersion in ChunkAlgorithmNames)) {
-            this.settings.chunkSplitterVersion = "";
-        }
-
         // this.core.ignoreFiles = this.settings.ignoreFiles.split(",").map(e => e.trim());
         eventHub.emitEvent(EVENT_REQUEST_RELOAD_SETTING_TAB);
     }

src/modules/features/ModuleSetupObsidian.ts

@@ -7,7 +7,6 @@ import {
 } from "../../lib/src/common/types.ts";
 import { configURIBase, configURIBaseQR } from "../../common/types.ts";
 // import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser.js";
-import { decrypt, encrypt } from "../../lib/src/encryption/e2ee_v2.ts";
 import { fireAndForget } from "../../lib/src/common/utils.ts";
 import {
     EVENT_REQUEST_COPY_SETUP_URI,
@@ -19,6 +18,8 @@ import { AbstractObsidianModule, type IObsidianModule } from "../AbstractObsidia
 import { decodeAnyArray, encodeAnyArray } from "../../common/utils.ts";
 import qrcode from "qrcode-generator";
 import { $msg } from "../../lib/src/common/i18n.ts";
+import { performDoctorConsultation, RebuildOptions } from "@/lib/src/common/configForDoc.ts";
+import { encryptString, decryptString } from "@/lib/src/encryption/stringEncryption.ts";
 
 export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsidianModule {
     $everyOnload(): Promise<boolean> {
@@ -101,7 +102,6 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
             //@ts-ignore
             newSettings[settingKey] = settingValue;
         }
-        console.warn(newSettings);
         await this.applySettingWizard(this.settings, newSettings, "QR Code");
     }
     async command_copySetupURI(stripExtra = true) {
@@ -130,9 +130,7 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
                 delete setting[k];
             }
         }
-        const encryptedSetting = encodeURIComponent(
-            await encrypt(JSON.stringify(setting), encryptingPassphrase, false)
-        );
+        const encryptedSetting = encodeURIComponent(await encryptString(JSON.stringify(setting), encryptingPassphrase));
         const uri = `${configURIBase}${encryptedSetting} `;
         await navigator.clipboard.writeText(uri);
         this._log("Setup URI copied to clipboard", LOG_LEVEL_NOTICE);
@@ -151,9 +149,7 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
             encryptedCouchDBConnection: "",
             encryptedPassphrase: "",
         };
-        const encryptedSetting = encodeURIComponent(
-            await encrypt(JSON.stringify(setting), encryptingPassphrase, false)
-        );
+        const encryptedSetting = encodeURIComponent(await encryptString(JSON.stringify(setting), encryptingPassphrase));
         const uri = `${configURIBase}${encryptedSetting} `;
         await navigator.clipboard.writeText(uri);
         this._log("Setup URI copied to clipboard", LOG_LEVEL_NOTICE);
@@ -171,6 +167,73 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
         const config = decodeURIComponent(setupURI.substring(configURIBase.length));
         await this.setupWizard(config);
     }
+    async askSyncWithRemoteConfig(tryingSettings: ObsidianLiveSyncSettings): Promise<ObsidianLiveSyncSettings> {
+        const buttons = {
+            fetch: $msg("Setup.FetchRemoteConf.Buttons.Fetch"),
+            no: $msg("Setup.FetchRemoteConf.Buttons.Skip"),
+        } as const;
+        const fetchRemoteConf = await this.core.confirm.askSelectStringDialogue(
+            $msg("Setup.FetchRemoteConf.Message"),
+            Object.values(buttons),
+            { defaultAction: buttons.fetch, timeout: 0, title: $msg("Setup.FetchRemoteConf.Title") }
+        );
+        if (fetchRemoteConf == buttons.no) {
+            return tryingSettings;
+        }
+
+        const newSettings = JSON.parse(JSON.stringify(tryingSettings)) as ObsidianLiveSyncSettings;
+        const remoteConfig = await this.core.$$fetchRemotePreferredTweakValues(newSettings);
+        if (remoteConfig) {
+            this._log("Remote configuration found.", LOG_LEVEL_NOTICE);
+            const resultSettings = {
+                ...DEFAULT_SETTINGS,
+                ...tryingSettings,
+                ...remoteConfig,
+            } satisfies ObsidianLiveSyncSettings;
+            return resultSettings;
+        } else {
+            this._log("Remote configuration not applied.", LOG_LEVEL_NOTICE);
+            return {
+                ...DEFAULT_SETTINGS,
+                ...tryingSettings,
+            } satisfies ObsidianLiveSyncSettings;
+        }
+    }
+    async askPerformDoctor(
+        tryingSettings: ObsidianLiveSyncSettings
+    ): Promise<{ settings: ObsidianLiveSyncSettings; shouldRebuild: boolean; isModified: boolean }> {
+        const buttons = {
+            yes: $msg("Setup.Doctor.Buttons.Yes"),
+            no: $msg("Setup.Doctor.Buttons.No"),
+        } as const;
+        const performDoctor = await this.core.confirm.askSelectStringDialogue(
+            $msg("Setup.Doctor.Message"),
+            Object.values(buttons),
+            { defaultAction: buttons.yes, timeout: 0, title: $msg("Setup.Doctor.Title") }
+        );
+        if (performDoctor == buttons.no) {
+            return { settings: tryingSettings, shouldRebuild: false, isModified: false };
+        }
+
+        const newSettings = JSON.parse(JSON.stringify(tryingSettings)) as ObsidianLiveSyncSettings;
+        const { settings, shouldRebuild, isModified } = await performDoctorConsultation(this.core, newSettings, {
+            localRebuild: RebuildOptions.AutomaticAcceptable, // Because we are in the setup wizard, we can skip the confirmation.
+            remoteRebuild: RebuildOptions.SkipEvenIfRequired,
+            activateReason: "New settings from URI",
+        });
+        if (isModified) {
+            this._log("Doctor has fixed some issues!", LOG_LEVEL_NOTICE);
+            return {
+                settings: settings,
+                shouldRebuild,
+                isModified,
+            };
+        } else {
+            this._log("Doctor detected no issues!", LOG_LEVEL_NOTICE);
+            return { settings: tryingSettings, shouldRebuild: false, isModified: false };
+        }
+    }
+
     async applySettingWizard(
         oldConf: ObsidianLiveSyncSettings,
         newConf: ObsidianLiveSyncSettings,
@@ -181,20 +244,24 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
             {}
         );
         if (result == "yes") {
-            const newSettingW = Object.assign({}, DEFAULT_SETTINGS, newConf) as ObsidianLiveSyncSettings;
+            let newSettingW = Object.assign({}, DEFAULT_SETTINGS, newConf) as ObsidianLiveSyncSettings;
             this.core.replicator.closeReplication();
             this.settings.suspendFileWatching = true;
-            console.dir(newSettingW);
+            newSettingW = await this.askSyncWithRemoteConfig(newSettingW);
+            const { settings, shouldRebuild, isModified } = await this.askPerformDoctor(newSettingW);
+            if (isModified) {
+                newSettingW = settings;
+            }
             // Back into the default method once.
             newSettingW.configPassphraseStore = "";
             newSettingW.encryptedPassphrase = "";
             newSettingW.encryptedCouchDBConnection = "";
             newSettingW.additionalSuffixOfDatabaseName = `${"appId" in this.app ? this.app.appId : ""} `;
-            const setupJustImport = "Don't sync anything, just apply the settings.";
-            const setupAsNew = "This is a new client - sync everything from the remote server.";
-            const setupAsMerge = "This is an existing client - merge existing files with the server.";
-            const setupAgain = "Initialise new server data - ideal for new or broken servers.";
-            const setupManually = "Continue and configure manually.";
+            const setupJustImport = $msg("Setup.Apply.Buttons.OnlyApply");
+            const setupAsNew = $msg("Setup.Apply.Buttons.ApplyAndFetch");
+            const setupAsMerge = $msg("Setup.Apply.Buttons.ApplyAndMerge");
+            const setupAgain = $msg("Setup.Apply.Buttons.ApplyAndRebuild");
+            const setupCancel = $msg("Setup.Apply.Buttons.Cancel");
             newSettingW.syncInternalFiles = false;
             newSettingW.usePluginSync = false;
             newSettingW.isConfigured = true;
@@ -202,11 +269,16 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
             if (!newSettingW.useIndexedDBAdapter) {
                 newSettingW.useIndexedDBAdapter = true;
             }
+            const warn = shouldRebuild ? $msg("Setup.Apply.WarningRebuildRecommended") : "";
+            const message = $msg("Setup.Apply.Message", {
+                method,
+                warn,
+            });
 
             const setupType = await this.core.confirm.askSelectStringDialogue(
-                "How would you like to set it up?",
-                [setupAsNew, setupAgain, setupAsMerge, setupJustImport, setupManually],
-                { defaultAction: setupAsNew }
+                message,
+                [setupAsNew, setupAsMerge, setupAgain, setupJustImport, setupCancel],
+                { defaultAction: setupAsNew, title: $msg("Setup.Apply.Title", { method }), timeout: 0 }
             );
             if (setupType == setupJustImport) {
                 this.core.settings = newSettingW;
@@ -238,71 +310,11 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
                 await this.core.saveSettings();
                 this.core.$$clearUsedPassphrase();
                 await this.core.rebuilder.$rebuildEverything();
-            } else if (setupType == setupManually) {
-                const keepLocalDB = await this.core.confirm.askYesNoDialog("Keep local DB?", {
-                    defaultOption: "No",
-                });
-                const keepRemoteDB = await this.core.confirm.askYesNoDialog("Keep remote DB?", {
-                    defaultOption: "No",
-                });
-                if (keepLocalDB == "yes" && keepRemoteDB == "yes") {
-                    // nothing to do. so peaceful.
-                    this.core.settings = newSettingW;
-                    this.core.$$clearUsedPassphrase();
-                    await this.core.$allSuspendAllSync();
-                    await this.core.$allSuspendExtraSync();
-                    await this.core.saveSettings();
-                    const replicate = await this.core.confirm.askYesNoDialog("Unlock and replicate?", {
-                        defaultOption: "Yes",
-                    });
-                    if (replicate == "yes") {
-                        await this.core.$$replicate(true);
-                        await this.core.$$markRemoteUnlocked();
-                    }
-                    this._log("Configuration loaded.", LOG_LEVEL_NOTICE);
-                    return;
-                }
-                if (keepLocalDB == "no" && keepRemoteDB == "no") {
-                    const reset = await this.core.confirm.askYesNoDialog("Drop everything?", {
-                        defaultOption: "No",
-                    });
-                    if (reset != "yes") {
-                        this._log("Cancelled", LOG_LEVEL_NOTICE);
-                        this.core.settings = oldConf;
-                        return;
-                    }
-                }
-                let initDB;
-                this.core.settings = newSettingW;
-                this.core.$$clearUsedPassphrase();
-                await this.core.saveSettings();
-                if (keepLocalDB == "no") {
-                    await this.core.$$resetLocalDatabase();
-                    await this.core.localDatabase.initializeDatabase();
-                    const rebuild = await this.core.confirm.askYesNoDialog("Rebuild the database?", {
-                        defaultOption: "Yes",
-                    });
-                    if (rebuild == "yes") {
-                        initDB = this.core.$$initializeDatabase(true);
-                    } else {
-                        await this.core.$$markRemoteResolved();
-                    }
-                }
-                if (keepRemoteDB == "no") {
-                    await this.core.$$tryResetRemoteDatabase();
-                    await this.core.$$markRemoteLocked();
-                }
-                if (keepLocalDB == "no" || keepRemoteDB == "no") {
-                    const replicate = await this.core.confirm.askYesNoDialog("Replicate once?", {
-                        defaultOption: "Yes",
-                    });
-                    if (replicate == "yes") {
-                        if (initDB != null) {
-                            await initDB;
-                        }
-                        await this.core.$$replicate(true);
-                    }
-                }
+            } else {
+                // Explicitly cancel the operation or the dialog was closed.
+                this._log("Cancelled", LOG_LEVEL_NOTICE);
+                this.core.settings = oldConf;
+                return;
             }
             this._log("Configuration loaded.", LOG_LEVEL_NOTICE);
         } else {
@@ -321,7 +333,7 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
                 true
             );
             if (encryptingPassphrase === false) return;
-            const newConf = await JSON.parse(await decrypt(confString, encryptingPassphrase, false));
+            const newConf = await JSON.parse(await decryptString(confString, encryptingPassphrase));
             if (newConf) {
                 await this.applySettingWizard(oldConf, newConf);
                 this._log("Configuration loaded.", LOG_LEVEL_NOTICE);

src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts

@@ -16,11 +16,9 @@ import {
 import { delay, isObjectDifferent, sizeToHumanReadable } from "../../../lib/src/common/utils.ts";
 import { versionNumberString2Number } from "../../../lib/src/string_and_binary/convert.ts";
 import { Logger } from "../../../lib/src/common/logger.ts";
-import {
-    balanceChunkPurgedDBs,
-    checkSyncInfo,
-    purgeUnreferencedChunks,
-} from "../../../lib/src/pouchdb/utils_couchdb.ts";
+import { checkSyncInfo } from "@/lib/src/pouchdb/negotiation.ts";
+import { balanceChunkPurgedDBs } from "@/lib/src/pouchdb/chunks.ts";
+import { purgeUnreferencedChunks } from "@/lib/src/pouchdb/chunks.ts";
 import { testCrypt } from "../../../lib/src/encryption/e2ee_v2.ts";
 import ObsidianLiveSyncPlugin from "../../../main.ts";
 import { scheduleTask } from "../../../common/utils.ts";

src/modules/features/SettingDialogue/PanePatches.ts

@@ -1,4 +1,9 @@
-import { type HashAlgorithm, LOG_LEVEL_NOTICE } from "../../../lib/src/common/types.ts";
+import {
+    E2EEAlgorithmNames,
+    E2EEAlgorithms,
+    type HashAlgorithm,
+    LOG_LEVEL_NOTICE,
+} from "../../../lib/src/common/types.ts";
 import { Logger } from "../../../lib/src/common/logger.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
@@ -37,6 +42,19 @@ export function panePatches(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElemen
     void addPanel(paneEl, "Compatibility (Internal API Usage)").then((paneEl) => {
         new Setting(paneEl).autoWireToggle("watchInternalFileChanges", { invert: true });
     });
+    void addPanel(paneEl, "Compatibility (Remote Database)").then((paneEl) => {
+        new Setting(paneEl).autoWireDropDown("E2EEAlgorithm", {
+            options: E2EEAlgorithmNames,
+        });
+    });
+    new Setting(paneEl).autoWireToggle("useDynamicIterationCount", {
+        holdValue: true,
+        onUpdate: visibleOnly(
+            () =>
+                this.isConfiguredAs("E2EEAlgorithm", E2EEAlgorithms.ForceV1) ||
+                this.isConfiguredAs("E2EEAlgorithm", E2EEAlgorithms.V1)
+        ),
+    });
 
     void addPanel(paneEl, "Edge case addressing (Database)").then((paneEl) => {
         new Setting(paneEl)
@@ -79,4 +97,16 @@ export function panePatches(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElemen
     void addPanel(paneEl, "Compatibility (Trouble addressed)").then((paneEl) => {
         new Setting(paneEl).autoWireToggle("disableCheckingConfigMismatch");
     });
+
+    void addPanel(paneEl, "Remote Database Tweak (In sunset)").then((paneEl) => {
+        new Setting(paneEl).autoWireToggle("useEden").setClass("wizardHidden");
+        const onlyUsingEden = visibleOnly(() => this.isConfiguredAs("useEden", true));
+        new Setting(paneEl).autoWireNumeric("maxChunksInEden", { onUpdate: onlyUsingEden }).setClass("wizardHidden");
+        new Setting(paneEl)
+            .autoWireNumeric("maxTotalLengthInEden", { onUpdate: onlyUsingEden })
+            .setClass("wizardHidden");
+        new Setting(paneEl).autoWireNumeric("maxAgeInEden", { onUpdate: onlyUsingEden }).setClass("wizardHidden");
+
+        new Setting(paneEl).autoWireToggle("enableCompression").setClass("wizardHidden");
+    });
 }

src/modules/features/SettingDialogue/PanePowerUsers.ts

@@ -2,24 +2,12 @@ import { type ConfigPassphraseStore } from "../../../lib/src/common/types.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
-import { visibleOnly } from "./SettingPane.ts";
+
 export function panePowerUsers(
     this: ObsidianLiveSyncSettingTab,
     paneEl: HTMLElement,
     { addPanel }: PageFunctions
 ): void {
-    void addPanel(paneEl, "Remote Database Tweak").then((paneEl) => {
-        new Setting(paneEl).autoWireToggle("useEden").setClass("wizardHidden");
-        const onlyUsingEden = visibleOnly(() => this.isConfiguredAs("useEden", true));
-        new Setting(paneEl).autoWireNumeric("maxChunksInEden", { onUpdate: onlyUsingEden }).setClass("wizardHidden");
-        new Setting(paneEl)
-            .autoWireNumeric("maxTotalLengthInEden", { onUpdate: onlyUsingEden })
-            .setClass("wizardHidden");
-        new Setting(paneEl).autoWireNumeric("maxAgeInEden", { onUpdate: onlyUsingEden }).setClass("wizardHidden");
-
-        new Setting(paneEl).autoWireToggle("enableCompression").setClass("wizardHidden");
-    });
-
     void addPanel(paneEl, "CouchDB Connection Tweak", undefined, this.onlyOnCouchDB).then((paneEl) => {
         paneEl.addClass("wizardHidden");
 

src/modules/features/SettingDialogue/PaneRemoteConfig.ts

@@ -579,12 +579,6 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal
             holdValue: true,
             onUpdate: isEncryptEnabled,
         });
-        new Setting(paneEl)
-            .autoWireToggle("useDynamicIterationCount", {
-                holdValue: true,
-                onUpdate: isEncryptEnabled,
-            })
-            .setClass("wizardHidden");
     });
 
     void addPanel(paneEl, $msg("obsidianLiveSyncSettingTab.titleFetchSettings")).then((paneEl) => {

src/modules/features/SettingDialogue/settingConstants.ts

@@ -1,422 +1 @@
-import { $t } from "../../../lib/src/common/i18n.ts";
-import {
-    DEFAULT_SETTINGS,
-    configurationNames,
-    type ConfigurationItem,
-    type FilterBooleanKeys,
-    type FilterNumberKeys,
-    type FilterStringKeys,
-    type ObsidianLiveSyncSettings,
-} from "../../../lib/src/common/types.ts";
-
-export type OnDialogSettings = {
-    configPassphrase: string;
-    preset: "" | "PERIODIC" | "LIVESYNC" | "DISABLE";
-    syncMode: "ONEVENTS" | "PERIODIC" | "LIVESYNC";
-    dummy: number;
-    deviceAndVaultName: string;
-};
-
-export const OnDialogSettingsDefault: OnDialogSettings = {
-    configPassphrase: "",
-    preset: "",
-    syncMode: "ONEVENTS",
-    dummy: 0,
-    deviceAndVaultName: "",
-};
-export const AllSettingDefault = { ...DEFAULT_SETTINGS, ...OnDialogSettingsDefault };
-
-export type AllSettings = ObsidianLiveSyncSettings & OnDialogSettings;
-export type AllStringItemKey = FilterStringKeys<AllSettings>;
-export type AllNumericItemKey = FilterNumberKeys<AllSettings>;
-export type AllBooleanItemKey = FilterBooleanKeys<AllSettings>;
-export type AllSettingItemKey = AllStringItemKey | AllNumericItemKey | AllBooleanItemKey;
-
-export type ValueOf<T extends AllSettingItemKey> = T extends AllStringItemKey
-    ? string
-    : T extends AllNumericItemKey
-      ? number
-      : T extends AllBooleanItemKey
-        ? boolean
-        : AllSettings[T];
-
-export const SettingInformation: Partial<Record<keyof AllSettings, ConfigurationItem>> = {
-    liveSync: {
-        name: "Sync Mode",
-    },
-    couchDB_URI: {
-        name: "Server URI",
-        placeHolder: "https://........",
-    },
-    couchDB_USER: {
-        name: "Username",
-        desc: "username",
-    },
-    couchDB_PASSWORD: {
-        name: "Password",
-        desc: "password",
-    },
-    couchDB_DBNAME: {
-        name: "Database Name",
-    },
-    passphrase: {
-        name: "Passphrase",
-        desc: "Encryption phassphrase. If changed, you should overwrite the server's database with the new (encrypted) files.",
-    },
-    showStatusOnEditor: {
-        name: "Show status inside the editor",
-        desc: "Requires restart of Obsidian.",
-    },
-    showOnlyIconsOnEditor: {
-        name: "Show status as icons only",
-    },
-    showStatusOnStatusbar: {
-        name: "Show status on the status bar",
-        desc: "Requires restart of Obsidian.",
-    },
-    lessInformationInLog: {
-        name: "Show only notifications",
-        desc: "Disables logging, only shows notifications. Please disable if you report an issue.",
-    },
-    showVerboseLog: {
-        name: "Verbose Log",
-        desc: "Show verbose log. Please enable if you report an issue.",
-    },
-    hashCacheMaxCount: {
-        name: "Memory cache size (by total items)",
-    },
-    hashCacheMaxAmount: {
-        name: "Memory cache size (by total characters)",
-        desc: "(Mega chars)",
-    },
-    writeCredentialsForSettingSync: {
-        name: "Write credentials in the file",
-        desc: "(Not recommended) If set, credentials will be stored in the file.",
-    },
-    notifyAllSettingSyncFile: {
-        name: "Notify all setting files",
-    },
-    configPassphrase: {
-        name: "Passphrase of sensitive configuration items",
-        desc: "This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.",
-    },
-    configPassphraseStore: {
-        name: "Encrypting sensitive configuration items",
-    },
-    syncOnSave: {
-        name: "Sync on Save",
-        desc: "Starts synchronisation when a file is saved.",
-    },
-    syncOnEditorSave: {
-        name: "Sync on Editor Save",
-        desc: "When you save a file in the editor, start a sync automatically",
-    },
-    syncOnFileOpen: {
-        name: "Sync on File Open",
-        desc: "Forces the file to be synced when opened.",
-    },
-    syncOnStart: {
-        name: "Sync on Startup",
-        desc: "Automatically Sync all files when opening Obsidian.",
-    },
-    syncAfterMerge: {
-        name: "Sync after merging file",
-        desc: "Sync automatically after merging files",
-    },
-    trashInsteadDelete: {
-        name: "Use the trash bin",
-        desc: "Move remotely deleted files to the trash, instead of deleting.",
-    },
-    doNotDeleteFolder: {
-        name: "Keep empty folder",
-        desc: "Should we keep folders that don't have any files inside?",
-    },
-    resolveConflictsByNewerFile: {
-        name: "(BETA) Always overwrite with a newer file",
-        desc: "Testing only - Resolve file conflicts by syncing newer copies of the file, this can overwrite modified files. Be Warned.",
-    },
-    checkConflictOnlyOnOpen: {
-        name: "Delay conflict resolution of inactive files",
-        desc: "Should we only check for conflicts when a file is opened?",
-    },
-    showMergeDialogOnlyOnActive: {
-        name: "Delay merge conflict prompt for inactive files.",
-        desc: "Should we prompt you about conflicting files when a file is opened?",
-    },
-    disableMarkdownAutoMerge: {
-        name: "Always prompt merge conflicts",
-        desc: "Should we prompt you for every single merge, even if we can safely merge automatcially?",
-    },
-    writeDocumentsIfConflicted: {
-        name: "Apply Latest Change if Conflicting",
-        desc: "Enable this option to automatically apply the most recent change to documents even when it conflicts",
-    },
-    syncInternalFilesInterval: {
-        name: "Scan hidden files periodically",
-        desc: "Seconds, 0 to disable",
-    },
-    batchSave: {
-        name: "Batch database update",
-        desc: "Reducing the frequency with which on-disk changes are reflected into the DB",
-    },
-    readChunksOnline: {
-        name: "Fetch chunks on demand",
-        desc: "(ex. Read chunks online) If this option is enabled, LiveSync reads chunks online directly instead of replicating them locally. Increasing Custom chunk size is recommended.",
-    },
-    syncMaxSizeInMB: {
-        name: "Maximum file size",
-        desc: "(MB) If this is set, changes to local and remote files that are larger than this will be skipped. If the file becomes smaller again, a newer one will be used.",
-    },
-    useIgnoreFiles: {
-        name: "(Beta) Use ignore files",
-        desc: "If this is set, changes to local files which are matched by the ignore files will be skipped. Remote changes are determined using local ignore files.",
-    },
-    ignoreFiles: {
-        name: "Ignore files",
-        desc: "Comma separated `.gitignore, .dockerignore`",
-    },
-    batch_size: {
-        name: "Batch size",
-        desc: "Number of changes to sync at a time. Defaults to 50. Minimum is 2.",
-    },
-    batches_limit: {
-        name: "Batch limit",
-        desc: "Number of batches to process at a time. Defaults to 40. Minimum is 2. This along with batch size controls how many docs are kept in memory at a time.",
-    },
-    useTimeouts: {
-        name: "Use timeouts instead of heartbeats",
-        desc: "If this option is enabled, PouchDB will hold the connection open for 60 seconds, and if no change arrives in that time, close and reopen the socket, instead of holding it open indefinitely. Useful when a proxy limits request duration but can increase resource usage.",
-    },
-    concurrencyOfReadChunksOnline: {
-        name: "Batch size of on-demand fetching",
-    },
-    minimumIntervalOfReadChunksOnline: {
-        name: "The delay for consecutive on-demand fetches",
-    },
-    suspendFileWatching: {
-        name: "Suspend file watching",
-        desc: "Stop watching for file changes.",
-    },
-    suspendParseReplicationResult: {
-        name: "Suspend database reflecting",
-        desc: "Stop reflecting database changes to storage files.",
-    },
-    writeLogToTheFile: {
-        name: "Write logs into the file",
-        desc: "Warning! This will have a serious impact on performance. And the logs will not be synchronised under the default name. Please be careful with logs; they often contain your confidential information.",
-    },
-    deleteMetadataOfDeletedFiles: {
-        name: "Do not keep metadata of deleted files.",
-    },
-    useIndexedDBAdapter: {
-        name: "(Obsolete) Use an old adapter for compatibility",
-        desc: "Before v0.17.16, we used an old adapter for the local database. Now the new adapter is preferred. However, it needs local database rebuilding. Please disable this toggle when you have enough time. If leave it enabled, also while fetching from the remote database, you will be asked to disable this.",
-        obsolete: true,
-    },
-    watchInternalFileChanges: {
-        name: "Scan changes on customization sync",
-        desc: "Do not use internal API",
-    },
-    doNotSuspendOnFetching: {
-        name: "Fetch database with previous behaviour",
-    },
-    disableCheckingConfigMismatch: {
-        name: "Do not check configuration mismatch before replication",
-    },
-    usePluginSync: {
-        name: "Enable customization sync",
-    },
-    autoSweepPlugins: {
-        name: "Scan customization automatically",
-        desc: "Scan customization before replicating.",
-    },
-    autoSweepPluginsPeriodic: {
-        name: "Scan customization periodically",
-        desc: "Scan customization every 1 minute.",
-    },
-    notifyPluginOrSettingUpdated: {
-        name: "Notify customized",
-        desc: "Notify when other device has newly customized.",
-    },
-    remoteType: {
-        name: "Remote Type",
-        desc: "Remote server type",
-    },
-    endpoint: {
-        name: "Endpoint URL",
-        placeHolder: "https://........",
-    },
-    accessKey: {
-        name: "Access Key",
-    },
-    secretKey: {
-        name: "Secret Key",
-    },
-    region: {
-        name: "Region",
-        placeHolder: "auto",
-    },
-    bucket: {
-        name: "Bucket Name",
-    },
-    useCustomRequestHandler: {
-        name: "Use Custom HTTP Handler",
-        desc: "Enable this if your Object Storage doesn't support CORS",
-    },
-    maxChunksInEden: {
-        name: "Maximum Incubating Chunks",
-        desc: "The maximum number of chunks that can be incubated within the document. Chunks exceeding this number will immediately graduate to independent chunks.",
-    },
-    maxTotalLengthInEden: {
-        name: "Maximum Incubating Chunk Size",
-        desc: "The maximum total size of chunks that can be incubated within the document. Chunks exceeding this size will immediately graduate to independent chunks.",
-    },
-    maxAgeInEden: {
-        name: "Maximum Incubation Period",
-        desc: "The maximum duration for which chunks can be incubated within the document. Chunks exceeding this period will graduate to independent chunks.",
-    },
-    settingSyncFile: {
-        name: "Filename",
-        desc: "Save settings to a markdown file. You will be notified when new settings arrive. You can set different files by the platform.",
-    },
-    preset: {
-        name: "Presets",
-        desc: "Apply preset configuration",
-    },
-    syncMode: {
-        name: "Sync Mode",
-    },
-    periodicReplicationInterval: {
-        name: "Periodic Sync interval",
-        desc: "Interval (sec)",
-    },
-    syncInternalFilesBeforeReplication: {
-        name: "Scan for hidden files before replication",
-    },
-    automaticallyDeleteMetadataOfDeletedFiles: {
-        name: "Delete old metadata of deleted files on start-up",
-        desc: "(Days passed, 0 to disable automatic-deletion)",
-    },
-    additionalSuffixOfDatabaseName: {
-        name: "Database suffix",
-        desc: "LiveSync could not handle multiple vaults which have same name without different prefix, This should be automatically configured.",
-    },
-    hashAlg: {
-        name: configurationNames["hashAlg"]?.name || "",
-        desc: "xxhash64 is the current default.",
-    },
-    deviceAndVaultName: {
-        name: "Device name",
-        desc: "Unique name between all synchronized devices. To edit this setting, please disable customization sync once.",
-    },
-    displayLanguage: {
-        name: "Display Language",
-        desc: 'Not all messages have been translated. And, please revert to "Default" when reporting errors.',
-    },
-    enableChunkSplitterV2: {
-        name: "Use splitting-limit-capped chunk splitter",
-        desc: "If enabled, chunks will be split into no more than 100 items. However, dedupe is slightly weaker.",
-    },
-    disableWorkerForGeneratingChunks: {
-        name: "Do not split chunks in the background",
-        desc: "If disabled(toggled), chunks will be split on the UI thread (Previous behaviour).",
-    },
-    processSmallFilesInUIThread: {
-        name: "Process small files in the foreground",
-        desc: "If enabled, the file under 1kb will be processed in the UI thread.",
-    },
-    batchSaveMinimumDelay: {
-        name: "Minimum delay for batch database updating",
-        desc: "Seconds. Saving to the local database will be delayed until this value after we stop typing or saving.",
-    },
-    batchSaveMaximumDelay: {
-        name: "Maximum delay for batch database updating",
-        desc: "Saving will be performed forcefully after this number of seconds.",
-    },
-    notifyThresholdOfRemoteStorageSize: {
-        name: "Notify when the estimated remote storage size exceeds on start up",
-        desc: "MB (0 to disable).",
-    },
-    usePluginSyncV2: {
-        name: "Enable per-file customization sync",
-        desc: "If enabled, efficient per-file customization sync will be used. A minor migration is required when enabling this feature, and all devices must be updated to v0.23.18. Enabling this feature will result in losing compatibility with older versions.",
-    },
-    handleFilenameCaseSensitive: {
-        name: "Handle files as Case-Sensitive",
-        desc: "If this enabled, All files are handled as case-Sensitive (Previous behaviour).",
-    },
-    doNotUseFixedRevisionForChunks: {
-        name: "Compute revisions for chunks",
-        desc: "If this enabled, all chunks will be stored with the revision made from its content.",
-    },
-    sendChunksBulkMaxSize: {
-        name: "Maximum size of chunks to send in one request",
-        desc: "MB",
-    },
-    useAdvancedMode: {
-        name: "Enable advanced features",
-        // desc: "Enable advanced mode"
-    },
-    usePowerUserMode: {
-        name: "Enable poweruser features",
-        // desc: "Enable power user mode",
-        // level: LEVEL_ADVANCED
-    },
-    useEdgeCaseMode: {
-        name: "Enable edge case treatment features",
-    },
-    enableDebugTools: {
-        name: "Enable Developers' Debug Tools.",
-        desc: "Requires restart of Obsidian",
-    },
-    suppressNotifyHiddenFilesChange: {
-        name: "Suppress notification of hidden files change",
-        desc: "If enabled, the notification of hidden files change will be suppressed.",
-    },
-    syncMinimumInterval: {
-        name: "Minimum interval for syncing",
-        desc: "The minimum interval for automatic synchronisation on event.",
-    },
-    useRequestAPI: {
-        name: "Use Request API to avoid `inevitable` CORS problem",
-        desc: "If enabled, the request API will be used to avoid `inevitable` CORS problems. This is a workaround and may not work in all cases. PLEASE READ THE DOCUMENTATION BEFORE USING THIS OPTION. This is a less-secure option.",
-    },
-    hideFileWarningNotice: {
-        name: "Show status icon instead of file warnings banner",
-        desc: "If enabled, the ⛔ icon will be shown inside the status instead of the file warnings banner. No details will be shown.",
-    },
-    bucketPrefix: {
-        name: "File prefix on the bucket",
-        desc: "Effectively a directory. Should end with `/`. e.g., `vault-name/`.",
-    },
-    chunkSplitterVersion: {
-        name: "Chunk Splitter",
-        desc: "Now we can choose how to split the chunks; V3 is the most efficient. If you have troubled, please make this Default or Legacy.",
-    },
-};
-function translateInfo(infoSrc: ConfigurationItem | undefined | false) {
-    if (!infoSrc) return false;
-    const info = { ...infoSrc };
-    info.name = $t(info.name);
-    if (info.desc) {
-        info.desc = $t(info.desc);
-    }
-    return info;
-}
-function _getConfig(key: AllSettingItemKey) {
-    if (key in configurationNames) {
-        return configurationNames[key as keyof ObsidianLiveSyncSettings];
-    }
-    if (key in SettingInformation) {
-        return SettingInformation[key as keyof ObsidianLiveSyncSettings];
-    }
-    return false;
-}
-export function getConfig(key: AllSettingItemKey) {
-    return translateInfo(_getConfig(key));
-}
-export function getConfName(key: AllSettingItemKey) {
-    const conf = getConfig(key);
-    if (!conf) return `${key} (No info)`;
-    return conf.name;
-}
+export * from "@lib/common/settingConstants.ts";

updates.md

@@ -1,5 +1,73 @@
+## 0.25.2 ~~0.25.1~~
+(0.25.1 was missed due to a mistake in the versioning process).
+19th July, 2025
+
+### Refined and New Features
+- Fetching the remote database on `RedFlag` now also retrieves remote configurations optionally.
+  - This is beneficial if we have already set up another device and wish to use the same configuration. We will see a much less frequent `Unmatched` dialogue.
+- The setup wizard using Set-up URI and QR code has been improved.
+  - The message is now more user-friendly.
+  - The obsolete method (manual setting application) has been removed.
+  - The `Cancel` button has been added to the setup wizard.
+  - We can now fetch the remote configuration from the server if it exists, which is useful for adding new devices.
+    - Mostly same as a `RedFlag` fetching remote configuration.
+  - We can also use the `Doctor` to check and fix the imported (and fetched) configuration before applying it.
+
+### Changes
+- The Set-up URI is now encrypted with a new encryption algorithm (mostly the same as `V2`).
+  - The new Set-up URI is not compatible with version 0.24.x or earlier.
+
+
+## 0.25.0
+19th July, 2025 (beta1 in 0.25.0-beta1, 13th July, 2025)
+
+After reading Issue #668, I conducted another self-review of the E2EE-related code. In retrospect, it was clearly written by someone inexperienced, which is understandable, but it is still rather embarrassing. Three years is certainly enough time for growth.
+
+I have now rewritten the E2EE code to be more robust and easier to understand. It is significantly more readable and should be easier to maintain in the future. The performance issue, previously considered a concern, has been addressed by introducing a master key and deriving keys using HKDF. This approach is both fast and robust, and it provides protection against rainbow table attacks. (In addition, this implementation has been [a dedicated package on the npm registry](https://github.com/vrtmrz/octagonal-wheels), and tested in 100% branch-coverage).
+
+As a result, this is the first time in a while that forward compatibility has been broken. We have also taken the opportunity to change all metadata to use encryption rather than obfuscation. Furthermore, the `Dynamic Iteration Count` setting is now redundant and has been moved to the `Patches` pane in the settings. Thanks to Rabin-Karp, the eden setting is also no longer necessary and has been relocated accordingly. Therefore, v0.25.0 represents a legitimate and correct evolution.
+
+### Fixed
+- The encryption algorithm now uses HKDF with a master key.
+    - This is more robust and faster than the previous implementation.
+    - It is now more secure against rainbow table attacks.
+    - The previous implementation can still be used via `Patches` -> `End-to-end encryption algorithm` -> `Force V1`.
+      - Note that `V1: Legacy` can decrypt V2, but produces V1 output.
+- `Fetch everything from the remote` now works correctly.
+    - It no longer creates local database entries before synchronisation.
+- Extra log messages during QR code decoding have been removed.
+
+### Changed
+- The following settings have been moved to the `Patches` pane:
+    - `Remote Database Tweak`
+      - `Incubate Chunks in Document`
+      - `Data Compression`
+
+### Behavioural and API Changes
+- `DirectFileManipulatorV2` now requires new settings (as you may already know, E2EEAlgorithm).
+- The database version has been increased to `12` from `10`.
+    - If an older version is detected, we will be notified and synchronisation will be paused until the update is acknowledged. (It has been a long time since this behaviour was last encountered; we always err on the side of caution, even if it is less convenient.)
+
+### Refactored
+- `couchdb_utils.ts` has been separated into several explicitly named files.
+- Some missing functions in `bgWorker.mock.ts` have been added.
+
+## 0.24.31
+10th July, 2025
+
+### Fixed
+
+- The description of `Enable Developers' Debug Tools.` has been refined.
+    - Now performance impact is more clearly stated.
+- Automatic conflict checking and resolution has been improved.
+    - It now works parallelly for each other file, instead of sequentially. It makes significantly faster on first synchronisation when with local files information.
+- Resolving conflicts dialogue will not be shown for the multiple files at once.
+    - It will be shown for each file, one by one.
+
 ## 0.24.30
 
+9th July, 2025
+
 ### New Feature
 
 - New chunking algorithm `V3: Fine deduplication` has been added, and will be recommended after updates.
@@ -30,8 +98,14 @@
 - Never-ending `ObsidianLiveSyncSettingTab.ts` has finally been separated into each pane's file.
 - Some commented-out code has been removed.
 
+### Acknowledgement
+
+- Jun Murakami, Shun Ishiguro, and Yoshihiro Oyama. 2012. Implementation and Evaluation of a Cache Deduplication Mechanism with Content-Defined Chunking. In _IPSJ SIG Technical Report_, Vol.2012-ARC-202, No.4. Information Processing Society of Japan, 1-7.
+
 ## 0.24.29
 
+20th June, 2025
+
 ### Fixed
 
 - Synchronisation with buckets now works correctly, regardless of whether a prefix is set or the bucket has been (re-) initialised (#664).
@@ -41,145 +115,5 @@
 
 - Importing paths have been tidied up.
 
-## 0.24.28
-
-### Fixed
-
-- Batch Update is no longer available in LiveSync mode to avoid unexpected behaviour. (#653)
-- Now compatible with Cloudflare R2 again for bucket synchronisation.
-    - @edo-bari-ikutsu, thank you for [your contribution](https://github.com/vrtmrz/livesync-commonlib/pull/12)!
-- Prevention of broken behaviour due to database connection failures added (#649).
-
-## 0.24.27
-
-### Improved
-
-- We can use prefix for path for the Bucket synchronisation.
-    - For example, if you set the `vaultName/` as a prefix for the bucket in the root directory, all data will be transferred to the bucket under the `vaultName/` directory.
-- The "Use Request API to avoid `inevitable` CORS problem" option is now promoted to the normal setting, not a niche patch.
-
-### Fixed
-
-- Now switching replicators applied immediately, without the need to restart Obsidian.
-
-### Tidied up
-
-- Some dependencies have been updated to the latest version.
-
-## 0.24.26
-
-This update introduces an option to circumvent Cross-Origin Resource Sharing
-(CORS) constraints for CouchDB requests, by leveraging Obsidian's native request
-API. The implementation of such a feature had previously been deferred due to
-significant security considerations.
-
-CORS is a vital security mechanism, enabling servers like CouchDB -- which
-functions as a sophisticated REST API -- to control access from different
-origins, thereby ensuring secure communication across trust boundaries. I had
-long hesitated to offer a CORS circumvention method, as it deviates from
-security best practices; My preference was for users to configure CORS correctly
-on the server-side.
-
-However, this policy has shifted due to specific reports of intractable
-CORS-related configuration issues, particularly within enterprise proxy
-environments where proxy servers can unpredictably alter or block
-communications. Given that a primary objective of the "Self-hosted LiveSync"
-plugin is to facilitate secure Obsidian usage within stringent corporate
-settings, addressing these 'unavoidable' user-reported problems became
-essential. Mostly raison d'être of this plugin.
-
-Consequently, the option "Use Request API to avoid `inevitable` CORS problem"
-has been implemented. Users are strongly advised to enable this _only_ when
-operating within a trusted environment. We can enable this option in the `Patch` pane.
-
-However, just to whisper, this is tremendously fast.
-
-### New Features
-
-- Automatic display-language changing according to the Obsidian language
-  setting.
-    - We will be asked on the migration or first startup.
-    - **Note: Please revert to the default language if you report any issues.**
-    - Not all messages are translated yet. We welcome your contribution!
-- Now we can limit files to be synchronised even in the hidden files.
-- "Use Request API to avoid `inevitable` CORS problem" has been implemented.
-    - Less secure, please use it only if you are sure that you are in the trusted
-      environment and be able to ignore the CORS. No `Web viewer` or similar tools
-      are recommended. (To avoid the origin forged attack). If you are able to
-      configure the server setting, always that is recommended.
-- `Show status icon instead of file warnings banner` has been implemented.
-    - If enabled, the ⛔ icon will be shown inside the status instead of the file
-      warnings banner. No details will be shown.
-
-### Improved
-
-- All regular expressions can be inverted by prefixing `!!` now.
-
-### Fixed
-
-- No longer unexpected files will be gathered during hidden file sync.
-- No longer broken `\n` and new-line characters during the bucket
-  synchronisation.
-- We can purge the remote bucket again if we using MinIO instead of AWS S3 or
-  Cloudflare R2.
-- Purging the remote bucket is now more reliable.
-    - 100 files are purged at a time.
-- Some wrong messages have been fixed.
-
-### Behaviour changed
-
-- Entering into the deeper directories to gather the hidden files is now limited
-  by `/` or `\/` prefixed ignore filters. (It means that directories are scanned
-  deeper than before).
-    - However, inside the these directories, the files are still limited by the
-      ignore filters.
-
-### Etcetera
-
-- Some code has been tidied up.
-- Trying less warning-suppressing and be more safer-coding.
-- Dependent libraries have been updated to the latest version.
-- Some build processes have been separated to `pre` and `post` processes.
-
-## 0.24.25
-
-### Improved
-
-- Peer-to-peer synchronisation has been got more robust.
-
-### Fixed
-
-- No longer broken falsy values in settings during set-up by the QR code
-  generation.
-
-### Refactored
-
-- Some `window` references now have pointed to `globalThis`.
-- Some sloppy-import has been fixed.
-- A server side implementation `Synchromesh` has been suffixed with `deno`
-  instead of `server` now.
-
-## 0.24.24
-
-### Fixed
-
-- No longer broken JSON files including `\n`, during the bucket synchronisation.
-  (#623)
-- Custom headers and JWT tokens are now correctly sent to the server during
-  configuration checking. (#624)
-
-### Improved
-
-- Bucket synchronisation has been enhanced for better performance and
-  reliability.
-    - Now less duplicated chunks are sent to the server. Note: If you have
-      encountered about too less chunks, please let me know. However, you can send
-      it to the server by `Overwrite remote`.
-    - Fetching conflicted files from the server is now more reliable.
-    - Dependent libraries have been updated to the latest version.
-        - Also, let me know if you have encountered any issues with this update.
-          Especially you are using a device that has been in use for a little
-          longer.
-
 Older notes are in
 [updates_old.md](https://github.com/vrtmrz/obsidian-livesync/blob/main/updates_old.md).

updates_old.md

@@ -14,8 +14,161 @@ Thank you, and I hope your troubles will be resolved!
 
 ---
 
+## 0.24.28
+
+15th June, 2025
+
+### Fixed
+
+- Batch Update is no longer available in LiveSync mode to avoid unexpected behaviour. (#653)
+- Now compatible with Cloudflare R2 again for bucket synchronisation.
+    - @edo-bari-ikutsu, thank you for [your contribution](https://github.com/vrtmrz/livesync-commonlib/pull/12)!
+- Prevention of broken behaviour due to database connection failures added (#649).
+
+## 0.24.27
+
+10th June, 2025
+
+### Improved
+
+- We can use prefix for path for the Bucket synchronisation.
+    - For example, if you set the `vaultName/` as a prefix for the bucket in the root directory, all data will be transferred to the bucket under the `vaultName/` directory.
+- The "Use Request API to avoid `inevitable` CORS problem" option is now promoted to the normal setting, not a niche patch.
+
+### Fixed
+
+- Now switching replicators applied immediately, without the need to restart Obsidian.
+
+### Tidied up
+
+- Some dependencies have been updated to the latest version.
+
+## 0.24.26
+
+14th May, 2025
+
+This update introduces an option to circumvent Cross-Origin Resource Sharing
+(CORS) constraints for CouchDB requests, by leveraging Obsidian's native request
+API. The implementation of such a feature had previously been deferred due to
+significant security considerations.
+
+CORS is a vital security mechanism, enabling servers like CouchDB -- which
+functions as a sophisticated REST API -- to control access from different
+origins, thereby ensuring secure communication across trust boundaries. I had
+long hesitated to offer a CORS circumvention method, as it deviates from
+security best practices; My preference was for users to configure CORS correctly
+on the server-side.
+
+However, this policy has shifted due to specific reports of intractable
+CORS-related configuration issues, particularly within enterprise proxy
+environments where proxy servers can unpredictably alter or block
+communications. Given that a primary objective of the "Self-hosted LiveSync"
+plugin is to facilitate secure Obsidian usage within stringent corporate
+settings, addressing these 'unavoidable' user-reported problems became
+essential. Mostly raison d'être of this plugin.
+
+Consequently, the option "Use Request API to avoid `inevitable` CORS problem"
+has been implemented. Users are strongly advised to enable this _only_ when
+operating within a trusted environment. We can enable this option in the `Patch` pane.
+
+However, just to whisper, this is tremendously fast.
+
+### New Features
+
+- Automatic display-language changing according to the Obsidian language
+  setting.
+    - We will be asked on the migration or first startup.
+    - **Note: Please revert to the default language if you report any issues.**
+    - Not all messages are translated yet. We welcome your contribution!
+- Now we can limit files to be synchronised even in the hidden files.
+- "Use Request API to avoid `inevitable` CORS problem" has been implemented.
+    - Less secure, please use it only if you are sure that you are in the trusted
+      environment and be able to ignore the CORS. No `Web viewer` or similar tools
+      are recommended. (To avoid the origin forged attack). If you are able to
+      configure the server setting, always that is recommended.
+- `Show status icon instead of file warnings banner` has been implemented.
+    - If enabled, the ⛔ icon will be shown inside the status instead of the file
+      warnings banner. No details will be shown.
+
+### Improved
+
+- All regular expressions can be inverted by prefixing `!!` now.
+
+### Fixed
+
+- No longer unexpected files will be gathered during hidden file sync.
+- No longer broken `\n` and new-line characters during the bucket
+  synchronisation.
+- We can purge the remote bucket again if we using MinIO instead of AWS S3 or
+  Cloudflare R2.
+- Purging the remote bucket is now more reliable.
+    - 100 files are purged at a time.
+- Some wrong messages have been fixed.
+
+### Behaviour changed
+
+- Entering into the deeper directories to gather the hidden files is now limited
+  by `/` or `\/` prefixed ignore filters. (It means that directories are scanned
+  deeper than before).
+    - However, inside the these directories, the files are still limited by the
+      ignore filters.
+
+### Etcetera
+
+- Some code has been tidied up.
+- Trying less warning-suppressing and be more safer-coding.
+- Dependent libraries have been updated to the latest version.
+- Some build processes have been separated to `pre` and `post` processes.
+
+
+## 0.24.25
+
+22nd April, 2025
+
+### Improved
+
+- Peer-to-peer synchronisation has been got more robust.
+
+### Fixed
+
+- No longer broken falsy values in settings during set-up by the QR code
+  generation.
+
+### Refactored
+
+- Some `window` references now have pointed to `globalThis`.
+- Some sloppy-import has been fixed.
+- A server side implementation `Synchromesh` has been suffixed with `deno`
+  instead of `server` now.
+
+## 0.24.24
+
+15th April, 2025
+
+### Fixed
+
+- No longer broken JSON files including `\n`, during the bucket synchronisation.
+  (#623)
+- Custom headers and JWT tokens are now correctly sent to the server during
+  configuration checking. (#624)
+
+### Improved
+
+- Bucket synchronisation has been enhanced for better performance and
+  reliability.
+    - Now less duplicated chunks are sent to the server. Note: If you have
+      encountered about too less chunks, please let me know. However, you can send
+      it to the server by `Overwrite remote`.
+    - Fetching conflicted files from the server is now more reliable.
+    - Dependent libraries have been updated to the latest version.
+        - Also, let me know if you have encountered any issues with this update.
+          Especially you are using a device that has been in use for a little
+          longer.
+
 ## 0.24.23
 
+10th April, 2025
+
 ### New Feature
 
 - Now, we can send custom headers to the server.
@@ -37,6 +190,8 @@ Thank you, and I hope your troubles will be resolved!
 
 ## 0.24.22 ~~0.24.21~~
 
+1st April, 2025
+
 (Really sorry for the confusion. I have got a miss at releasing...).
 
 ### Fixed
@@ -65,6 +220,8 @@ Thank you, and I hope your troubles will be resolved!
 
 ## 0.24.20
 
+24th March, 2025
+
 ### Improved
 
 - Now we can see the detail of `TypeError` using Obsidian API during remote
@@ -79,6 +236,8 @@ Thank you, and I hope your troubles will be resolved!
 
 ## 0.24.19
 
+5th March, 2025
+
 ### New Feature
 
 - Now we can generate a QR Code for transferring the configuration to another device.
@@ -87,6 +246,8 @@ Thank you, and I hope your troubles will be resolved!
 
 ## 0.24.18
 
+28th February, 2025
+
 ### Fixed
 
 - Now no chunk creation errors will be raised after switching `Compute revisions for chunks`.
@@ -106,10 +267,13 @@ Thank you, and I hope your troubles will be resolved!
 
 ## 0.24.17
 
+27th February, 2025
+
 Confession. I got the default values wrong. So scary and sorry.
 
 ## 0.24.16
 
+
 ### Improved
 
 #### Peer-to-Peer