bump

- The modified document will be reflected in the storage now.

.eslintignore

@@ -1,3 +1,4 @@
-npm node_modules
+node_modules
 build
-.eslintrc.js.bak
+.eslintrc.js.bak
+src/lib/src/patches/pouchdb-utils

README.md

@@ -82,7 +82,9 @@ If you have deleted or renamed files, please wait until ⏳ icon disappeared.
 -   There are no 'exclude_folders' like configurations.
 -   While synchronizing, files are compared by their modification time and the older ones will be overwritten by the newer ones. Then plugin checks for conflicts and if a merge is needed, a dialog will open.
 -   Rarely, a file in the database could be corrupted. The plugin will not write to local storage when a file looks corrupted. If a local version of the file is on your device, the corruption could be fixed by editing the local file and synchronizing it. But if the file does not exist on any of your devices, then it can not be rescued. In this case, you can delete these items from the settings dialog.
--   To stop the boot-up sequence (eg. for fixing problems on databases), you can put a `redflag.md` file at the root of your vault.
+-   To stop the boot-up sequence (eg. for fixing problems on databases), you can put a `redflag.md` file (or directory) at the root of your vault.
+    Tip for iOS: a redflag directory can be created at the root of the vault using the File application.
+-   Also, with `redflag2.md` placed, we can automatically rebuild both the local and the remote databases during the boot-up sequence. With `redflag3.md`, we can discard only the local database and fetch from the remote again.
 -   Q: The database is growing, how can I shrink it down?
     A: each of the docs is saved with their past 100 revisions for detecting and resolving conflicts. Picturing that one device has been offline for a while, and comes online again. The device has to compare its notes with the remotely saved ones. If there exists a historic revision in which the note used to be identical, it could be updated safely (like git fast-forward). Even if that is not in revision histories, we only have to check the differences after the revision that both devices commonly have. This is like git's conflict-resolving method. So, We have to make the database again like an enlarged git repo if you want to solve the root of the problem.
 -   And more technical Information is in the [Technical Information](docs/tech_info.md)

esbuild.config.mjs

@@ -25,14 +25,16 @@ esbuild
             "MANIFEST_VERSION": `"${manifestJson.version}"`,
             "PACKAGE_VERSION": `"${packageJson.version}"`,
             "UPDATE_INFO": `${updateInfo}`,
+            "global":"window",
         },
-        external: ["obsidian", "electron", ...builtins],
+        external: ["obsidian", "electron", "crypto"],
         format: "cjs",
         watch: !prod,
         target: "es2018",
         logLevel: "info",
         sourcemap: prod ? false : "inline",
         treeShaking: true,
+        platform: "browser",
         plugins: [
             sveltePlugin({
                 preprocess: sveltePreprocess(),

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.17.7",
+    "version": "0.17.26",
     "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.17.7",
+    "version": "0.17.26",
     "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",
@@ -24,11 +24,21 @@
         "eslint": "^8.28.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
+        "events": "^3.3.0",
         "obsidian": "^0.16.3",
         "postcss": "^8.4.19",
         "postcss-load-config": "^4.0.1",
+        "pouchdb-adapter-http": "^8.0.0",
+        "pouchdb-adapter-idb": "^8.0.0",
+        "pouchdb-adapter-indexeddb": "^8.0.0",
+        "pouchdb-core": "^8.0.0",
+        "pouchdb-find": "^8.0.0",
+        "pouchdb-mapreduce": "^8.0.0",
+        "pouchdb-replication": "^8.0.0",
+        "pouchdb-utils": "file:src/lib/src/patches/pouchdb-utils",
         "svelte": "^3.53.1",
         "svelte-preprocess": "^4.10.7",
+        "transform-pouch": "^2.0.0",
         "tslib": "^2.4.1",
         "typescript": "^4.9.3"
     },

src/ConflictResolveModal.ts

@@ -1,17 +1,19 @@
 import { App, Modal } from "obsidian";
 import { DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT } from "diff-match-patch";
 import { diff_result } from "./lib/src/types";
-import { escapeStringToHTML } from "./lib/src/utils";
+import { escapeStringToHTML } from "./lib/src/strbin";
 
 export class ConflictResolveModal extends Modal {
     // result: Array<[number, string]>;
     result: diff_result;
+    filename: string;
     callback: (remove_rev: string) => Promise<void>;
 
-    constructor(app: App, diff: diff_result, callback: (remove_rev: string) => Promise<void>) {
+    constructor(app: App, filename: string, diff: diff_result, callback: (remove_rev: string) => Promise<void>) {
         super(app);
         this.result = diff;
         this.callback = callback;
+        this.filename = filename;
     }
 
     onOpen() {
@@ -20,6 +22,7 @@ export class ConflictResolveModal extends Modal {
         contentEl.empty();
 
         contentEl.createEl("h2", { text: "This document has conflicted changes." });
+        contentEl.createEl("span", { text: this.filename });
         const div = contentEl.createDiv("");
         div.addClass("op-scrollable");
         let diff = "";

src/DocumentHistoryModal.ts

@@ -1,10 +1,12 @@
 import { TFile, Modal, App } from "obsidian";
-import { path2id } from "./utils";
-import { base64ToArrayBuffer, base64ToString, escapeStringToHTML, isValidPath } from "./lib/src/utils";
+import { isValidPath, path2id } from "./utils";
+import { base64ToArrayBuffer, base64ToString, escapeStringToHTML } from "./lib/src/strbin";
 import ObsidianLiveSyncPlugin from "./main";
 import { DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_patch } from "diff-match-patch";
 import { LoadedEntry, LOG_LEVEL } from "./lib/src/types";
 import { Logger } from "./lib/src/logger";
+import { isErrorOfMissingDoc } from "./lib/src/utils_couchdb";
+import { getDocData } from "./lib/src/utils";
 
 export class DocumentHistoryModal extends Modal {
     plugin: ObsidianLiveSyncPlugin;
@@ -33,13 +35,13 @@ export class DocumentHistoryModal extends Modal {
         const db = this.plugin.localDatabase;
         try {
             const w = await db.localDatabase.get(path2id(this.file), { revs_info: true });
-            this.revs_info = w._revs_info.filter((e) => e.status == "available");
+            this.revs_info = w._revs_info.filter((e) => e?.status == "available");
             this.range.max = `${this.revs_info.length - 1}`;
             this.range.value = this.range.max;
             this.fileInfo.setText(`${this.file} / ${this.revs_info.length} revisions`);
             await this.loadRevs();
         } catch (ex) {
-            if (ex.status && ex.status == 404) {
+            if (isErrorOfMissingDoc(ex)) {
                 this.range.max = "0";
                 this.range.value = "";
                 this.range.disabled = true;
@@ -64,7 +66,7 @@ export class DocumentHistoryModal extends Modal {
             this.currentDoc = w;
             this.info.innerHTML = `Modified:${new Date(w.mtime).toLocaleString()}`;
             let result = "";
-            const w1data = w.datatype == "plain" ? w.data : base64ToString(w.data);
+            const w1data = w.datatype == "plain" ? getDocData(w.data) : base64ToString(w.data);
             this.currentDeleted = w.deleted;
             this.currentText = w1data;
             if (this.showDiff) {
@@ -74,7 +76,7 @@ export class DocumentHistoryModal extends Modal {
                     const w2 = await db.getDBEntry(path2id(this.file), { rev: oldRev }, false, false, true);
                     if (w2 != false) {
                         const dmp = new diff_match_patch();
-                        const w2data = w2.datatype == "plain" ? w2.data : base64ToString(w2.data);
+                        const w2data = w2.datatype == "plain" ? getDocData(w2.data) : base64ToString(w2.data);
                         const diff = dmp.diff_main(w2data, w1data);
                         dmp.diff_cleanupSemantic(diff);
                         for (const v of diff) {
@@ -176,7 +178,7 @@ export class DocumentHistoryModal extends Modal {
                     Logger("Path is not valid to write content.", LOG_LEVEL.INFO);
                 }
                 if (this.currentDoc?.datatype == "plain") {
-                    await this.app.vault.adapter.write(pathToWrite, this.currentDoc.data);
+                    await this.app.vault.adapter.write(pathToWrite, getDocData(this.currentDoc.data));
                     await focusFile(pathToWrite);
                     this.close();
                 } else if (this.currentDoc?.datatype == "newnote") {

src/JsonResolveModal.ts

@@ -0,0 +1,54 @@
+import { App, Modal } from "obsidian";
+import { LoadedEntry } from "./lib/src/types";
+import JsonResolvePane from "./JsonResolvePane.svelte";
+
+export class JsonResolveModal extends Modal {
+    // result: Array<[number, string]>;
+    filename: string;
+    callback: (keepRev: string, mergedStr?: string) => Promise<void>;
+    docs: LoadedEntry[];
+    component: JsonResolvePane;
+
+    constructor(app: App, filename: string, docs: LoadedEntry[], callback: (keepRev: string, mergedStr?: string) => Promise<void>) {
+        super(app);
+        this.callback = callback;
+        this.filename = filename;
+        this.docs = docs;
+    }
+    async UICallback(keepRev: string, mergedStr?: string) {
+        this.close();
+        await this.callback(keepRev, mergedStr);
+        this.callback = null;
+    }
+
+    onOpen() {
+        const { contentEl } = this;
+
+        contentEl.empty();
+
+        if (this.component == null) {
+            this.component = new JsonResolvePane({
+                target: contentEl,
+                props: {
+                    docs: this.docs,
+                    callback: (keepRev, mergedStr) => this.UICallback(keepRev, mergedStr),
+                },
+            });
+        }
+        return;
+    }
+
+
+    onClose() {
+        const { contentEl } = this;
+        contentEl.empty();
+        // contentEl.empty();
+        if (this.callback != null) {
+            this.callback(null);
+        }
+        if (this.component != null) {
+            this.component.$destroy();
+            this.component = null;
+        }
+    }
+}

src/JsonResolvePane.svelte

@@ -0,0 +1,162 @@
+<script lang="ts">
+    import { Diff, DIFF_DELETE, DIFF_INSERT, diff_match_patch } from "diff-match-patch";
+    import type { LoadedEntry } from "./lib/src/types";
+    import { base64ToString } from "./lib/src/strbin";
+    import { getDocData } from "./lib/src/utils";
+    import { mergeObject } from "./utils";
+
+    export let docs: LoadedEntry[] = [];
+    export let callback: (keepRev: string, mergedStr?: string) => Promise<void> = async (_, __) => {
+        Promise.resolve();
+    };
+
+    let docA: LoadedEntry = undefined;
+    let docB: LoadedEntry = undefined;
+    let docAContent = "";
+    let docBContent = "";
+    let objA: any = {};
+    let objB: any = {};
+    let objAB: any = {};
+    let objBA: any = {};
+    let diffs: Diff[];
+    const modes = [
+        ["", "Not now"],
+        ["A", "A"],
+        ["B", "B"],
+        ["AB", "A + B"],
+        ["BA", "B + A"],
+    ] as ["" | "A" | "B" | "AB" | "BA", string][];
+    let mode: "" | "A" | "B" | "AB" | "BA" = "";
+
+    function docToString(doc: LoadedEntry) {
+        return doc.datatype == "plain" ? getDocData(doc.data) : base64ToString(doc.data);
+    }
+    function revStringToRevNumber(rev: string) {
+        return rev.split("-")[0];
+    }
+
+    function getDiff(left: string, right: string) {
+        const dmp = new diff_match_patch();
+        const mapLeft = dmp.diff_linesToChars_(left, right);
+        const diffLeftSrc = dmp.diff_main(mapLeft.chars1, mapLeft.chars2, false);
+        dmp.diff_charsToLines_(diffLeftSrc, mapLeft.lineArray);
+        return diffLeftSrc;
+    }
+    function getJsonDiff(a: object, b: object) {
+        return getDiff(JSON.stringify(a, null, 2), JSON.stringify(b, null, 2));
+    }
+    function apply() {
+        if (mode == "A") return callback(docA._rev, null);
+        if (mode == "B") return callback(docB._rev, null);
+        if (mode == "BA") return callback(null, JSON.stringify(objBA, null, 2));
+        if (mode == "AB") return callback(null, JSON.stringify(objAB, null, 2));
+        callback(null, null);
+    }
+    $: {
+        if (docs && docs.length >= 1) {
+            if (docs[0].mtime < docs[1].mtime) {
+                docA = docs[0];
+                docB = docs[1];
+            } else {
+                docA = docs[1];
+                docB = docs[0];
+            }
+            docAContent = docToString(docA);
+            docBContent = docToString(docB);
+
+            try {
+                objA = false;
+                objB = false;
+                objA = JSON.parse(docAContent);
+                objB = JSON.parse(docBContent);
+                objAB = mergeObject(objA, objB);
+                objBA = mergeObject(objB, objA);
+                if (JSON.stringify(objAB) == JSON.stringify(objBA)) {
+                    objBA = false;
+                }
+            } catch (ex) {
+                objBA = false;
+                objAB = false;
+            }
+        }
+    }
+    $: mergedObjs = {
+        "": false,
+        A: objA,
+        B: objB,
+        AB: objAB,
+        BA: objBA,
+    };
+
+    $: selectedObj = mode in mergedObjs ? mergedObjs[mode] : {};
+    $: {
+        diffs = getJsonDiff(objA, selectedObj);
+        console.dir(selectedObj);
+    }
+</script>
+
+<h1>File Conflicted</h1>
+{#if !docA || !docB}
+    <div class="message">Just for a minute, please!</div>
+    <div class="buttons">
+        <button on:click={apply}>Dismiss</button>
+    </div>
+{:else}
+    <div class="options">
+        {#each modes as m}
+            {#if m[0] == "" || mergedObjs[m[0]] != false}
+                <label class={`sls-setting-label ${m[0] == mode ? "selected" : ""}`}
+                    ><input type="radio" name="disp" bind:group={mode} value={m[0]} class="sls-setting-tab" />
+                    <div class="sls-setting-menu-btn">{m[1]}</div></label
+                >
+            {/if}
+        {/each}
+    </div>
+
+    {#if selectedObj != false}
+        <div class="op-scrollable json-source">
+            {#each diffs as diff}
+                <span class={diff[0] == DIFF_DELETE ? "deleted" : diff[0] == DIFF_INSERT ? "added" : "normal"}>{diff[1]}</span>
+            {/each}
+        </div>
+    {:else}
+        NO PREVIEW
+    {/if}
+    <div>
+        A Rev:{revStringToRevNumber(docA._rev)} ,{new Date(docA.mtime).toLocaleString()}
+        {docAContent.length} letters
+    </div>
+
+    <div>
+        B Rev:{revStringToRevNumber(docB._rev)} ,{new Date(docB.mtime).toLocaleString()}
+        {docBContent.length} letters
+    </div>
+
+    <div class="buttons">
+        <button on:click={apply}>Apply</button>
+    </div>
+{/if}
+
+<style>
+    .deleted {
+        text-decoration: line-through;
+    }
+    * {
+        box-sizing: border-box;
+    }
+
+    .scroller {
+        display: flex;
+        flex-direction: column;
+        overflow-y: scroll;
+        max-height: 60vh;
+        user-select: text;
+    }
+    .json-source {
+        white-space: pre;
+        height: auto;
+        overflow: auto;
+        min-height: var(--font-ui-medium);
+        flex-grow: 1;
+    }
+</style>

src/LocalPouchDB.ts

@@ -3,14 +3,15 @@ import { KeyValueDatabase, OpenKeyValueDatabase } from "./KeyValueDB.js";
 import { LocalPouchDBBase } from "./lib/src/LocalPouchDBBase.js";
 import { Logger } from "./lib/src/logger.js";
 import { PouchDB } from "./lib/src/pouchdb-browser.js";
-import { EntryDoc, LOG_LEVEL } from "./lib/src/types.js";
-import { enableEncryption } from "./lib/src/utils.js";
+import { EntryDoc, LOG_LEVEL, ObsidianLiveSyncSettings } from "./lib/src/types.js";
+import { enableEncryption } from "./lib/src/utils_couchdb.js";
 import { isCloudantURI, isValidRemoteCouchDBURI } from "./lib/src/utils_couchdb.js";
 import { id2path, path2id } from "./utils.js";
 
 export class LocalPouchDB extends LocalPouchDBBase {
 
     kvDB: KeyValueDatabase;
+    settings: ObsidianLiveSyncSettings;
     id2path(filename: string): string {
         return id2path(filename);
     }
@@ -18,6 +19,10 @@ export class LocalPouchDB extends LocalPouchDBBase {
         return path2id(filename);
     }
     CreatePouchDBInstance<T>(name?: string, options?: PouchDB.Configuration.DatabaseConfiguration): PouchDB.Database<T> {
+        if (this.settings.useIndexedDBAdapter) {
+            options.adapter = "indexeddb";
+            return new PouchDB(name + "-indexeddb", options);
+        }
         return new PouchDB(name, options);
     }
     beforeOnUnload(): void {
@@ -52,7 +57,7 @@ export class LocalPouchDB extends LocalPouchDBBase {
     }
 
 
-    async connectRemoteCouchDB(uri: string, auth: { username: string; password: string }, disableRequestURI: boolean, passphrase: string | boolean, useDynamicIterationCount: boolean): Promise<string | { db: PouchDB.Database<EntryDoc>; info: PouchDB.Core.DatabaseInfo }> {
+    async connectRemoteCouchDB(uri: string, auth: { username: string; password: string }, disableRequestURI: boolean, passphrase: string | false, useDynamicIterationCount: boolean): 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.";
         if (uri.indexOf(" ") !== -1) return "Remote URI and database name could not contain spaces.";
@@ -154,7 +159,7 @@ export class LocalPouchDB extends LocalPouchDBBase {
         };
 
         const db: PouchDB.Database<EntryDoc> = new PouchDB<EntryDoc>(uri, conf);
-        if (passphrase && typeof passphrase === "string") {
+        if (passphrase !== "false" && typeof passphrase === "string") {
             enableEncryption(db, passphrase, useDynamicIterationCount);
         }
         try {

src/LogDisplayModal.ts

@@ -1,21 +1,17 @@
 import { App, Modal } from "obsidian";
-import { escapeStringToHTML } from "./lib/src/utils";
+import { logMessageStore } from "./lib/src/stores";
+import { escapeStringToHTML } from "./lib/src/strbin";
 import ObsidianLiveSyncPlugin from "./main";
 
 export class LogDisplayModal extends Modal {
     plugin: ObsidianLiveSyncPlugin;
     logEl: HTMLDivElement;
+    unsubscribe: () => void;
     constructor(app: App, plugin: ObsidianLiveSyncPlugin) {
         super(app);
         this.plugin = plugin;
     }
-    updateLog() {
-        let msg = "";
-        for (const v of this.plugin.logMessage) {
-            msg += escapeStringToHTML(v) + "<br>";
-        }
-        this.logEl.innerHTML = msg;
-    }
+
     onOpen() {
         const { contentEl } = this;
 
@@ -25,13 +21,18 @@ export class LogDisplayModal extends Modal {
         div.addClass("op-scrollable");
         div.addClass("op-pre");
         this.logEl = div;
-        this.updateLog = this.updateLog.bind(this);
-        this.plugin.addLogHook = this.updateLog;
-        this.updateLog();
+        this.unsubscribe = logMessageStore.observe((e) => {
+            let msg = "";
+            for (const v of e) {
+                msg += escapeStringToHTML(v) + "<br>";
+            }
+            this.logEl.innerHTML = msg;
+        })
+        logMessageStore.invalidate();
     }
     onClose() {
         const { contentEl } = this;
         contentEl.empty();
-        this.plugin.addLogHook = null;
+        if (this.unsubscribe) this.unsubscribe();
     }
 }

src/ObsidianLiveSyncSettingTab.ts

@@ -1,7 +1,9 @@
 import { App, PluginSettingTab, Setting, sanitizeHTMLToDom, RequestUrlParam, requestUrl, TextAreaComponent, MarkdownRenderer, stringifyYaml } from "obsidian";
-import { DEFAULT_SETTINGS, LOG_LEVEL, ObsidianLiveSyncSettings, RemoteDBSettings } from "./lib/src/types";
+import { DEFAULT_SETTINGS, LOG_LEVEL, ObsidianLiveSyncSettings, ConfigPassphraseStore, RemoteDBSettings } from "./lib/src/types";
 import { path2id, id2path } from "./utils";
-import { delay, Semaphore, versionNumberString2Number } from "./lib/src/utils";
+import { delay } from "./lib/src/utils";
+import { Semaphore } from "./lib/src/semaphore";
+import { versionNumberString2Number } from "./lib/src/strbin";
 import { Logger } from "./lib/src/logger";
 import { checkSyncInfo, isCloudantURI } from "./lib/src/utils_couchdb.js";
 import { testCrypt } from "./lib/src/e2ee_v2";
@@ -41,6 +43,9 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
     }
     display(): void {
         const { containerEl } = this;
+        let encrypt = this.plugin.settings.encrypt;
+        let passphrase = this.plugin.settings.passphrase;
+        let useDynamicIterationCount = this.plugin.settings.useDynamicIterationCount;
 
         containerEl.empty();
 
@@ -133,6 +138,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             if (this.plugin.settings.syncOnFileOpen) return true;
             if (this.plugin.settings.syncOnSave) return true;
             if (this.plugin.settings.syncOnStart) return true;
+            if (this.plugin.settings.syncAfterMerge) return true;
             if (this.plugin.localDatabase.syncStatus == "CONNECTED") return true;
             if (this.plugin.localDatabase.syncStatus == "PAUSED") return true;
             return false;
@@ -144,7 +150,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         new Setting(setupWizardEl)
             .setName("Discard the existing configuration and set up")
             .addButton((text) => {
-                text.setButtonText("Next").onClick(async () => {
+                text.setButtonText("Next").onClick(() => {
                     if (JSON.stringify(this.plugin.settings) != JSON.stringify(DEFAULT_SETTINGS)) {
                         this.plugin.localDatabase.closeReplication();
                         this.plugin.settings = { ...DEFAULT_SETTINGS };
@@ -170,6 +176,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     this.plugin.settings.syncOnSave = false;
                     this.plugin.settings.syncOnStart = false;
                     this.plugin.settings.syncOnFileOpen = false;
+                    this.plugin.settings.syncAfterMerge = false;
                     this.plugin.localDatabase.closeReplication();
                     await this.plugin.saveSettings();
                     containerEl.addClass("isWizard");
@@ -226,7 +233,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 syncLive.forEach((e) => {
                     e.setDisabled(false).setTooltip("");
                 });
-            } else if (this.plugin.settings.syncOnFileOpen || this.plugin.settings.syncOnSave || this.plugin.settings.syncOnStart || this.plugin.settings.periodicReplication) {
+            } else if (this.plugin.settings.syncOnFileOpen || this.plugin.settings.syncOnSave || this.plugin.settings.syncOnStart || this.plugin.settings.periodicReplication || this.plugin.settings.syncAfterMerge) {
                 syncNonLive.forEach((e) => {
                     e.setDisabled(false).setTooltip("");
                 });
@@ -289,68 +296,78 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             )
 
         );
-        new Setting(containerRemoteDatabaseEl)
+        const e2e = new Setting(containerRemoteDatabaseEl)
             .setName("End to End Encryption")
             .setDesc("Encrypt contents on the remote database. If you use the plugin's synchronization feature, enabling this is recommend.")
             .addToggle((toggle) =>
-                toggle.setValue(this.plugin.settings.workingEncrypt).onChange(async (value) => {
+                toggle.setValue(encrypt).onChange(async (value) => {
                     if (inWizard) {
                         this.plugin.settings.encrypt = value;
-                        passphrase.setDisabled(!value);
+                        passphraseSetting.setDisabled(!value);
                         dynamicIteration.setDisabled(!value);
                         await this.plugin.saveSettings();
                     } else {
-                        this.plugin.settings.workingEncrypt = value;
-                        passphrase.setDisabled(!value);
+                        encrypt = value;
+                        passphraseSetting.setDisabled(!value);
                         dynamicIteration.setDisabled(!value);
                         await this.plugin.saveSettings();
+                        markDirtyControl();
                     }
                 })
             );
 
-        const passphrase = new Setting(containerRemoteDatabaseEl)
+
+        const markDirtyControl = () => {
+            passphraseSetting.controlEl.toggleClass("sls-item-dirty", passphrase != this.plugin.settings.passphrase);
+            e2e.controlEl.toggleClass("sls-item-dirty", encrypt != this.plugin.settings.encrypt);
+            dynamicIteration.controlEl.toggleClass("sls-item-dirty", useDynamicIterationCount != this.plugin.settings.useDynamicIterationCount)
+        }
+
+        const passphraseSetting = new Setting(containerRemoteDatabaseEl)
             .setName("Passphrase")
             .setDesc("Encrypting passphrase. If you change the passphrase of a existing database, overwriting the remote database is strongly recommended.")
             .addText((text) => {
                 text.setPlaceholder("")
-                    .setValue(this.plugin.settings.workingPassphrase)
+                    .setValue(passphrase)
                     .onChange(async (value) => {
                         if (inWizard) {
                             this.plugin.settings.passphrase = value;
                             await this.plugin.saveSettings();
                         } else {
-                            this.plugin.settings.workingPassphrase = value;
+                            passphrase = value;
                             await this.plugin.saveSettings();
+                            markDirtyControl();
                         }
                     });
                 text.inputEl.setAttribute("type", "password");
             });
-        passphrase.setDisabled(!this.plugin.settings.workingEncrypt);
+        passphraseSetting.setDisabled(!encrypt);
 
         const dynamicIteration = new Setting(containerRemoteDatabaseEl)
             .setName("Use dynamic iteration count (experimental)")
             .setDesc("Balancing the encryption/decryption load against the length of the passphrase if toggled. (v0.17.5 or higher required)")
             .addToggle((toggle) => {
-                toggle.setValue(this.plugin.settings.workingUseDynamicIterationCount)
+                toggle.setValue(useDynamicIterationCount)
                     .onChange(async (value) => {
                         if (inWizard) {
                             this.plugin.settings.useDynamicIterationCount = value;
                             await this.plugin.saveSettings();
                         } else {
-                            this.plugin.settings.workingUseDynamicIterationCount = value;
+                            useDynamicIterationCount = value;
                             await this.plugin.saveSettings();
+                            markDirtyControl();
                         }
                     });
             })
             .setClass("wizardHidden");
-        dynamicIteration.setDisabled(!this.plugin.settings.workingEncrypt);
+        dynamicIteration.setDisabled(!encrypt);
 
         const checkWorkingPassphrase = async (): Promise<boolean> => {
             const settingForCheck: RemoteDBSettings = {
                 ...this.plugin.settings,
-                encrypt: this.plugin.settings.workingEncrypt,
-                passphrase: this.plugin.settings.workingPassphrase,
-                useDynamicIterationCount: this.plugin.settings.workingUseDynamicIterationCount,
+                encrypt: encrypt,
+                passphrase: passphrase,
+                useDynamicIterationCount: useDynamicIterationCount,
             };
             console.dir(settingForCheck);
             const db = await this.plugin.localDatabase.connectRemoteCouchDBWithSetting(settingForCheck, this.plugin.localDatabase.isMobile);
@@ -368,30 +385,32 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             }
         };
         const applyEncryption = async (sendToServer: boolean) => {
-            if (this.plugin.settings.workingEncrypt && this.plugin.settings.workingPassphrase == "") {
+            if (encrypt && passphrase == "") {
                 Logger("If you enable encryption, you have to set the passphrase", LOG_LEVEL.NOTICE);
                 return;
             }
-            if (this.plugin.settings.workingEncrypt && !(await testCrypt())) {
+            if (encrypt && !(await testCrypt())) {
                 Logger("WARNING! Your device would not support encryption.", LOG_LEVEL.NOTICE);
                 return;
             }
             if (!(await checkWorkingPassphrase()) && !sendToServer) {
                 return;
             }
-            if (!this.plugin.settings.workingEncrypt) {
-                this.plugin.settings.workingPassphrase = "";
+            if (!encrypt) {
+                passphrase = "";
             }
             this.plugin.settings.liveSync = false;
             this.plugin.settings.periodicReplication = false;
             this.plugin.settings.syncOnSave = false;
             this.plugin.settings.syncOnStart = false;
             this.plugin.settings.syncOnFileOpen = false;
-            this.plugin.settings.encrypt = this.plugin.settings.workingEncrypt;
-            this.plugin.settings.passphrase = this.plugin.settings.workingPassphrase;
-            this.plugin.settings.useDynamicIterationCount = this.plugin.settings.workingUseDynamicIterationCount;
+            this.plugin.settings.syncAfterMerge = false;
+            this.plugin.settings.encrypt = encrypt;
+            this.plugin.settings.passphrase = passphrase;
+            this.plugin.settings.useDynamicIterationCount = useDynamicIterationCount;
 
             await this.plugin.saveSettings();
+            markDirtyControl();
             if (sendToServer) {
                 await this.plugin.initializeDatabase(true);
                 await this.plugin.markRemoteLocked();
@@ -433,7 +452,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             this.plugin.settings.syncOnSave = false;
             this.plugin.settings.syncOnStart = false;
             this.plugin.settings.syncOnFileOpen = false;
-
+            this.plugin.settings.syncAfterMerge = false;
             await this.plugin.saveSettings();
 
             applyDisplayEnabled();
@@ -693,7 +712,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .setButtonText("Next")
                     .setClass("mod-cta")
                     .setDisabled(false)
-                    .onClick(async () => {
+                    .onClick(() => {
                         if (!this.plugin.settings.encrypt) {
                             this.plugin.settings.passphrase = "";
                         }
@@ -714,7 +733,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .setButtonText("Discard exist database and proceed")
                     .setDisabled(false)
                     .setWarning()
-                    .onClick(async () => {
+                    .onClick(() => {
                         if (!this.plugin.settings.encrypt) {
                             this.plugin.settings.passphrase = "";
                         }
@@ -793,11 +812,28 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 button
                     .setButtonText("Next")
                     .setDisabled(false)
-                    .onClick(async () => {
+                    .onClick(() => {
                         changeDisplay("40");
                     })
             );
 
+        containerLocalDatabaseEl.createEl("h3", {
+            text: sanitizeHTMLToDom(`Experimental`),
+            cls: "wizardHidden"
+        });
+
+        new Setting(containerLocalDatabaseEl)
+            .setName("Use new adapter")
+            .setDesc("This option is not compatible with a database made by older versions. Changing this configuration will fetch the remote database again.")
+            .setClass("wizardHidden")
+            .addToggle((toggle) =>
+                toggle.setValue(this.plugin.settings.useIndexedDBAdapter).onChange(async (value) => {
+                    this.plugin.settings.useIndexedDBAdapter = value;
+                    await this.plugin.saveSettings();
+                    await rebuildDB("localOnly");
+                })
+            );
+
         addScreenElement("10", containerLocalDatabaseEl);
         const containerGeneralSettingsEl = containerEl.createDiv();
         containerGeneralSettingsEl.createEl("h3", { text: "General Settings" });
@@ -847,6 +883,14 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     });
                 text.inputEl.setAttribute("type", "number");
             });
+        new Setting(containerGeneralSettingsEl)
+            .setName("Monitor changes to hidden files and plugin")
+            .addToggle((toggle) =>
+                toggle.setValue(this.plugin.settings.watchInternalFileChanges).onChange(async (value) => {
+                    this.plugin.settings.watchInternalFileChanges = value;
+                    await this.plugin.saveSettings();
+                })
+            );
 
 
         addScreenElement("20", containerGeneralSettingsEl);
@@ -949,7 +993,17 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                         await this.plugin.saveSettings();
                         applyDisplayEnabled();
                     })
-                )
+                ),
+            new Setting(containerSyncSettingEl)
+                .setName("Sync after merging file")
+                .setDesc("Sync automatically after merging files")
+                .addToggle((toggle) =>
+                    toggle.setValue(this.plugin.settings.syncAfterMerge).onChange(async (value) => {
+                        this.plugin.settings.syncAfterMerge = value;
+                        await this.plugin.saveSettings();
+                        applyDisplayEnabled();
+                    })
+                ),
         );
 
         new Setting(containerSyncSettingEl)
@@ -1010,7 +1064,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 })
             );
 
-
         new Setting(containerSyncSettingEl)
             .setName("Sync hidden files")
             .addToggle((toggle) =>
@@ -1019,14 +1072,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     await this.plugin.saveSettings();
                 })
             );
-        new Setting(containerSyncSettingEl)
-            .setName("Monitor changes to internal files")
-            .addToggle((toggle) =>
-                toggle.setValue(this.plugin.settings.watchInternalFileChanges).onChange(async (value) => {
-                    this.plugin.settings.watchInternalFileChanges = value;
-                    await this.plugin.saveSettings();
-                })
-            );
+
         new Setting(containerSyncSettingEl)
             .setName("Scan for hidden files before replication")
             .setDesc("This configuration will be ignored if monitoring changes is enabled.")
@@ -1171,8 +1217,8 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .setValue(this.plugin.settings.customChunkSize + "")
                     .onChange(async (value) => {
                         let v = Number(value);
-                        if (isNaN(v) || v < 100) {
-                            v = 100;
+                        if (isNaN(v) || v < 1) {
+                            v = 1;
                         }
                         this.plugin.settings.customChunkSize = v;
                         await this.plugin.saveSettings();
@@ -1233,6 +1279,52 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 text.inputEl.setAttribute("type", "number");
             });
 
+        new Setting(containerSyncSettingEl)
+            .setName("Use timeouts instead of heartbeats")
+            .setDesc("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.")
+            .addToggle((toggle) => {
+                toggle
+                    .setValue(this.plugin.settings.useTimeouts)
+                    .onChange(async (value) => {
+                        this.plugin.settings.useTimeouts = value;
+                        await this.plugin.saveSettings();
+                    })
+                return toggle;
+            }
+            );
+        new Setting(containerSyncSettingEl)
+            .setName("A number of hashes to be cached")
+            .setDesc("")
+            .addText((text) => {
+                text.setPlaceholder("")
+                    .setValue(this.plugin.settings.hashCacheMaxCount + "")
+                    .onChange(async (value) => {
+                        let v = Number(value);
+                        if (isNaN(v) || v < 10) {
+                            v = 10;
+                        }
+                        this.plugin.settings.hashCacheMaxCount = v;
+                        await this.plugin.saveSettings();
+                    });
+                text.inputEl.setAttribute("type", "number");
+            });
+        new Setting(containerSyncSettingEl)
+            .setName("The total length of hashes to be cached")
+            .setDesc("(Mega chars)")
+            .addText((text) => {
+                text.setPlaceholder("")
+                    .setValue(this.plugin.settings.hashCacheMaxAmount + "")
+                    .onChange(async (value) => {
+                        let v = Number(value);
+                        if (isNaN(v) || v < 1) {
+                            v = 1;
+                        }
+                        this.plugin.settings.hashCacheMaxAmount = v;
+                        await this.plugin.saveSettings();
+                    });
+                text.inputEl.setAttribute("type", "number");
+            });
+
         addScreenElement("30", containerSyncSettingEl);
         const containerMiscellaneousEl = containerEl.createDiv();
         containerMiscellaneousEl.createEl("h3", { text: "Miscellaneous" });
@@ -1272,6 +1364,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                         this.plugin.settings.syncOnSave = false;
                         this.plugin.settings.syncOnStart = false;
                         this.plugin.settings.syncOnFileOpen = false;
+                        this.plugin.settings.syncAfterMerge = false;
                         if (currentPreset == "LIVESYNC") {
                             this.plugin.settings.liveSync = true;
                             Logger("Synchronization setting configured as LiveSync.", LOG_LEVEL.NOTICE);
@@ -1281,6 +1374,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                             this.plugin.settings.syncOnSave = false;
                             this.plugin.settings.syncOnStart = true;
                             this.plugin.settings.syncOnFileOpen = true;
+                            this.plugin.settings.syncAfterMerge = true;
                             Logger("Synchronization setting configured as Periodic sync with batch database update.", LOG_LEVEL.NOTICE);
                         } else {
                             Logger("All synchronization disabled.", LOG_LEVEL.NOTICE);
@@ -1309,6 +1403,45 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     })
             );
 
+        const passphrase_options: Record<ConfigPassphraseStore, string> = {
+            "": "Default",
+            LOCALSTORAGE: "Use a custom passphrase",
+            ASK_AT_LAUNCH: "Ask an passphrase at every launch",
+        }
+        new Setting(containerMiscellaneousEl)
+            .setName("Encrypting sensitive configuration items")
+            .addDropdown((dropdown) =>
+                dropdown
+                    .addOptions(passphrase_options)
+                    .setValue(this.plugin.settings.configPassphraseStore)
+                    .onChange(async (value) => {
+                        this.plugin.settings.configPassphraseStore = value as ConfigPassphraseStore;
+                        this.plugin.usedPassphrase = "";
+                        confPassphraseSetting.setDisabled(this.plugin.settings.configPassphraseStore != "LOCALSTORAGE");
+                        await this.plugin.saveSettings();
+                    })
+            )
+            .setClass("wizardHidden");
+
+
+        const confPassphrase = localStorage.getItem("ls-setting-passphrase") || "";
+        const confPassphraseSetting = new Setting(containerMiscellaneousEl)
+            .setName("Passphrase of sensitive configuration items")
+            .setDesc("This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.")
+            .addText((text) => {
+                text.setPlaceholder("")
+                    .setValue(confPassphrase)
+                    .onChange(async (value) => {
+                        this.plugin.usedPassphrase = "";
+                        localStorage.setItem("ls-setting-passphrase", value);
+                        await this.plugin.saveSettings();
+                        markDirtyControl();
+                    });
+                text.inputEl.setAttribute("type", "password");
+            })
+            .setClass("wizardHidden");
+        confPassphraseSetting.setDisabled(this.plugin.settings.configPassphraseStore != "LOCALSTORAGE");
+
         const infoApply = containerMiscellaneousEl.createEl("div", { text: `To finish setup, please select one of the presets` });
         infoApply.addClass("op-warn-info");
         infoApply.addClass("wizardOnly")
@@ -1350,7 +1483,8 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                         pluginConfig.couchDB_URI = isCloudantURI(pluginConfig.couchDB_URI) ? "cloudant" : "self-hosted";
                         pluginConfig.couchDB_USER = REDACTED;
                         pluginConfig.passphrase = REDACTED;
-                        pluginConfig.workingPassphrase = REDACTED;
+                        pluginConfig.encryptedPassphrase = REDACTED;
+                        pluginConfig.encryptedCouchDBConnection = REDACTED;
 
                         const msgConfig = `----remote config----
 ${stringifyYaml(responseConfig)}
@@ -1408,7 +1542,7 @@ ${stringifyYaml(pluginConfig)}`;
                             const releaser = await semaphore.acquire(1, "verifyAndRepair");
 
                             try {
-                                Logger(`Update into ${file.path}`);
+                                Logger(`UPDATE DATABASE ${file.path}`);
                                 await this.plugin.updateIntoDB(file, false, null, true);
                                 i++;
                                 Logger(`${i}/${files.length}\n${file.path}`, LOG_LEVEL.NOTICE, "verify");
@@ -1436,6 +1570,15 @@ ${stringifyYaml(pluginConfig)}`;
                     await this.plugin.saveSettings();
                 })
             );
+        new Setting(containerHatchEl)
+            .setName("Write logs into the file")
+            .setDesc("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.")
+            .addToggle((toggle) =>
+                toggle.setValue(this.plugin.settings.writeLogToTheFile).onChange(async (value) => {
+                    this.plugin.settings.writeLogToTheFile = value;
+                    await this.plugin.saveSettings();
+                })
+            );
 
         new Setting(containerHatchEl)
             .setName("Discard local database to reset or uninstall Self-hosted LiveSync")
@@ -1480,7 +1623,7 @@ ${stringifyYaml(pluginConfig)}`;
 
         new Setting(containerPluginSettings)
             .setName("Scan plugins periodically")
-            .setDesc("Scan plugins every 1 minute.")
+            .setDesc("Scan plugins every 1 minute. This configuration will be ignored if monitoring changes of hidden files has been enabled.")
             .addToggle((toggle) =>
                 toggle.setValue(this.plugin.settings.autoSweepPluginsPeriodic).onChange(async (value) => {
                     this.plugin.settings.autoSweepPluginsPeriodic = value;

src/PluginPane.svelte

@@ -2,7 +2,7 @@
     import ObsidianLiveSyncPlugin from "./main";
     import { onMount } from "svelte";
     import { DevicePluginList, PluginDataEntry } from "./types";
-    import { versionNumberString2Number } from "./lib/src/utils";
+    import { versionNumberString2Number } from "./lib/src/strbin";
 
     type JudgeResult = "" | "NEWER" | "EVEN" | "EVEN_BUT_DIFFERENT" | "OLDER" | "REMOTE_ONLY";
 

src/dialogs.ts

@@ -52,14 +52,14 @@ export class InputStringDialog extends Modal {
         const { contentEl } = this;
 
         contentEl.createEl("h1", { text: this.title });
-
-        new Setting(contentEl).setName(this.key).addText((text) =>
+        // For enter to submit
+        const formEl = contentEl.createEl("form");
+        new Setting(formEl).setName(this.key).addText((text) =>
             text.onChange((value) => {
                 this.result = value;
             })
         );
-
-        new Setting(contentEl).addButton((btn) =>
+        new Setting(formEl).addButton((btn) =>
             btn
                 .setButtonText("Ok")
                 .setCta()

src/types.ts

@@ -1,5 +1,5 @@
-import { PluginManifest } from "obsidian";
-import { DatabaseEntry } from "./lib/src/types";
+import { PluginManifest, TFile } from "obsidian";
+import { DatabaseEntry, EntryBody } from "./lib/src/types";
 
 export interface PluginDataEntry extends DatabaseEntry {
     deviceVaultName: string;
@@ -30,3 +30,20 @@ export interface InternalFileInfo {
     size: number;
     deleted?: boolean;
 }
+
+export interface FileInfo {
+    path: string;
+    mtime: number;
+    ctime: number;
+    size: number;
+    deleted?: boolean;
+    file: TFile;
+}
+
+export type queueItem = {
+    entry: EntryBody;
+    missingChildren: string[];
+    timeout?: number;
+    done?: boolean;
+    warned?: boolean;
+};

src/utils.ts

@@ -1,6 +1,8 @@
-import { normalizePath } from "obsidian";
+import { DataWriteOptions, normalizePath, TFile, Platform } from "obsidian";
+import { path2id_base, id2path_base, isValidFilenameInLinux, isValidFilenameInDarwin, isValidFilenameInWidows, isValidFilenameInAndroid } from "./lib/src/path";
 
-import { path2id_base, id2path_base } from "./lib/src/utils";
+import { Logger } from "./lib/src/logger";
+import { LOG_LEVEL } from "./lib/src/types";
 
 // For backward compatibility, using the path for determining id.
 // Only CouchDB unacceptable ID (that starts with an underscore) has been prefixed with "/".
@@ -198,3 +200,94 @@ export function applyPatch(from: Record<string | number | symbol, any>, patch: R
     }
     return ret;
 }
+
+export function mergeObject(
+    objA: Record<string | number | symbol, any>,
+    objB: Record<string | number | symbol, any>
+) {
+    const newEntries = Object.entries(objB);
+    const ret: any = { ...objA };
+    if (
+        typeof objA !== typeof objB ||
+        Array.isArray(objA) !== Array.isArray(objB)
+    ) {
+        return objB;
+    }
+
+    for (const [key, v] of newEntries) {
+        if (key in ret) {
+            const value = ret[key];
+            if (
+                typeof v !== typeof value ||
+                Array.isArray(v) !== Array.isArray(value)
+            ) {
+                //if type is not match, replace completely.
+                ret[key] = v;
+            } else {
+                if (
+                    typeof v == "object" &&
+                    typeof value == "object" &&
+                    !Array.isArray(v) &&
+                    !Array.isArray(value)
+                ) {
+                    ret[key] = mergeObject(v, value);
+                } else if (
+                    typeof v == "object" &&
+                    typeof value == "object" &&
+                    Array.isArray(v) &&
+                    Array.isArray(value)
+                ) {
+                    ret[key] = [...new Set([...v, ...value])];
+                } else {
+                    ret[key] = v;
+                }
+            }
+        } else {
+            ret[key] = v;
+        }
+    }
+    return Object.entries(ret)
+        .sort()
+        .reduce((p, [key, value]) => ({ ...p, [key]: value }), {});
+}
+
+export function flattenObject(obj: Record<string | number | symbol, any>, path: string[] = []): [string, any][] {
+    if (typeof (obj) != "object") return [[path.join("."), obj]];
+    if (Array.isArray(obj)) return [[path.join("."), JSON.stringify(obj)]];
+    const e = Object.entries(obj);
+    const ret = []
+    for (const [key, value] of e) {
+        const p = flattenObject(value, [...path, key]);
+        ret.push(...p);
+    }
+    return ret;
+}
+
+export function modifyFile(file: TFile, data: string | ArrayBuffer, options?: DataWriteOptions) {
+    if (typeof (data) === "string") {
+        return app.vault.modify(file, data, options);
+    } else {
+        return app.vault.modifyBinary(file, data, options);
+    }
+}
+export function createFile(path: string, data: string | ArrayBuffer, options?: DataWriteOptions): Promise<TFile> {
+    if (typeof (data) === "string") {
+        return app.vault.create(path, data, options);
+    } else {
+        return app.vault.createBinary(path, data, options);
+    }
+}
+
+export function isValidPath(filename: string) {
+    if (Platform.isDesktop) {
+        // if(Platform.isMacOS) return isValidFilenameInDarwin(filename);
+        if (process.platform == "darwin") return isValidFilenameInDarwin(filename);
+        if (process.platform == "linux") return isValidFilenameInLinux(filename);
+        return isValidFilenameInWidows(filename);
+    }
+    if (Platform.isAndroidApp) return isValidFilenameInAndroid(filename);
+    if (Platform.isIosApp) return isValidFilenameInDarwin(filename);
+    //Fallback
+    Logger("Could not determine platform for checking filename", LOG_LEVEL.VERBOSE);
+    return isValidFilenameInWidows(filename);
+}

styles.css

@@ -101,7 +101,7 @@
 .CodeMirror-wrap::before,
 .cm-s-obsidian>.cm-editor::before,
 .canvas-wrapper::before {
-    content: var(--slsmessage);
+    content: attr(data-log);
     text-align: right;
     white-space: pre-wrap;
     position: absolute;
@@ -247,4 +247,8 @@ div.sls-setting-menu-btn {
 
 .sls-setting:not(.isWizard) .wizardOnly {
     display: none;
+}
+
+.sls-item-dirty::before {
+    content: "✏";
 }

updates.md

@@ -10,62 +10,64 @@
     - Chunk ID numbering rules
 
 #### Minors
-- 0.17.1
-  - Fixed: Now we can verify and repair the database.
-  - Refactored inside.
+- __0.17.1 to 0.17.15 has been moved into `update_old.md`__
 
-- 0.17.2
-  - New feature
-    - We can merge conflicted documents automatically if sensible.
-  - Fixed
-    - Writing to the storage will be pended while they have conflicts after replication.
-
-- 0.17.3
-  - Now we supported canvas! And conflicted JSON files are also synchronised with merging its content if they are obvious.
-
-- 0.17.4
-  - Canvases are now treated as a sort of plain text file. now we transfer only the metadata and chunks that have differences.
-
-- 0.17.5 Now `read chunks online` had been fixed, and a new feature: `Use dynamic iteration count` to reduce the load on encryption/decryption.
-  Note: `Use dynamic iteration count` is not compatible with earlier versions.
-- 0.17.6 Now our renamed/deleted files have been surely deleted again.
-- 0.17.7
+- 0.17.16:
+  - Improved:
+    - Plugins and their settings no longer need scanning if changes are monitored.
+    - Now synchronising plugins and their settings are performed parallelly and faster.
+    - We can place `redflag2.md` to rebuild the database automatically while the boot sequence.
+  - Experimental:
+    - We can use a new adapter on PouchDB. This will make us smoother. 
+      - Note: Not compatible with the older version. 
   - Fixed:
-    - Fixed merging issues.
-    - Fixed button styling.
-  - Changed:
-    - Conflict checking on synchronising has been enabled for every note in default.
-
-### 0.16.0
-- Now hidden files need not be scanned. Changes will be detected automatically.
-  - If you want it to back to its previous behaviour, please disable `Monitor changes to internal files`.
-  - Due to using an internal API, this feature may become unusable with a major update. If this happens, please disable this once.
-
-#### Minors
-
-- 0.16.1 Added missing log updates.
-- 0.16.2 Fixed many problems caused by combinations of `Sync On Save` and the tracking logic that changed at 0.15.6.
-- 0.16.3
-  - Fixed detection of IBM Cloudant (And if there are some issues, be fixed automatically).
-  - A configuration information reporting tool has been implemented.
-- 0.16.4 Fixed detection failure. Please set the `Chunk size` again when using a self-hosted database.
-- 0.16.5
-  - Fixed
-    - Conflict detection and merging now be able to treat deleted files.
-    - Logs while the boot-up sequence has been tidied up.
-    - Fixed incorrect log entries.
-  - New Feature
-    - The feature of automatically deleting old expired metadata has been implemented.
-    We can configure it in `Delete old metadata of deleted files on start-up` in the `General Settings` pane.
-- 0.16.6
-  - Fixed
-    - Automatic (temporary) batch size adjustment has been restored to work correctly.
-    - Chunk splitting has been backed to the previous behaviour for saving them correctly.
+    - The default batch size is smaller again.
+    - Plugins and their setting can be synchronised again.
+    - Hidden files and plugins are correctly scanned while rebuilding.
+    - Files with the name started `_` are also being performed conflict-checking.
+- 0.17.17
+  - Fixed: Now we can merge JSON files even if we failed to compare items like null.
+- 0.17.18
+  - Fixed: Fixed lack of error handling.
+- 0.17.19 
+  - Fixed: Error reporting has been ensured.
+- 0.17.20
+  - Improved: Changes of hidden files will be notified to Obsidian.
+- 0.17.21
+  - Fixed: Skip patterns now handle capital letters.
   - Improved
-    - Corrupted chunks will be detected automatically.
-    - Now on the case-insensitive system, `aaa.md` and `AAA.md` will be treated as the same file or path at applying changesets.
-- 0.16.7 Nothing has been changed except toolsets, framework library, and as like them. Please inform me if something had been getting strange!
-- 0.16.8 Now we can synchronise without `bad_request:invalid UTF-8 JSON` even while end-to-end encryption has been disabled.
+    - New configuration to avoid exceeding throttle capacity.
+      - We have been grateful to @karasevm!
+    - The conflicted `data.json` is no longer merged automatically.
+      - This behaviour is not configurable, unlike the `Use newer file if conflicted` of normal files.
+- 0.17.22
+  - Fixed:
+    - Now hidden files will not be synchronised while we are not configured.
+    - Some processes could start without waiting for synchronisation to complete, but now they will wait for.
+  - Improved
+    - Now, by placing `redflag3.md`, we can discard the local database and fetch again.
+    - The document has been updated! Thanks to @hilsonp!
+- 0.17.23
+  - Improved:
+    - Now we can preserve the logs into the file.
+      - Note: This option will be enabled automatically also when we flagging a red flag.
+    - File names can now be made platform-appropriate.
+  - Refactored:
+    - Some redundant implementations have been sorted out.
+- 0.17.24
+  - New feature:
+    - If any conflicted files have been left, they will be reported.
+  - Fixed:
+    - Now the name of the conflicting file is shown on the conflict-resolving dialogue.
+    - Hidden files are now able to be merged again.
+    - No longer error caused at plug-in being loaded.
+  - Improved:
+    - Caching chunks are now limited in total size of cached chunks.
+- 0.17.25
+  - Fixed:
+    - Now reading error will be reported.
+- 0.17.26
+  - Fixed(Urgent):
+    - The modified document will be reflected in the storage now.
 
-Note:
-Before 0.16.5, LiveSync had some issues making chunks. In this case, synchronisation had became been always failing after a corrupted one should be made. After 0.16.6, the corrupted chunk is automatically detected. Sorry for troubling you but please do `rebuild everything` when this plug-in notified so.
+... To continue on to `updates_old.md`.

updates_old.md

@@ -1,3 +1,128 @@
+### 0.17.0
+- 0.17.0 has no surfaced changes but the design of saving chunks has been changed. They have compatibility but changing files after upgrading makes different chunks than before 0.16.x.
+  Please rebuild databases once if you have been worried about storage usage.
+
+  - Improved:
+    - Splitting markdown
+    - Saving chunks
+
+  - Changed:
+    - Chunk ID numbering rules
+
+#### Minors
+
+- 0.17.1
+  - Fixed: Now we can verify and repair the database.
+  - Refactored inside.
+
+- 0.17.2
+  - New feature
+    - We can merge conflicted documents automatically if sensible.
+  - Fixed
+    - Writing to the storage will be pended while they have conflicts after replication.
+
+- 0.17.3
+  - Now we supported canvas! And conflicted JSON files are also synchronised with merging its content if they are obvious.
+
+- 0.17.4
+  - Canvases are now treated as a sort of plain text file. now we transfer only the metadata and chunks that have differences.
+
+- 0.17.5 Now `read chunks online` had been fixed, and a new feature: `Use dynamic iteration count` to reduce the load on encryption/decryption.
+  Note: `Use dynamic iteration count` is not compatible with earlier versions.
+- 0.17.6 Now our renamed/deleted files have been surely deleted again.
+- 0.17.7
+  - Fixed:
+    - Fixed merging issues.
+    - Fixed button styling.
+  - Changed:
+    - Conflict checking on synchronising has been enabled for every note in default.
+- 0.17.8
+  - Improved: Performance improved. Prebuilt PouchDB is no longer used.
+  - Fixed: Merging hidden files is also fixed.
+  - New Feature: Now we can synchronise automatically after merging conflicts.
+- 0.17.9
+  - Fixed: Conflict merge of internal files is no longer broken.
+  - Improved: Smoother status display inside the editor.
+- 0.17.10
+  - Fixed: Large file synchronising has been now addressed!
+  Note: When synchronising large files, we have to set `Chunk size` to lower than 50, disable `Read chunks online`, `Batch size` should be set 50-100, and `Batch limit` could be around 20.
+- 0.17.11
+  - Fixed:
+    - Performance improvement
+    - Now `Chunk size` can be set to under one hundred.
+  - New feature:
+    - The number of transfers required before replication stabilises is now displayed.
+- 0.17.12: Skipped.
+- 0.17.13
+  - Fixed: Document history is now displayed again.
+  - Reorganised: Many files have been refactored.
+- 0.17.14: Skipped.
+- 0.17.15
+  - Improved:
+    - Confidential information has no longer stored in data.json as is.
+    - Synchronising progress has been shown in the notification.
+    - We can commit passphrases with a keyboard.
+    - Configuration which had not been saved yet is marked now.
+    - Now the filename is shown on the Conflict resolving dialog
+  - Fixed:
+    - Hidden files have been synchronised again.
+    - Rename of files has been fixed again.
+  And, minor changes have been included.
+
+### 0.16.0
+- Now hidden files need not be scanned. Changes will be detected automatically.
+  - If you want it to back to its previous behaviour, please disable `Monitor changes to internal files`.
+  - Due to using an internal API, this feature may become unusable with a major update. If this happens, please disable this once.
+
+#### Minors
+
+- 0.16.1 Added missing log updates.
+- 0.16.2 Fixed many problems caused by combinations of `Sync On Save` and the tracking logic that changed at 0.15.6.
+- 0.16.3
+  - Fixed detection of IBM Cloudant (And if there are some issues, be fixed automatically).
+  - A configuration information reporting tool has been implemented.
+- 0.16.4 Fixed detection failure. Please set the `Chunk size` again when using a self-hosted database.
+- 0.16.5
+  - Fixed
+    - Conflict detection and merging now be able to treat deleted files.
+    - Logs while the boot-up sequence has been tidied up.
+    - Fixed incorrect log entries.
+  - New Feature
+    - The feature of automatically deleting old expired metadata has been implemented.
+    We can configure it in `Delete old metadata of deleted files on start-up` in the `General Settings` pane.
+- 0.16.6
+  - Fixed
+    - Automatic (temporary) batch size adjustment has been restored to work correctly.
+    - Chunk splitting has been backed to the previous behaviour for saving them correctly.
+  - Improved
+    - Corrupted chunks will be detected automatically.
+    - Now on the case-insensitive system, `aaa.md` and `AAA.md` will be treated as the same file or path at applying changesets.
+- 0.16.7 Nothing has been changed except toolsets, framework library, and as like them. Please inform me if something had been getting strange!
+- 0.16.8 Now we can synchronise without `bad_request:invalid UTF-8 JSON` even while end-to-end encryption has been disabled.
+
+Note:
+Before 0.16.5, LiveSync had some issues making chunks. In this case, synchronisation had became been always failing after a corrupted one should be made. After 0.16.6, the corrupted chunk is automatically detected. Sorry for troubling you but please do `rebuild everything` when this plug-in notified so.
+
+### 0.15.0
+- Outdated configuration items have been removed. 
+- Setup wizard has been implemented!
+
+I appreciate for reviewing and giving me advice @Pouhon158!
+
+#### Minors
+- 0.15.1 Missed the stylesheet.
+- 0.15.2 The wizard has been improved and documented!
+- 0.15.3 Fixed the issue about locking/unlocking remote database while rebuilding in the wizard.
+- 0.15.4 Fixed issues about asynchronous processing (e.g., Conflict check or hidden file detection)
+- 0.15.5 Add new features for setting Self-hosted LiveSync up more easier.
+- 0.15.6 File tracking logic has been refined.
+- 0.15.7 Fixed bug about renaming file.
+- 0.15.8 Fixed bug about deleting empty directory, weird behaviour on boot-sequence on mobile devices.
+- 0.15.9 Improved chunk retrieving, now chunks are retrieved in batch on continuous requests.
+- 0.15.10 Fixed:
+  - The boot sequence has been corrected and now boots smoothly.
+  - Auto applying of batch save will be processed earlier than before.
+
 ### 0.14.1
 - The target selecting filter was implemented.
   Now we can set what files are synchronised by regular expression.