bump

- Now replication will be paced by collecting chunks.

docs/quick_setup.md

@@ -1,32 +1,32 @@
 # Quick setup
-The Setup wizard has been implemented since v0.15.0. This simplifies the initial setup.
+The Setup wizard has been implemented since v0.15.0 simplifying the initial setup.
 
-Note: The subsequent devices should be set up using the `Copy setup URI` and `Open setup URI`.
+Note: Subsequent devices should be set up using the `Copy setup URI` and `Open setup URI` functionality.
 
-## How to open and use wizard
-Open from `🪄 Setup wizard` in the setting dialogue. If there is no configuration or no synchronisation settings have been activated, it should already be open.
+## How to open and use the wizard
+Open the `🪄 Setup wizard` in the settings dialogue. If the plugin has not been configured before, it should already be open.
 
 ![](../images/quick_setup_1.png)
 
 ### Discard the existing configuration and set up
-If you have made any settings, this button allows you to discard them all before setting up.
+If you have changed any settings, this button allows you to discard all changes before setting up.
 
 ### Do not discard the existing configuration and set up
 Simply reconfigure. Be careful. In wizard mode, you cannot see all configuration items, even if they have been configured.
 
-Pressing `Next` on any of these will put the configuration dialog into wizard mode.
+Pressing `Next` on one of the above options will put the configuration dialog into wizard mode.
 
 ### Wizard mode
 
 ![](../images/quick_setup_2.png)
 
-We can set it up step by step.
+Let's see how to use it step-by-step.
 
 ## Remote Database configuration
 
 ### Remote database configuration 
 
-Enter the information in the database we have set up.  
+Enter the information for the database we have set up.  
 
 ![](../images/quick_setup_3.png)  
 
@@ -34,7 +34,7 @@ Enter the information in the database we have set up.
 
 ![](../images/quick_setup_4.png)
 
-If End to End encryption is enabled, the possibility of a third party who does not know the Passphrase being able to read the contents of the Remote database if they are leaked is reduced. So we strongly recommend enabling it.  
+When End to End encryption is enabled, a third party will be less likely to be able to read your Remote database in the event of a data breach/leak (assuming they do not know the Passphrase). We strongly recommend enabling it.  
 Encryption is based on 256-bit AES-GCM.  
 This setting can be disabled if you are inside a closed network and it is clear that you will not be accessed by third parties.
 
@@ -45,7 +45,7 @@ Here we can check the status of the connection to the database and the database
 ![](../images/quick_setup_5.png)  
 
 #### Test Database Connection
-Check whether we can connect to the database. If it fails, there are several reasons, but once you have done the `Check database configuration`, check if it fails there too.
+Check whether we can connect to the database. If it fails, there are several possible reasons, but first attempt the `Check database configuration` check to see if it fails there too.
 
 #### Check database configuration
 
@@ -61,21 +61,21 @@ If the Fix buttons disappear and all become check marks, we are done.
 ### Next 
 Go to the Local Database configuration.
 
-### Discard exist database and proceed
+### Discard existing database and proceed
 Discard the contents of the Remote database and go to the Local Database configuration.
 
 ## Local Database configuration
 
 ![](../images/quick_setup_8.png)
 
-Configure the local database. If we already have a Vaults with Self-hosted LiveSync installed and having the same directory name as currently we are setting up, please specify a different suffix than the Vault you have already set up here.
+Configure the local database. If we already have a Vault with Self-hosted LiveSync installed which has the same directory name as the one we are currently setting up, please specify a different suffix than the Vault you have already set up here.
 
 ## Miscellaneous
 Finally, finish the miscellaneous configurations and select a preset for synchronisation.
 
 ![](../images/quick_setup_9_1.png)
 
-The `Show status inside editor` can be enabled to your liking. If enabled, the status is displayed in the top right-hand corner of the editor.
+The `Show status inside editor` can be enabled to your liking. If enabled, the status is displayed in the top right-hand corner of the editor. Learn how to read the status bar [here](/README.md#information-in-statusbar).
 
 ![](../images/quick_setup_9_2.png)
 
@@ -88,10 +88,10 @@ Set the passphrase as you like.
 The Setup URI will be copied to the clipboard, which you can then transfer to the second and subsequent devices in some way.
 
 # How to set up the second and subsequent units
-After installing Self-hosted LiveSync on the device, select `Open setup URI` from the command palette and enter the setup URI you transferred. Afterwards, enter your passphrase and a setup wizard will open.  
+After installing Self-hosted LiveSync on the first device, select `Open setup URI` from the command palette and enter the setup URI you transferred. Afterwards, enter your passphrase and a setup wizard will open.  
 Answer the following.
 
 - `Yes` to `Importing LiveSync's conf, OK?`
 - `Set it up as secondary or subsequent device` to `How would you like to set it up?`.
 
-Then, The configuration will now take effect and replication will start. Your files will be synchronised soon!
+Then, The configuration will take effect and replication will start. Your files will be synchronised soon! You may need to close the settings dialog and reopen it to see the settings fields populated properly, but they will be set.

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.18.0",
+    "version": "0.19.3",
     "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-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.18.0",
+    "version": "0.19.3",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "obsidian-livesync",
-            "version": "0.18.0",
+            "version": "0.19.3",
             "license": "MIT",
             "dependencies": {
                 "diff-match-patch": "^1.0.5",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.18.0",
+    "version": "0.19.3",
     "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",

src/CmdConfigSync.ts

@@ -0,0 +1,668 @@
+import { writable } from 'svelte/store';
+import { Notice, PluginManifest, stringifyYaml, parseYaml } from "./deps";
+
+import { EntryDoc, LoadedEntry, LOG_LEVEL, InternalFileEntry, FilePathWithPrefix, FilePath, DocumentID } from "./lib/src/types";
+import { ICXHeader, PERIODIC_PLUGIN_SWEEP, } from "./types";
+import { delay, getDocData } from "./lib/src/utils";
+import { Logger } from "./lib/src/logger";
+import { PouchDB } from "./lib/src/pouchdb-browser.js";
+import { WrappedNotice } from "./lib/src/wrapper";
+import { base64ToArrayBuffer, arrayBufferToBase64, readString, writeString, uint8ArrayToHexString } from "./lib/src/strbin";
+import { runWithLock } from "./lib/src/lock";
+import { LiveSyncCommands } from "./LiveSyncCommands";
+import { stripAllPrefixes } from "./lib/src/path";
+import { PeriodicProcessor, askYesNo, disposeMemoObject, memoIfNotExist, memoObject, retrieveMemoObject, scheduleTask } from "./utils";
+import { Semaphore } from "./lib/src/semaphore";
+import { PluginDialogModal } from "./dialogs";
+import { JsonResolveModal } from "./JsonResolveModal";
+
+
+
+
+export const pluginList = writable([] as PluginDataExDisplay[]);
+export const pluginIsEnumerating = writable(false);
+
+const hashString = (async (key: string) => {
+    const buff = writeString(key);
+    const digest = await crypto.subtle.digest('SHA-256', buff);
+    return uint8ArrayToHexString(new Uint8Array(digest));
+})
+
+export type PluginDataExFile = {
+    filename: string,
+    data?: string[],
+    mtime: number,
+    size: number,
+    version?: string,
+    displayName?: string,
+}
+export type PluginDataExDisplay = {
+    documentPath: FilePathWithPrefix,
+    category: string,
+    name: string,
+    term: string,
+    displayName?: string,
+    files: PluginDataExFile[],
+    version?: string,
+    mtime: number,
+}
+export type PluginDataEx = {
+    documentPath?: FilePathWithPrefix,
+    category: string,
+    name: string,
+    displayName?: string,
+    term: string,
+    files: PluginDataExFile[],
+    version?: string,
+    mtime: number,
+};
+export class ConfigSync extends LiveSyncCommands {
+    confirmPopup: WrappedNotice = null;
+    get kvDB() {
+        return this.plugin.kvDB;
+    }
+    ensureDirectoryEx(fullPath: string) {
+        return this.plugin.ensureDirectoryEx(fullPath);
+    }
+    pluginDialog: PluginDialogModal = null;
+    periodicPluginSweepProcessor = new PeriodicProcessor(this.plugin, async () => await this.scanAllConfigFiles(false));
+
+    pluginList: PluginDataExDisplay[] = [];
+    showPluginSyncModal() {
+        if (!this.settings.usePluginSync) {
+            return;
+        }
+        if (this.pluginDialog != null) {
+            this.pluginDialog.open();
+        } else {
+            this.pluginDialog = new PluginDialogModal(this.app, this.plugin);
+            this.pluginDialog.open();
+        }
+    }
+
+    hidePluginSyncModal() {
+        if (this.pluginDialog != null) {
+            this.pluginDialog.close();
+            this.pluginDialog = null;
+        }
+    }
+    onunload() {
+        this.hidePluginSyncModal();
+        this.periodicPluginSweepProcessor?.disable();
+    }
+    onload() {
+        this.plugin.addCommand({
+            id: "livesync-plugin-dialog-ex",
+            name: "Show customization sync dialog",
+            callback: () => {
+                this.showPluginSyncModal();
+            },
+        });
+    }
+    getFileCategory(filePath: string): "CONFIG" | "THEME" | "SNIPPET" | "PLUGIN_MAIN" | "PLUGIN_ETC" | "PLUGIN_DATA" | "" {
+        if (filePath.split("/").length == 2 && filePath.endsWith(".json")) return "CONFIG";
+        if (filePath.split("/").length == 4 && filePath.startsWith(`${this.app.vault.configDir}/themes/`)) return "THEME";
+        if (filePath.startsWith(`${this.app.vault.configDir}/snippets/`) && filePath.endsWith(".css")) return "SNIPPET";
+        if (filePath.startsWith(`${this.app.vault.configDir}/plugins/`)) {
+            if (filePath.endsWith("/styles.css") || filePath.endsWith("/manifest.json") || filePath.endsWith("/main.js")) {
+                return "PLUGIN_MAIN";
+            } else if (filePath.endsWith("/data.json")) {
+                return "PLUGIN_DATA";
+            } else {
+                //TODO: to be configurable.
+                // With algorithm which implemented at v0.19.0, is too heavy.
+                return "";
+                // return "PLUGIN_ETC";
+            }
+            // return "PLUGIN";
+        }
+        return "";
+    }
+    isTargetPath(filePath: string): boolean {
+        if (!filePath.startsWith(this.app.vault.configDir)) return false;
+        // Idea non-filter option?
+        return this.getFileCategory(filePath) != "";
+    }
+    async onInitializeDatabase(showNotice: boolean) {
+        if (this.settings.usePluginSync) {
+            try {
+                Logger("Scanning customizations...");
+                await this.scanAllConfigFiles(showNotice);
+                Logger("Scanning customizations : done");
+            } catch (ex) {
+                Logger("Scanning customizations : failed");
+                Logger(ex, LOG_LEVEL.VERBOSE);
+            }
+
+        }
+    }
+    async beforeReplicate(showNotice: boolean) {
+        if (this.settings.autoSweepPlugins && this.settings.usePluginSync) {
+            await this.scanAllConfigFiles(showNotice);
+        }
+    }
+    async onResume() {
+        if (this.plugin.suspended) {
+            return;
+        }
+        if (this.settings.autoSweepPlugins) {
+            await this.scanAllConfigFiles(false);
+        }
+        this.periodicPluginSweepProcessor.enable(this.settings.autoSweepPluginsPeriodic && !this.settings.watchInternalFileChanges ? (PERIODIC_PLUGIN_SWEEP * 1000) : 0);
+
+    }
+    async reloadPluginList(showMessage: boolean) {
+        this.pluginList = [];
+        pluginList.set(this.pluginList)
+        await this.updatePluginList(showMessage);
+    }
+    async updatePluginList(showMessage: boolean, updatedDocumentPath?: FilePathWithPrefix): Promise<void> {
+        const logLevel = showMessage ? LOG_LEVEL.NOTICE : LOG_LEVEL.INFO;
+        // pluginList.set([]);
+        if (!this.settings.usePluginSync) {
+            this.pluginList = [];
+            pluginList.set(this.pluginList)
+            return;
+        }
+
+        await runWithLock("update-plugin-list", false, async () => {
+            // if (updatedDocumentPath != "") pluginList.update(e => e.filter(ee => ee.documentPath != updatedDocumentPath));
+            // const work: Record<string, Record<string, Record<string, Record<string, PluginDataEntryEx>>>> = {};
+            const entries = [] as PluginDataExDisplay[]
+            const plugins = this.localDatabase.findEntries(ICXHeader + "", `${ICXHeader}\u{10ffff}`, { include_docs: true });
+            const semaphore = Semaphore(4);
+            const processes = [] as Promise<void>[];
+            let count = 0;
+            pluginIsEnumerating.set(true);
+            let processed = false;
+            try {
+                for await (const plugin of plugins) {
+                    const path = plugin.path || this.getPath(plugin);
+                    if (updatedDocumentPath && updatedDocumentPath != path) {
+                        continue;
+                    }
+                    processed = true;
+                    const oldEntry = (this.pluginList.find(e => e.documentPath == path));
+                    if (oldEntry && oldEntry.mtime == plugin.mtime) continue;
+                    processes.push((async (v) => {
+
+                        const release = await semaphore.acquire(1);
+                        try {
+                            Logger(`Enumerating files... ${count++}`, logLevel, "get-plugins");
+
+                            Logger(`plugin-${path}`, LOG_LEVEL.VERBOSE);
+                            const wx = await this.localDatabase.getDBEntry(path, null, false, false);
+                            if (wx) {
+                                const data = parseYaml(getDocData(wx.data)) as PluginDataEx;
+                                const xFiles = [] as PluginDataExFile[];
+                                for (const file of data.files) {
+                                    const work = { ...file };
+                                    const tempStr = getDocData(work.data);
+                                    work.data = [await hashString(tempStr)];
+                                    xFiles.push(work);
+                                }
+                                entries.push({
+                                    ...data,
+                                    documentPath: this.getPath(wx),
+                                    files: xFiles
+                                });
+                            }
+                        } catch (ex) {
+                            //TODO
+                            Logger(`Something happened at enumerating customization :${v.path}`, LOG_LEVEL.NOTICE);
+                            console.warn(ex);
+                        } finally {
+                            release();
+                        }
+                    }
+                    )(plugin));
+                }
+                await Promise.all(processes);
+                let newList = [...this.pluginList];
+                for (const item of entries) {
+                    newList = newList.filter(x => x.documentPath != item.documentPath);
+                    newList.push(item)
+                }
+                if (updatedDocumentPath != "" && !processed) newList = newList.filter(e => e.documentPath != updatedDocumentPath);
+
+                this.pluginList = newList;
+                pluginList.set(newList);
+
+
+                Logger(`All files enumerated`, logLevel, "get-plugins");
+            } finally {
+                pluginIsEnumerating.set(false);
+            }
+        });
+        // return entries;
+    }
+    async compareUsingDisplayData(dataA: PluginDataExDisplay, dataB: PluginDataExDisplay) {
+        const docA = await this.localDatabase.getDBEntry(dataA.documentPath);
+        const docB = await this.localDatabase.getDBEntry(dataB.documentPath);
+
+        if (docA && docB) {
+            const pluginDataA = parseYaml(getDocData(docA.data)) as PluginDataEx;
+            pluginDataA.documentPath = dataA.documentPath;
+            const pluginDataB = parseYaml(getDocData(docB.data)) as PluginDataEx;
+            pluginDataB.documentPath = dataB.documentPath;
+
+            // Use outer structure to wrap each data.
+            return await this.showJSONMergeDialogAndMerge(docA, docB, pluginDataA, pluginDataB);
+
+        }
+        return false;
+    }
+    showJSONMergeDialogAndMerge(docA: LoadedEntry, docB: LoadedEntry, pluginDataA: PluginDataEx, pluginDataB: PluginDataEx): Promise<boolean> {
+        const fileA = { ...pluginDataA.files[0], ctime: pluginDataA.files[0].mtime, _id: `${pluginDataA.documentPath}` as DocumentID };
+        const fileB = pluginDataB.files[0];
+        const docAx = { ...docA, ...fileA } as LoadedEntry, docBx = { ...docB, ...fileB } as LoadedEntry
+        return runWithLock("config:merge-data", false, () => new Promise((res) => {
+            Logger("Opening data-merging dialog", LOG_LEVEL.VERBOSE);
+            // const docs = [docA, docB];
+            const path = stripAllPrefixes(docAx.path.split("/").slice(-1).join("/") as FilePath);
+            const modal = new JsonResolveModal(this.app, path, [docAx, docBx], async (keep, result) => {
+                if (result == null) return res(false);
+                try {
+                    res(await this.applyData(pluginDataA, result));
+                } catch (ex) {
+                    Logger("Could not apply merged file");
+                    Logger(ex, LOG_LEVEL.VERBOSE);
+                    res(false);
+                }
+            }, "📡", "🛰️", "B");
+            modal.open();
+        }));
+    }
+    async applyData(data: PluginDataEx, content?: string): Promise<boolean> {
+        Logger(`Applying ${data.displayName || data.name}..`);
+        const baseDir = this.app.vault.configDir;
+        try {
+            if (!data.documentPath) throw "InternalError: Document path not exist";
+            const dx = await this.localDatabase.getDBEntry(data.documentPath);
+            if (dx == false) {
+                throw "Not found on database"
+            }
+            const loadedData = parseYaml(getDocData(dx.data)) as PluginDataEx;
+            for (const f of loadedData.files) {
+                Logger(`Applying ${f.filename} of ${data.displayName || data.name}..`);
+                try {
+                    // console.dir(f);
+                    const path = `${baseDir}/${f.filename}`;
+                    await this.ensureDirectoryEx(path);
+                    if (!content) {
+                        const dt = base64ToArrayBuffer(f.data);
+                        await this.app.vault.adapter.writeBinary(path, dt);
+                    } else {
+                        await this.app.vault.adapter.write(path, content);
+                    }
+                    Logger(`Applying ${f.filename} of ${data.displayName || data.name}.. Done`);
+
+                } catch (ex) {
+                    Logger(`Applying ${f.filename} of ${data.displayName || data.name}.. Failed`);
+                    Logger(ex, LOG_LEVEL.VERBOSE);
+                }
+
+            }
+            const uPath = `${baseDir}/${loadedData.files[0].filename}` as FilePath;
+            await this.storeCustomizationFiles(uPath);
+            await this.updatePluginList(true, uPath);
+            await delay(100);
+            Logger(`Config ${data.displayName || data.name} has been applied`, LOG_LEVEL.NOTICE);
+            if (data.category == "PLUGIN_DATA" || data.category == "PLUGIN_MAIN") {
+                //@ts-ignore
+                const manifests = Object.values(this.app.plugins.manifests) as any as PluginManifest[];
+                //@ts-ignore
+                const enabledPlugins = this.app.plugins.enabledPlugins as Set<string>;
+                const pluginManifest = manifests.find((manifest) => enabledPlugins.has(manifest.id) && manifest.dir == `${baseDir}/plugins/${data.name}`);
+                if (pluginManifest) {
+                    Logger(`Unloading plugin: ${pluginManifest.name}`, LOG_LEVEL.NOTICE, "plugin-reload-" + pluginManifest.id);
+                    // @ts-ignore
+                    await this.app.plugins.unloadPlugin(pluginManifest.id);
+                    // @ts-ignore
+                    await this.app.plugins.loadPlugin(pluginManifest.id);
+                    Logger(`Plugin reloaded: ${pluginManifest.name}`, LOG_LEVEL.NOTICE, "plugin-reload-" + pluginManifest.id);
+                }
+            } else if (data.category == "CONFIG") {
+                scheduleTask("configReload", 250, async () => {
+                    if (await askYesNo(this.app, "Do you want to restart and reload Obsidian now?") == "yes") {
+                        // @ts-ignore
+                        this.app.commands.executeCommandById("app:reload")
+                    }
+                })
+            }
+            return true;
+        } catch (ex) {
+            Logger(`Applying ${data.displayName || data.name}.. Failed`);
+            Logger(ex, LOG_LEVEL.VERBOSE);
+            return false;
+        }
+    }
+    async deleteData(data: PluginDataEx): Promise<boolean> {
+        try {
+            if (data.documentPath) {
+                await this.deleteConfigOnDatabase(data.documentPath);
+                await this.updatePluginList(false, data.documentPath);
+                Logger(`Delete: ${data.documentPath}`, LOG_LEVEL.NOTICE);
+            }
+            return true;
+        } catch (ex) {
+            Logger(`Failed to delete: ${data.documentPath}`, LOG_LEVEL.NOTICE);
+            return false;
+
+        }
+    }
+    async parseReplicationResultItem(docs: PouchDB.Core.ExistingDocument<EntryDoc>) {
+        if (docs._id.startsWith(ICXHeader)) {
+            if (this.plugin.settings.usePluginSync) {
+                await this.updatePluginList(false, docs.path ? docs.path : this.getPath(docs));
+            }
+            if (this.plugin.settings.usePluginSync && this.plugin.settings.notifyPluginOrSettingUpdated) {
+                if (!this.pluginDialog || (this.pluginDialog && !this.pluginDialog.isOpened())) {
+                    const fragment = createFragment((doc) => {
+                        doc.createEl("span", null, (a) => {
+                            a.appendText(`Some configuration has been arrived, Press `);
+                            a.appendChild(a.createEl("a", null, (anchor) => {
+                                anchor.text = "HERE";
+                                anchor.addEventListener("click", () => {
+                                    this.showPluginSyncModal();
+                                });
+                            }));
+
+                            a.appendText(` to open the config sync dialog , or press elsewhere to dismiss this message.`);
+                        });
+                    });
+
+                    const updatedPluginKey = "popupUpdated-plugins";
+                    scheduleTask(updatedPluginKey, 1000, async () => {
+                        const popup = await memoIfNotExist(updatedPluginKey, () => new Notice(fragment, 0));
+                        //@ts-ignore
+                        const isShown = popup?.noticeEl?.isShown();
+                        if (!isShown) {
+                            memoObject(updatedPluginKey, new Notice(fragment, 0));
+                        }
+                        scheduleTask(updatedPluginKey + "-close", 20000, () => {
+                            const popup = retrieveMemoObject<Notice>(updatedPluginKey);
+                            if (!popup)
+                                return;
+                            //@ts-ignore
+                            if (popup?.noticeEl?.isShown()) {
+                                popup.hide();
+                            }
+                            disposeMemoObject(updatedPluginKey);
+                        });
+                    });
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+    async realizeSettingSyncMode(): Promise<void> {
+        this.periodicPluginSweepProcessor?.disable();
+        if (this.plugin.suspended)
+            return;
+        if (!this.settings.usePluginSync) {
+            return;
+        }
+        if (this.settings.autoSweepPlugins) {
+            await this.scanAllConfigFiles(false);
+        }
+        this.periodicPluginSweepProcessor.enable(this.settings.autoSweepPluginsPeriodic && !this.settings.watchInternalFileChanges ? (PERIODIC_PLUGIN_SWEEP * 1000) : 0);
+        return;
+    }
+    recentProcessedInternalFiles = [] as string[];
+    async makeEntryFromFile(path: FilePath): Promise<false | PluginDataExFile> {
+        const stat = await this.app.vault.adapter.stat(path);
+        let version: string | undefined;
+        let displayName: string | undefined;
+        if (!stat) {
+            return false;
+        }
+        const contentBin = await this.app.vault.adapter.readBinary(path);
+        let content: string[];
+        try {
+            content = await arrayBufferToBase64(contentBin);
+            if (path.toLowerCase().endsWith("/manifest.json")) {
+                const v = readString(new Uint8Array(contentBin));
+                try {
+                    const json = JSON.parse(v);
+                    if ("version" in json) {
+                        version = `${json.version}`;
+                    }
+                    if ("name" in json) {
+                        displayName = `${json.name}`;
+                    }
+                } catch (ex) {
+                    Logger(`Configuration sync data: ${path} looks like manifest, but could not read the version`, LOG_LEVEL.INFO);
+                }
+            }
+        } catch (ex) {
+            Logger(`The file ${path} could not be encoded`);
+            Logger(ex, LOG_LEVEL.VERBOSE);
+            return false;
+        }
+        const mtime = stat.mtime;
+        return {
+            filename: path.substring(this.app.vault.configDir.length + 1),
+            data: content,
+            mtime,
+            size: stat.size,
+            version,
+            displayName: displayName,
+        }
+    }
+
+    filenameToUnifiedKey(path: string, termOverRide?: string) {
+        const term = termOverRide || this.plugin.deviceAndVaultName;
+        const category = this.getFileCategory(path);
+        const name = (category == "CONFIG" || category == "SNIPPET") ?
+            (path.split("/").slice(-1)[0]) :
+            (category == "PLUGIN_ETC" ?
+                path.split("/").slice(-2).join("/") :
+                path.split("/").slice(-2)[0]);
+        return `${ICXHeader}${term}/${category}/${name}.md` as FilePathWithPrefix
+    }
+    async storeCustomizationFiles(path: FilePath, termOverRide?: string) {
+        const term = termOverRide || this.plugin.deviceAndVaultName;
+        const vf = this.filenameToUnifiedKey(path, term);
+        return await runWithLock(`plugin-${vf}`, false, async () => {
+            const category = this.getFileCategory(path);
+            let mtime = 0;
+            let fileTargets = [] as FilePath[];
+            // let savePath = "";
+            const name = (category == "CONFIG" || category == "SNIPPET") ?
+                (path.split("/").reverse()[0]) :
+                (path.split("/").reverse()[1]);
+            const parentPath = path.split("/").slice(0, -1).join("/");
+            const prefixedFileName = this.filenameToUnifiedKey(path, term);
+            const id = await this.path2id(prefixedFileName);
+            const dt: PluginDataEx = {
+                category: category,
+                files: [],
+                name: name,
+                mtime: 0,
+                term: term
+            }
+            // let scheduleKey = "";
+            if (category == "CONFIG" || category == "SNIPPET" || category == "PLUGIN_ETC" || category == "PLUGIN_DATA") {
+                fileTargets = [path];
+                if (category == "PLUGIN_ETC") {
+                    dt.displayName = path.split("/").slice(-1).join("/");
+                }
+            } else if (category == "PLUGIN_MAIN") {
+                fileTargets = ["manifest.json", "main.js", "styles.css"].map(e => `${parentPath}/${e}` as FilePath);
+            } else if (category == "THEME") {
+                fileTargets = ["manifest.json", "theme.css"].map(e => `${parentPath}/${e}` as FilePath);
+            }
+            for (const target of fileTargets) {
+                const data = await this.makeEntryFromFile(target);
+                if (data == false) {
+                    Logger(`Config: skipped: ${target} `, LOG_LEVEL.VERBOSE);
+                    continue;
+                }
+                if (data.version) {
+                    dt.version = data.version;
+                }
+                if (data.displayName) {
+                    dt.displayName = data.displayName;
+                }
+                // Use average for total modified time.
+                mtime = mtime == 0 ? data.mtime : ((data.mtime + mtime) / 2);
+                dt.files.push(data);
+            }
+            dt.mtime = mtime;
+
+            // Logger(`Configuration saving: ${prefixedFileName}`);
+            if (dt.files.length == 0) {
+                Logger(`Nothing left: deleting.. ${path}`);
+                await this.deleteConfigOnDatabase(prefixedFileName);
+                await this.updatePluginList(false, prefixedFileName);
+                return
+            }
+
+            const content = stringifyYaml(dt);
+            try {
+                const old = await this.localDatabase.getDBEntryMeta(prefixedFileName, null, false);
+                let saveData: LoadedEntry;
+                if (old === false) {
+                    saveData = {
+                        _id: id,
+                        path: prefixedFileName,
+                        data: content,
+                        mtime,
+                        ctime: mtime,
+                        datatype: "newnote",
+                        size: content.length,
+                        children: [],
+                        deleted: false,
+                        type: "newnote",
+                    };
+                } else {
+                    if (old.mtime == mtime) {
+                        // Logger(`STORAGE --> DB:${file.path}: (hidden) Not changed`, LOG_LEVEL.VERBOSE);
+                        return true;
+                    }
+                    saveData =
+                    {
+                        ...old,
+                        data: content,
+                        mtime,
+                        size: content.length,
+                        datatype: "newnote",
+                        children: [],
+                        deleted: false,
+                        type: "newnote",
+                    };
+                }
+                const ret = await this.localDatabase.putDBEntry(saveData);
+                await this.updatePluginList(false, saveData.path);
+                Logger(`STORAGE --> DB:${prefixedFileName}: (config) Done`);
+                return ret;
+            } catch (ex) {
+                Logger(`STORAGE --> DB:${prefixedFileName}: (config) Failed`);
+                Logger(ex, LOG_LEVEL.VERBOSE);
+                return false;
+            }
+        })
+
+    }
+    async watchVaultRawEventsAsync(path: FilePath) {
+        if (!this.isTargetPath(path)) return false;
+        const stat = await this.app.vault.adapter.stat(path);
+        // Make sure that target is a file.
+        if (stat && stat.type != "file")
+            return false;
+        const storageMTime = ~~((stat && stat.mtime || 0) / 1000);
+        const key = `${path}-${storageMTime}`;
+        if (this.recentProcessedInternalFiles.contains(key)) {
+            // If recently processed, it may caused by self.
+            return true;
+        }
+        this.recentProcessedInternalFiles = [key, ...this.recentProcessedInternalFiles].slice(0, 100);
+
+        this.storeCustomizationFiles(path).then(() => {/* Fire and forget */ });
+
+    }
+
+
+    async scanAllConfigFiles(showMessage: boolean) {
+        const logLevel = showMessage ? LOG_LEVEL.NOTICE : LOG_LEVEL.INFO;
+        Logger("Scanning customizing files.", logLevel, "scan-all-config");
+        const term = this.plugin.deviceAndVaultName;
+        if (term == "") {
+            Logger("We have to configure the device name", LOG_LEVEL.NOTICE);
+            return;
+        }
+        const filesAll = await this.scanInternalFiles();
+        const files = filesAll.filter(e => this.isTargetPath(e)).map(e => ({ key: this.filenameToUnifiedKey(e), file: e }));
+        const virtualPathsOfLocalFiles = [...new Set(files.map(e => e.key))];
+        const filesOnDB = ((await this.localDatabase.allDocsRaw({ startkey: ICXHeader + "", endkey: `${ICXHeader}\u{10ffff}`, include_docs: true })).rows.map(e => e.doc) as InternalFileEntry[]).filter(e => !e.deleted);
+        let deleteCandidate = filesOnDB.map(e => this.getPath(e)).filter(e => e.startsWith(`${ICXHeader}${term}/`));
+        for (const vp of virtualPathsOfLocalFiles) {
+            const p = files.find(e => e.key == vp).file;
+            await this.storeCustomizationFiles(p);
+            deleteCandidate = deleteCandidate.filter(e => e != vp);
+        }
+        for (const vp of deleteCandidate) {
+            await this.deleteConfigOnDatabase(vp);
+        }
+        this.updatePluginList(false).then(/* fire and forget */);
+    }
+    async deleteConfigOnDatabase(prefixedFileName: FilePathWithPrefix, forceWrite = false) {
+
+        // const id = await this.path2id(prefixedFileName);
+        const mtime = new Date().getTime();
+        await runWithLock("file-x-" + prefixedFileName, false, async () => {
+            try {
+                const old = await this.localDatabase.getDBEntryMeta(prefixedFileName, null, false) as InternalFileEntry | false;
+                let saveData: InternalFileEntry;
+                if (old === false) {
+                    Logger(`STORAGE -x> DB:${prefixedFileName}: (config) already deleted (Not found on database)`);
+                } else {
+                    if (old.deleted) {
+                        Logger(`STORAGE -x> DB:${prefixedFileName}: (config) already deleted`);
+                        return;
+                    }
+                    saveData =
+                    {
+                        ...old,
+                        mtime,
+                        size: 0,
+                        children: [],
+                        deleted: true,
+                        type: "newnote",
+                    };
+                }
+                await this.localDatabase.putRaw(saveData);
+                await this.updatePluginList(false, prefixedFileName);
+                Logger(`STORAGE -x> DB:${prefixedFileName}: (config) Done`);
+            } catch (ex) {
+                Logger(`STORAGE -x> DB:${prefixedFileName}: (config) Failed`);
+                Logger(ex, LOG_LEVEL.VERBOSE);
+                return false;
+            }
+        });
+    }
+
+    async scanInternalFiles(): Promise<FilePath[]> {
+        const filenames = (await this.getFiles(this.app.vault.configDir, 2)).filter(e => e.startsWith(".")).filter(e => !e.startsWith(".trash"));
+        return filenames as FilePath[];
+    }
+
+
+
+    async getFiles(
+        path: string,
+        lastDepth: number
+    ) {
+        if (lastDepth == -1) return [];
+        const w = await this.app.vault.adapter.list(path);
+        let files = [
+            ...w.files
+        ];
+        for (const v of w.folders) {
+            files = files.concat(await this.getFiles(v, lastDepth - 1));
+        }
+        return files;
+    }
+}

src/CmdHiddenFileSync.ts

@@ -4,7 +4,7 @@ import { InternalFileInfo, ICHeader, ICHeaderEnd } from "./types";
 import { delay, isDocContentSame } from "./lib/src/utils";
 import { Logger } from "./lib/src/logger";
 import { PouchDB } from "./lib/src/pouchdb-browser.js";
-import { disposeMemoObject, memoIfNotExist, memoObject, retrieveMemoObject, scheduleTask, trimPrefix, isIdOfInternalMetadata, PeriodicProcessor } from "./utils";
+import { disposeMemoObject, memoIfNotExist, memoObject, retrieveMemoObject, scheduleTask, isInternalMetadata, PeriodicProcessor } from "./utils";
 import { WrappedNotice } from "./lib/src/wrapper";
 import { base64ToArrayBuffer, arrayBufferToBase64 } from "./lib/src/strbin";
 import { runWithLock } from "./lib/src/lock";
@@ -28,7 +28,7 @@ export class HiddenFileSync extends LiveSyncCommands {
     onunload() {
         this.periodicInternalFileScanProcessor?.disable();
     }
-    onload(): void | Promise<void> {
+    onload() {
         this.plugin.addCommand({
             id: "livesync-scaninternal",
             name: "Sync hidden files",
@@ -78,7 +78,7 @@ export class HiddenFileSync extends LiveSyncCommands {
 
     procInternalFiles: string[] = [];
     async execInternalFile() {
-        await runWithLock("execinternal", false, async () => {
+        await runWithLock("execInternal", false, async () => {
             const w = [...this.procInternalFiles];
             this.procInternalFiles = [];
             Logger(`Applying hidden ${w.length} files change...`);
@@ -95,6 +95,7 @@ export class HiddenFileSync extends LiveSyncCommands {
 
     recentProcessedInternalFiles = [] as string[];
     async watchVaultRawEventsAsync(path: FilePath) {
+        if (!this.settings.syncInternalFiles) return;
         const stat = await this.app.vault.adapter.stat(path);
         // sometimes folder is coming.
         if (stat && stat.type != "file")
@@ -122,12 +123,6 @@ export class HiddenFileSync extends LiveSyncCommands {
             await this.deleteInternalFileOnDatabase(path);
         } else {
             await this.storeInternalFileToDatabase({ path: path, ...stat });
-            const pluginDir = this.app.vault.configDir + "/plugins/";
-            const pluginFiles = ["manifest.json", "data.json", "style.css", "main.js"];
-            if (path.startsWith(pluginDir) && pluginFiles.some(e => path.endsWith(e)) && this.settings.usePluginSync) {
-                const pluginName = trimPrefix(path, pluginDir).split("/")[0];
-                await this.plugin.addOnPluginAndTheirSettings.sweepPlugin(false, pluginName);
-            }
         }
 
     }
@@ -138,7 +133,7 @@ export class HiddenFileSync extends LiveSyncCommands {
         for await (const doc of conflicted) {
             if (!("_conflicts" in doc))
                 continue;
-            if (isIdOfInternalMetadata(doc._id)) {
+            if (isInternalMetadata(doc._id)) {
                 await this.resolveConflictOnInternalFile(doc.path);
             }
         }
@@ -215,7 +210,7 @@ export class HiddenFileSync extends LiveSyncCommands {
     }
 
     //TODO: Tidy up. Even though it is experimental feature, So dirty...
-    async syncInternalFilesAndDatabase(direction: "push" | "pull" | "safe", showMessage: boolean, files: InternalFileInfo[] | false = false, targetFiles: string[] | false = false) {
+    async syncInternalFilesAndDatabase(direction: "push" | "pull" | "safe" | "pullForce" | "pushForce", showMessage: boolean, files: InternalFileInfo[] | false = false, targetFiles: string[] | false = false) {
         await this.resolveConflictOnInternalFiles();
         const logLevel = showMessage ? LOG_LEVEL.NOTICE : LOG_LEVEL.INFO;
         Logger("Scanning hidden files.", logLevel, "sync_internal");
@@ -289,43 +284,43 @@ export class HiddenFileSync extends LiveSyncCommands {
 
             p.push(addProc(async () => {
                 const xFileOnStorage = fileOnStorage;
-                const xfileOnDatabase = fileOnDatabase;
-                if (xFileOnStorage && xfileOnDatabase) {
+                const xFileOnDatabase = fileOnDatabase;
+                if (xFileOnStorage && xFileOnDatabase) {
                     // Both => Synchronize
-                    if (xfileOnDatabase.mtime == cache.docMtime && xFileOnStorage.mtime == cache.storageMtime) {
+                    if ((direction != "pullForce" && direction != "pushForce") && xFileOnDatabase.mtime == cache.docMtime && xFileOnStorage.mtime == cache.storageMtime) {
                         return;
                     }
-                    const nw = compareMTime(xFileOnStorage.mtime, xfileOnDatabase.mtime);
-                    if (nw > 0) {
+                    const nw = compareMTime(xFileOnStorage.mtime, xFileOnDatabase.mtime);
+                    if (nw > 0 || direction == "pushForce") {
                         await this.storeInternalFileToDatabase(xFileOnStorage);
                     }
-                    if (nw < 0) {
+                    if (nw < 0 || direction == "pullForce") {
                         // skip if not extraction performed.
                         if (!await this.extractInternalFileFromDatabase(filename))
                             return;
                     }
                     // If process successfully updated or file contents are same, update cache.
-                    cache.docMtime = xfileOnDatabase.mtime;
+                    cache.docMtime = xFileOnDatabase.mtime;
                     cache.storageMtime = xFileOnStorage.mtime;
                     caches[filename] = cache;
                     countUpdatedFolder(filename);
-                } else if (!xFileOnStorage && xfileOnDatabase) {
-                    if (direction == "push") {
-                        if (xfileOnDatabase.deleted)
+                } else if (!xFileOnStorage && xFileOnDatabase) {
+                    if (direction == "push" || direction == "pushForce") {
+                        if (xFileOnDatabase.deleted)
                             return;
                         await this.deleteInternalFileOnDatabase(filename, false);
-                    } else if (direction == "pull") {
+                    } else if (direction == "pull" || direction == "pullForce") {
                         if (await this.extractInternalFileFromDatabase(filename)) {
                             countUpdatedFolder(filename);
                         }
                     } else if (direction == "safe") {
-                        if (xfileOnDatabase.deleted)
+                        if (xFileOnDatabase.deleted)
                             return;
                         if (await this.extractInternalFileFromDatabase(filename)) {
                             countUpdatedFolder(filename);
                         }
                     }
-                } else if (xFileOnStorage && !xfileOnDatabase) {
+                } else if (xFileOnStorage && !xFileOnDatabase) {
                     await this.storeInternalFileToDatabase(xFileOnStorage);
                 } else {
                     throw new Error("Invalid state on hidden file sync");
@@ -337,7 +332,7 @@ export class HiddenFileSync extends LiveSyncCommands {
         await this.kvDB.set("diff-caches-internal", caches);
 
         // When files has been retrieved from the database. they must be reloaded.
-        if (direction == "pull" && filesChanged != 0) {
+        if ((direction == "pull" || direction == "pullForce") && filesChanged != 0) {
             const configDir = normalizePath(this.app.vault.configDir);
             // Show notification to restart obsidian when something has been changed in configDir.
             if (configDir in updatedFolders) {
@@ -468,7 +463,7 @@ export class HiddenFileSync extends LiveSyncCommands {
                     };
                 } else {
                     if (isDocContentSame(old.data, content) && !forceWrite) {
-                        // Logger(`internal files STORAGE --> DB:${file.path}: Not changed`);
+                        // Logger(`STORAGE --> DB:${file.path}: (hidden) Not changed`, LOG_LEVEL.VERBOSE);
                         return;
                     }
                     saveData =
@@ -613,7 +608,7 @@ export class HiddenFileSync extends LiveSyncCommands {
 
 
     showJSONMergeDialogAndMerge(docA: LoadedEntry, docB: LoadedEntry): Promise<boolean> {
-        return new Promise((res) => {
+        return runWithLock("conflict:merge-data", false, () => new Promise((res) => {
             Logger("Opening data-merging dialog", LOG_LEVEL.VERBOSE);
             const docs = [docA, docB];
             const path = stripAllPrefixes(docA.path);
@@ -624,6 +619,8 @@ export class HiddenFileSync extends LiveSyncCommands {
                     let needFlush = false;
                     if (!result && !keep) {
                         Logger(`Skipped merging: ${filename}`);
+                        res(false);
+                        return;
                     }
                     //Delete old revisions
                     if (result || keep) {
@@ -665,7 +662,7 @@ export class HiddenFileSync extends LiveSyncCommands {
                 }
             });
             modal.open();
-        });
+        }));
     }
 
     async scanInternalFiles(): Promise<InternalFileInfo[]> {

src/CmdPluginAndTheirSettings.ts

@@ -42,6 +42,7 @@ export class PluginAndTheirSettings extends LiveSyncCommands {
                 this.showPluginSyncModal();
             },
         });
+        this.showPluginSyncModal();
     }
     onunload() {
         this.hidePluginSyncModal();
@@ -165,7 +166,7 @@ export class PluginAndTheirSettings extends LiveSyncCommands {
         await runWithLock("sweepplugin", true, async () => {
             const logLevel = showMessage ? LOG_LEVEL.NOTICE : LOG_LEVEL.INFO;
             if (!this.deviceAndVaultName) {
-                Logger("You have to set your device and vault name.", LOG_LEVEL.NOTICE);
+                Logger("You have to set your device name.", LOG_LEVEL.NOTICE);
                 return;
             }
             Logger("Scanning plugins", logLevel);

src/CmdSetupLiveSync.ts

@@ -5,6 +5,9 @@ import { PouchDB } from "./lib/src/pouchdb-browser.js";
 import { askSelectString, askYesNo, askString } from "./utils";
 import { decrypt, encrypt } from "./lib/src/e2ee_v2";
 import { LiveSyncCommands } from "./LiveSyncCommands";
+import { delay } from "./lib/src/utils";
+import { confirmWithMessage } from "./dialogs";
+import { Platform } from "./deps";
 
 export class SetupLiveSync extends LiveSyncCommands {
     onunload() { }
@@ -97,7 +100,8 @@ export class SetupLiveSync extends LiveSyncCommands {
                     const setupAsNew = "Set it up as secondary or subsequent device";
                     const setupAgain = "Reconfigure and reconstitute the data";
                     const setupManually = "Leave everything to me";
-
+                    newSettingW.syncInternalFiles = false;
+                    newSettingW.usePluginSync = false;
                     const setupType = await askSelectString(this.app, "How would you like to set it up?", [setupAsNew, setupAgain, setupJustImport, setupManually]);
                     if (setupType == setupJustImport) {
                         this.plugin.settings = newSettingW;
@@ -106,11 +110,7 @@ export class SetupLiveSync extends LiveSyncCommands {
                     } else if (setupType == setupAsNew) {
                         this.plugin.settings = newSettingW;
                         this.plugin.usedPassphrase = "";
-                        await this.plugin.saveSettings();
-                        await this.plugin.resetLocalDatabase();
-                        await this.plugin.localDatabase.initializeDatabase();
-                        await this.plugin.markRemoteResolved();
-                        await this.plugin.replicate(true);
+                        await this.fetchLocal();
                     } else if (setupType == setupAgain) {
                         const confirm = "I know this operation will rebuild all my databases with files on this device, and files that are on the remote database and I didn't synchronize to any other devices will be lost and want to proceed indeed.";
                         if (await askSelectString(this.app, "Do you really want to do this?", ["Cancel", confirm]) != confirm) {
@@ -118,15 +118,7 @@ export class SetupLiveSync extends LiveSyncCommands {
                         }
                         this.plugin.settings = newSettingW;
                         this.plugin.usedPassphrase = "";
-                        await this.plugin.saveSettings();
-                        await this.plugin.resetLocalDatabase();
-                        await this.plugin.localDatabase.initializeDatabase();
-                        await this.plugin.initializeDatabase(true);
-                        await this.plugin.tryResetRemoteDatabase();
-                        await this.plugin.markRemoteLocked();
-                        await this.plugin.markRemoteResolved();
-                        await this.plugin.replicate(true);
-
+                        await this.rebuildEverything();
                     } else if (setupType == setupManually) {
                         const keepLocalDB = await askYesNo(this.app, "Keep local DB?");
                         const keepRemoteDB = await askYesNo(this.app, "Keep remote DB?");
@@ -134,6 +126,8 @@ export class SetupLiveSync extends LiveSyncCommands {
                             // nothing to do. so peaceful.
                             this.plugin.settings = newSettingW;
                             this.plugin.usedPassphrase = "";
+                            this.suspendAllSync();
+                            this.suspendExtraSync();
                             await this.plugin.saveSettings();
                             const replicate = await askYesNo(this.app, "Unlock and replicate?");
                             if (replicate == "yes") {
@@ -189,4 +183,149 @@ export class SetupLiveSync extends LiveSyncCommands {
             Logger("Couldn't parse or decrypt configuration uri.", LOG_LEVEL.NOTICE);
         }
     }
+
+    suspendExtraSync() {
+        Logger("Hidden files and plugin synchronization have been temporarily disabled. Please enable them after the fetching, if you need them.", LOG_LEVEL.NOTICE)
+        this.plugin.settings.syncInternalFiles = false;
+        this.plugin.settings.usePluginSync = false;
+        this.plugin.settings.autoSweepPlugins = false;
+    }
+    async askHiddenFileConfiguration(opt: { enableFetch?: boolean, enableOverwrite?: boolean }) {
+        this.plugin.addOnSetup.suspendExtraSync();
+        const message = `Would you like to enable \`Hidden File Synchronization\` or \`Customization sync\`?
+${opt.enableFetch ? " - Fetch: Use files stored from other devices. \n" : ""}${opt.enableOverwrite ? "- Overwrite: Use files from this device. \n" : ""}- Custom: Synchronize only customization files with a dedicated interface.
+- Keep them disabled: Do not use hidden file synchronization.
+Of course, we are able to disable these features.`
+        const CHOICE_FETCH = "Fetch";
+        const CHOICE_OVERWRITE = "Overwrite";
+        const CHOICE_CUSTOMIZE = "Custom";
+        const CHOICE_DISMISS = "keep them disabled";
+        const choices = [];
+        if (opt?.enableFetch) {
+            choices.push(CHOICE_FETCH);
+        }
+        if (opt?.enableOverwrite) {
+            choices.push(CHOICE_OVERWRITE);
+        }
+        choices.push(CHOICE_CUSTOMIZE);
+        choices.push(CHOICE_DISMISS);
+
+        const ret = await confirmWithMessage(this.plugin, "Hidden file sync", message, choices, CHOICE_DISMISS, 40);
+        if (ret == CHOICE_FETCH) {
+            await this.configureHiddenFileSync("FETCH");
+        } else if (ret == CHOICE_OVERWRITE) {
+            await this.configureHiddenFileSync("OVERWRITE");
+        } else if (ret == CHOICE_DISMISS) {
+            await this.configureHiddenFileSync("DISABLE");
+        } else if (ret == CHOICE_CUSTOMIZE) {
+            await this.configureHiddenFileSync("CUSTOMIZE");
+        }
+    }
+    async configureHiddenFileSync(mode: "FETCH" | "OVERWRITE" | "MERGE" | "DISABLE" | "CUSTOMIZE") {
+        this.plugin.addOnSetup.suspendExtraSync();
+        if (mode == "DISABLE") {
+            this.plugin.settings.syncInternalFiles = false;
+            this.plugin.settings.usePluginSync = false;
+            await this.plugin.saveSettings();
+            return;
+        }
+        if (mode != "CUSTOMIZE") {
+            Logger("Gathering files for enabling Hidden File Sync", LOG_LEVEL.NOTICE);
+            if (mode == "FETCH") {
+                await this.plugin.addOnHiddenFileSync.syncInternalFilesAndDatabase("pullForce", true);
+            } else if (mode == "OVERWRITE") {
+                await this.plugin.addOnHiddenFileSync.syncInternalFilesAndDatabase("pushForce", true);
+            } else if (mode == "MERGE") {
+                await this.plugin.addOnHiddenFileSync.syncInternalFilesAndDatabase("safe", true);
+            }
+            this.plugin.settings.syncInternalFiles = true;
+            await this.plugin.saveSettings();
+            Logger(`Done! Restarting the app is strongly recommended!`, LOG_LEVEL.NOTICE);
+        } else if (mode == "CUSTOMIZE") {
+            if (!this.plugin.deviceAndVaultName) {
+                let name = await askString(this.app, "Device name", "Please set this device name", `desktop`);
+                if (!name) {
+                    if (Platform.isAndroidApp) {
+                        name = "android-app"
+                    } else if (Platform.isIosApp) {
+                        name = "ios"
+                    } else if (Platform.isMacOS) {
+                        name = "macos"
+                    } else if (Platform.isMobileApp) {
+                        name = "mobile-app"
+                    } else if (Platform.isMobile) {
+                        name = "mobile"
+                    } else if (Platform.isSafari) {
+                        name = "safari"
+                    } else if (Platform.isDesktop) {
+                        name = "desktop"
+                    } else if (Platform.isDesktopApp) {
+                        name = "desktop-app"
+                    } else {
+                        name = "unknown"
+                    }
+                    name = name + Math.random().toString(36).slice(-4);
+                }
+                this.plugin.deviceAndVaultName = name;
+            }
+            this.plugin.settings.usePluginSync = true;
+            await this.plugin.saveSettings();
+            await this.plugin.addOnConfigSync.scanAllConfigFiles(true);
+        }
+
+    }
+
+    suspendAllSync() {
+        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.syncAfterMerge = false;
+        //this.suspendExtraSync();
+    }
+    async fetchLocal() {
+        this.suspendExtraSync();
+        await this.plugin.realizeSettingSyncMode();
+        await this.plugin.resetLocalDatabase();
+        await delay(1000);
+        await this.plugin.markRemoteResolved();
+        await this.plugin.openDatabase();
+        this.plugin.isReady = true;
+        await delay(500);
+        await this.plugin.replicateAllFromServer(true);
+        await delay(1000);
+        await this.plugin.replicateAllFromServer(true);
+        await this.askHiddenFileConfiguration({ enableFetch: true });
+    }
+    async rebuildRemote() {
+        this.suspendExtraSync();
+        await this.plugin.realizeSettingSyncMode();
+        await this.plugin.markRemoteLocked();
+        await this.plugin.tryResetRemoteDatabase();
+        await this.plugin.markRemoteLocked();
+        await delay(500);
+        await this.askHiddenFileConfiguration({ enableOverwrite: true });
+        await delay(1000);
+        await this.plugin.replicateAllToServer(true);
+        await delay(1000);
+        await this.plugin.replicateAllToServer(true);
+    }
+    async rebuildEverything() {
+        this.suspendExtraSync();
+        await this.plugin.realizeSettingSyncMode();
+        await this.plugin.resetLocalDatabase();
+        await delay(1000);
+        await this.plugin.initializeDatabase(true);
+        await this.plugin.markRemoteLocked();
+        await this.plugin.tryResetRemoteDatabase();
+        await this.plugin.markRemoteLocked();
+        await delay(500);
+        await this.askHiddenFileConfiguration({ enableOverwrite: true });
+        await delay(1000);
+        await this.plugin.replicateAllToServer(true);
+        await delay(1000);
+        await this.plugin.replicateAllToServer(true);
+
+    }
 }

src/JsonResolveModal.ts

@@ -8,12 +8,18 @@ export class JsonResolveModal extends Modal {
     callback: (keepRev: string, mergedStr?: string) => Promise<void>;
     docs: LoadedEntry[];
     component: JsonResolvePane;
+    nameA: string;
+    nameB: string;
+    defaultSelect: string;
 
-    constructor(app: App, filename: FilePath, docs: LoadedEntry[], callback: (keepRev: string, mergedStr?: string) => Promise<void>) {
+    constructor(app: App, filename: FilePath, docs: LoadedEntry[], callback: (keepRev: string, mergedStr?: string) => Promise<void>, nameA?: string, nameB?: string, defaultSelect?: string) {
         super(app);
         this.callback = callback;
         this.filename = filename;
         this.docs = docs;
+        this.nameA = nameA;
+        this.nameB = nameB;
+        this.defaultSelect = defaultSelect;
     }
     async UICallback(keepRev: string, mergedStr?: string) {
         this.close();
@@ -32,6 +38,9 @@ export class JsonResolveModal extends Modal {
                 props: {
                     docs: this.docs,
                     filename: this.filename,
+                    nameA: this.nameA,
+                    nameB: this.nameB,
+                    defaultSelect: this.defaultSelect,
                     callback: (keepRev, mergedStr) => this.UICallback(keepRev, mergedStr),
                 },
             });

src/JsonResolvePane.svelte

@@ -10,7 +10,9 @@
         Promise.resolve();
     };
     export let filename: FilePath = "" as FilePath;
-
+    export let nameA: string = "A";
+    export let nameB: string = "B";
+    export let defaultSelect: string = "";
     let docA: LoadedEntry = undefined;
     let docB: LoadedEntry = undefined;
     let docAContent = "";
@@ -20,14 +22,8 @@
     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" = "";
+    type SelectModes = "" | "A" | "B" | "AB" | "BA";
+    let mode: SelectModes = defaultSelect as SelectModes;
 
     function docToString(doc: LoadedEntry) {
         return doc.datatype == "plain" ? getDocData(doc.data) : base64ToString(doc.data);
@@ -47,8 +43,13 @@
         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 (docA._id == docB._id) {
+            if (mode == "A") return callback(docA._rev, null);
+            if (mode == "B") return callback(docB._rev, null);
+        } else {
+            if (mode == "A") return callback(null, docToString(docA));
+            if (mode == "B") return callback(null, docToString(docB));
+        }
         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);
@@ -92,12 +93,19 @@
     $: selectedObj = mode in mergedObjs ? mergedObjs[mode] : {};
     $: {
         diffs = getJsonDiff(objA, selectedObj);
-        console.dir(selectedObj);
     }
+
+    $: modes = [
+        ["", "Not now"],
+        ["A", nameA || "A"],
+        ["B", nameB || "B"],
+        ["AB", `${nameA || "A"} + ${nameB || "B"}`],
+        ["BA", `${nameB || "B"} + ${nameA || "A"}`],
+    ] as ["" | "A" | "B" | "AB" | "BA", string][];
 </script>
 
 <h1>Conflicted settings</h1>
-<div><span>{filename}</span></div>
+<h2>{filename}</h2>
 {#if !docA || !docB}
     <div class="message">Just for a minute, please!</div>
     <div class="buttons">
@@ -125,12 +133,14 @@
         NO PREVIEW
     {/if}
     <div>
-        A Rev:{revStringToRevNumber(docA._rev)} ,{new Date(docA.mtime).toLocaleString()}
+        {nameA}
+        {#if docA._id == docB._id} Rev:{revStringToRevNumber(docA._rev)} {/if} ,{new Date(docA.mtime).toLocaleString()}
         {docAContent.length} letters
     </div>
 
     <div>
-        B Rev:{revStringToRevNumber(docB._rev)} ,{new Date(docB.mtime).toLocaleString()}
+        {nameB}
+        {#if docA._id == docB._id} Rev:{revStringToRevNumber(docB._rev)} {/if} ,{new Date(docB.mtime).toLocaleString()}
         {docBContent.length} letters
     </div>
 

src/ObsidianLiveSyncSettingTab.ts

@@ -1,4 +1,4 @@
-import { App, PluginSettingTab, Setting, sanitizeHTMLToDom, RequestUrlParam, requestUrl, TextAreaComponent, MarkdownRenderer, stringifyYaml } from "./deps";
+import { App, PluginSettingTab, Setting, sanitizeHTMLToDom, TextAreaComponent, MarkdownRenderer, stringifyYaml } from "./deps";
 import { DEFAULT_SETTINGS, LOG_LEVEL, ObsidianLiveSyncSettings, ConfigPassphraseStore, RemoteDBSettings } from "./lib/src/types";
 import { delay } from "./lib/src/utils";
 import { Semaphore } from "./lib/src/semaphore";
@@ -7,24 +7,9 @@ import { Logger } from "./lib/src/logger";
 import { checkSyncInfo, isCloudantURI } from "./lib/src/utils_couchdb.js";
 import { testCrypt } from "./lib/src/e2ee_v2";
 import ObsidianLiveSyncPlugin from "./main";
+import { balanceChunks, localDatabaseCleanUp, performRebuildDB, remoteDatabaseCleanup, requestToCouchDB } from "./utils";
 
-const requestToCouchDB = async (baseUri: string, username: string, password: string, origin: string, key?: string, body?: string) => {
-    const utf8str = String.fromCharCode.apply(null, new TextEncoder().encode(`${username}:${password}`));
-    const encoded = window.btoa(utf8str);
-    const authHeader = "Basic " + encoded;
-    // const origin = "capacitor://localhost";
-    const transformedHeaders: Record<string, string> = { authorization: authHeader, origin: origin };
-    const uri = `${baseUri}/_node/_local/_config${key ? "/" + key : ""}`;
 
-    const requestParam: RequestUrlParam = {
-        url: uri,
-        method: body ? "PUT" : "GET",
-        headers: transformedHeaders,
-        contentType: "application/json",
-        body: body ? JSON.stringify(body) : undefined,
-    };
-    return await requestUrl(requestParam);
-};
 export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
     plugin: ObsidianLiveSyncPlugin;
     selectedScreen = "";
@@ -74,7 +59,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
 <label class='sls-setting-label c-40'><input type='radio' name='disp' value='40' class='sls-setting-tab' ><div class='sls-setting-menu-btn'>🔧</div></label>
 <label class='sls-setting-label c-50 wizardHidden'><input type='radio' name='disp' value='50' class='sls-setting-tab' ><div class='sls-setting-menu-btn'>🧰</div></label>
 <label class='sls-setting-label c-60 wizardHidden'><input type='radio' name='disp' value='60' class='sls-setting-tab' ><div class='sls-setting-menu-btn'>🔌</div></label>
-<!-- <label class='sls-setting-label c-70 wizardHidden'><input type='radio' name='disp' value='70' class='sls-setting-tab' ><div class='sls-setting-menu-btn'>🚑</div></label>-->
+<label class='sls-setting-label c-70 wizardHidden'><input type='radio' name='disp' value='70' class='sls-setting-tab' ><div class='sls-setting-menu-btn'>🎛️</div></label>
         `;
         const menuTabs = w.querySelectorAll(".sls-setting-label");
         const changeDisplay = (screen: string) => {
@@ -420,25 +405,16 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             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.syncAfterMerge = false;
+            this.plugin.addOnSetup.suspendAllSync();
+            this.plugin.addOnSetup.suspendExtraSync();
             this.plugin.settings.encrypt = encrypt;
             this.plugin.settings.passphrase = passphrase;
             this.plugin.settings.useDynamicIterationCount = useDynamicIterationCount;
             this.plugin.settings.usePathObfuscation = usePathObfuscation;
-
             await this.plugin.saveSettings();
             markDirtyControl();
             if (sendToServer) {
-                await this.plugin.initializeDatabase(true);
-                await this.plugin.markRemoteLocked();
-                await this.plugin.tryResetRemoteDatabase();
-                await this.plugin.markRemoteLocked();
-                await this.plugin.replicateAllToServer(true);
+                await this.plugin.addOnSetup.rebuildRemote()
             } else {
                 await this.plugin.markRemoteResolved();
                 await this.plugin.replicate(true);
@@ -489,78 +465,22 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             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.syncAfterMerge = false;
-            this.plugin.settings.syncInternalFiles = false;
-            this.plugin.settings.usePluginSync = false;
+            this.plugin.addOnSetup.suspendAllSync();
+            this.plugin.addOnSetup.suspendExtraSync();
             this.plugin.settings.encrypt = encrypt;
             this.plugin.settings.passphrase = passphrase;
             this.plugin.settings.useDynamicIterationCount = useDynamicIterationCount;
             this.plugin.settings.usePathObfuscation = usePathObfuscation;
-            Logger("Hidden files and plugin synchronization have been temporarily disabled. Please enable them after the fetching, if you need them.", LOG_LEVEL.NOTICE)
+            Logger("All synchronization have been temporarily disabled. Please enable them after the fetching, if you need them.", LOG_LEVEL.NOTICE)
             await this.plugin.saveSettings();
             markDirtyControl();
             applyDisplayEnabled();
             // @ts-ignore
-            this.plugin.app.setting.close()
+            this.plugin.app.setting.close();
             await delay(2000);
-            if (method == "localOnly") {
-                await this.plugin.resetLocalDatabase();
-                await delay(1000);
-                await this.plugin.markRemoteResolved();
-                await this.plugin.openDatabase();
-                this.plugin.isReady = true;
-                await this.plugin.replicateAllFromServer(true);
-            }
-            if (method == "remoteOnly") {
-                await this.plugin.markRemoteLocked();
-                await this.plugin.tryResetRemoteDatabase();
-                await this.plugin.markRemoteLocked();
-                await this.plugin.replicateAllToServer(true);
-            }
-            if (method == "rebuildBothByThisDevice") {
-                await this.plugin.resetLocalDatabase();
-                await delay(1000);
-                await this.plugin.initializeDatabase(true);
-                await this.plugin.markRemoteLocked();
-                await this.plugin.tryResetRemoteDatabase();
-                await this.plugin.markRemoteLocked();
-                await this.plugin.replicateAllToServer(true);
-            }
+            await performRebuildDB(this.plugin, method);
         }
 
-        new Setting(containerRemoteDatabaseEl)
-            .setName("Overwrite remote database")
-            .setDesc("Overwrite remote database with local DB and passphrase.")
-            .setClass("wizardHidden")
-            .addButton((button) =>
-                button
-                    .setButtonText("Send")
-                    .setWarning()
-                    .setDisabled(false)
-                    .onClick(async () => {
-                        await rebuildDB("remoteOnly");
-                    })
-            )
-
-        new Setting(containerRemoteDatabaseEl)
-            .setName("Rebuild everything")
-            .setDesc("Rebuild local and remote database with local files.")
-            .setClass("wizardHidden")
-            .addButton((button) =>
-                button
-                    .setButtonText("Rebuild")
-                    .setWarning()
-                    .setDisabled(false)
-                    .onClick(async () => {
-                        await rebuildDB("rebuildBothByThisDevice");
-                    })
-            )
-
         new Setting(containerRemoteDatabaseEl)
             .setName("Test Database Connection")
             .setDesc("Open database connection. If the remote database is not found and you have the privilege to create a database, the database will be created.")
@@ -744,19 +664,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             text: "",
         });
 
-        new Setting(containerRemoteDatabaseEl)
-            .setName("Lock remote database")
-            .setDesc("Lock remote database to prevent synchronization with other devices.")
-            .setClass("wizardHidden")
-            .addButton((button) =>
-                button
-                    .setButtonText("Lock")
-                    .setDisabled(false)
-                    .setWarning()
-                    .onClick(async () => {
-                        await this.plugin.markRemoteLocked();
-                    })
-            );
         let rebuildRemote = false;
 
         new Setting(containerRemoteDatabaseEl)
@@ -821,21 +728,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 })
             );
 
-        new Setting(containerLocalDatabaseEl)
-            .setName("Fetch rebuilt DB")
-            .setDesc("Restore or reconstruct local database from remote database.")
-            .setClass("wizardHidden")
-            .addButton((button) =>
-                button
-                    .setButtonText("Fetch")
-                    .setWarning()
-                    .setDisabled(false)
-                    .onClick(async () => {
-                        await rebuildDB("localOnly");
-                    })
-            )
-
-
         let newDatabaseName = this.plugin.settings.additionalSuffixOfDatabaseName + "";
         new Setting(containerLocalDatabaseEl)
             .setName("Database suffix")
@@ -966,7 +858,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             });
             c.addClass("op-warn");
         }
-
+        containerSyncSettingEl.createEl("h3", { text: "Synchronization Methods" });
         const syncLive: Setting[] = [];
         const syncNonLive: Setting[] = [];
         syncLive.push(
@@ -1019,6 +911,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     text.inputEl.setAttribute("type", "number");
                 }),
 
+
             new Setting(containerSyncSettingEl)
                 .setName("Sync on Save")
                 .setDesc("When you save file, sync automatically")
@@ -1060,7 +953,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     })
                 ),
         );
-
+        containerSyncSettingEl.createEl("h3", { text: "File deletion" });
         new Setting(containerSyncSettingEl)
             .setName("Use Trash for deleted files")
             .setDesc("Do not delete files that are deleted in remote, just move to trash.")
@@ -1081,6 +974,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 })
             );
 
+        containerSyncSettingEl.createEl("h3", { text: "Conflict resolution" });
         new Setting(containerSyncSettingEl)
             .setName("Use newer file if conflicted (beta)")
             .setDesc("Resolve conflicts by newer files automatically.")
@@ -1119,14 +1013,56 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 })
             );
 
-        new Setting(containerSyncSettingEl)
-            .setName("Sync hidden files")
-            .addToggle((toggle) =>
-                toggle.setValue(this.plugin.settings.syncInternalFiles).onChange(async (value) => {
-                    this.plugin.settings.syncInternalFiles = value;
-                    await this.plugin.saveSettings();
+        containerSyncSettingEl.createEl("h3", { text: "Hidden files" });
+        const LABEL_ENABLED = "🔁 : Enabled";
+        const LABEL_DISABLED = "⏹️ : Disabled"
+
+        const hiddenFileSyncSetting = new Setting(containerSyncSettingEl)
+            .setName("Hidden file synchronization")
+        const hiddenFileSyncSettingEl = hiddenFileSyncSetting.settingEl
+        const hiddenFileSyncSettingDiv = hiddenFileSyncSettingEl.createDiv("");
+        hiddenFileSyncSettingDiv.innerText = this.plugin.settings.syncInternalFiles ? LABEL_ENABLED : LABEL_DISABLED;
+
+        if (this.plugin.settings.syncInternalFiles) {
+            new Setting(containerSyncSettingEl)
+                .setName("Disable Hidden files sync")
+                .addButton((button) => {
+                    button.setButtonText("Disable")
+                        .onClick(async () => {
+                            this.plugin.settings.syncInternalFiles = false;
+                            await this.plugin.saveSettings();
+                            this.display();
+                        })
                 })
-            );
+        } else {
+
+            new Setting(containerSyncSettingEl)
+                .setName("Enable Hidden files sync")
+                .addButton((button) => {
+                    button.setButtonText("Merge")
+                        .onClick(async () => {
+                            // @ts-ignore
+                            this.plugin.app.setting.close()
+                            await this.plugin.addOnSetup.configureHiddenFileSync("MERGE");
+                        })
+                })
+                .addButton((button) => {
+                    button.setButtonText("Fetch")
+                        .onClick(async () => {
+                            // @ts-ignore
+                            this.plugin.app.setting.close()
+                            await this.plugin.addOnSetup.configureHiddenFileSync("FETCH");
+                        })
+                })
+                .addButton((button) => {
+                    button.setButtonText("Overwrite")
+                        .onClick(async () => {
+                            // @ts-ignore
+                            this.plugin.app.setting.close()
+                            await this.plugin.addOnSetup.configureHiddenFileSync("OVERWRITE");
+                        })
+                });
+        }
 
         new Setting(containerSyncSettingEl)
             .setName("Scan for hidden files before replication")
@@ -1191,31 +1127,9 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     })
             })
 
-        new Setting(containerSyncSettingEl)
-            .setName("Touch hidden files")
-            .setDesc("Update the modified time of all hidden files to the current time.")
-            .addButton((button) =>
-                button
-                    .setButtonText("Touch")
-                    .setWarning()
-                    .setDisabled(false)
-                    .onClick(async () => {
-                        const filesAll = await this.plugin.addOnHiddenFileSync.scanInternalFiles();
-                        const targetFiles = await this.plugin.filterTargetFiles(filesAll);
-                        const now = Date.now();
-                        const newFiles = targetFiles.map(e => ({ ...e, mtime: now }));
-                        let i = 0;
-                        const maxFiles = newFiles.length;
-                        for (const file of newFiles) {
-                            i++;
-                            Logger(`Touched:${file.path} (${i}/${maxFiles})`, LOG_LEVEL.NOTICE, "touch-files");
-                            await this.plugin.applyMTimeToFile(file);
-                        }
-                    })
-            )
 
         containerSyncSettingEl.createEl("h3", {
-            text: sanitizeHTMLToDom(`Experimental`),
+            text: sanitizeHTMLToDom(`Synchronization filters`),
         });
         new Setting(containerSyncSettingEl)
             .setName("Regular expression to ignore files")
@@ -1263,7 +1177,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 return text;
             }
             );
-
+        containerSyncSettingEl.createEl("h3", { text: "Efficiency" });
         new Setting(containerSyncSettingEl)
             .setName("Chunk size")
             .setDesc("Customize chunk size for binary files (0.1MBytes). This cannot be increased when using IBM Cloudant.")
@@ -1282,7 +1196,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             });
 
         new Setting(containerSyncSettingEl)
-            .setName("Read chunks online.")
+            .setName("Read chunks online")
             .setDesc("If this option is enabled, LiveSync reads chunks online directly instead of replicating them locally. Increasing Custom chunk size is recommended.")
             .addToggle((toggle) => {
                 toggle
@@ -1292,8 +1206,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                         await this.plugin.saveSettings();
                     })
                 return toggle;
-            }
-            );
+            });
         containerSyncSettingEl.createEl("h3", {
             text: sanitizeHTMLToDom(`Advanced settings`),
         });
@@ -1487,8 +1400,8 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                             }
                         }
                         this.plugin.saveSettings();
-                        await this.plugin.realizeSettingSyncMode();
                         this.display();
+                        await this.plugin.realizeSettingSyncMode();
                         if (inWizard) {
                             // @ts-ignore
                             this.plugin.app.setting.close()
@@ -1687,6 +1600,183 @@ ${stringifyYaml(pluginConfig)}`;
             );
 
         new Setting(containerHatchEl)
+            .setName("Do not pace synchronization")
+            .setDesc("If this toggle enabled, synchronisation will not be paced by queued entries. If synchronisation has been deadlocked, please make this enabled once.")
+            .addToggle((toggle) =>
+                toggle.setValue(this.plugin.settings.doNotPaceReplication).onChange(async (value) => {
+                    this.plugin.settings.doNotPaceReplication = value;
+                    await this.plugin.saveSettings();
+                })
+            );
+
+
+
+
+        addScreenElement("50", containerHatchEl);
+        // With great respect, thank you TfTHacker!
+        // Refer: https://github.com/TfTHacker/obsidian42-brat/blob/main/src/features/BetaPlugins.ts
+        const containerPluginSettings = containerEl.createDiv();
+        containerPluginSettings.createEl("h3", { text: "Customization sync (beta)" });
+
+        const updateDisabledOfDeviceAndVaultName = () => {
+            vaultName.setDisabled(this.plugin.settings.autoSweepPlugins || this.plugin.settings.autoSweepPluginsPeriodic);
+            vaultName.setTooltip(this.plugin.settings.autoSweepPlugins || this.plugin.settings.autoSweepPluginsPeriodic ? "You could not change when you enabling auto scan." : "");
+        };
+        new Setting(containerPluginSettings).setName("Enable customization sync").addToggle((toggle) =>
+            toggle.setValue(this.plugin.settings.usePluginSync).onChange(async (value) => {
+                this.plugin.settings.usePluginSync = value;
+                await this.plugin.saveSettings();
+            })
+        );
+
+        new Setting(containerPluginSettings)
+            .setName("Scan customization automatically")
+            .setDesc("Scan customization before replicating.")
+            .addToggle((toggle) =>
+                toggle.setValue(this.plugin.settings.autoSweepPlugins).onChange(async (value) => {
+                    this.plugin.settings.autoSweepPlugins = value;
+                    updateDisabledOfDeviceAndVaultName();
+                    await this.plugin.saveSettings();
+                })
+            );
+
+        new Setting(containerPluginSettings)
+            .setName("Scan customization periodically")
+            .setDesc("Scan customization 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;
+                    updateDisabledOfDeviceAndVaultName();
+                    await this.plugin.saveSettings();
+                })
+            );
+
+        new Setting(containerPluginSettings)
+            .setName("Notify customized")
+            .setDesc("Notify when other device has newly customized.")
+            .addToggle((toggle) =>
+                toggle.setValue(this.plugin.settings.notifyPluginOrSettingUpdated).onChange(async (value) => {
+                    this.plugin.settings.notifyPluginOrSettingUpdated = value;
+                    await this.plugin.saveSettings();
+                })
+            );
+        const vaultName = new Setting(containerPluginSettings)
+            .setName("Device name")
+            .setDesc("")
+            .addText((text) => {
+                text.setPlaceholder("desktop")
+                    .setValue(this.plugin.deviceAndVaultName)
+                    .onChange(async (value) => {
+                        this.plugin.deviceAndVaultName = value;
+                        await this.plugin.saveSettings();
+                    });
+                // text.inputEl.setAttribute("type", "password");
+            });
+        new Setting(containerPluginSettings)
+            .setName("Open")
+            .setDesc("Open the dialog")
+            .addButton((button) => {
+                button
+                    .setButtonText("Open")
+                    .setDisabled(false)
+                    .onClick(() => {
+                        this.plugin.addOnConfigSync.showPluginSyncModal();
+                    });
+            });
+
+        updateDisabledOfDeviceAndVaultName();
+
+        addScreenElement("60", containerPluginSettings);
+
+        const containerMaintenanceEl = containerEl.createDiv();
+
+        containerMaintenanceEl.createEl("h3", { text: "Maintain databases" });
+
+        containerMaintenanceEl.createEl("h4", { text: "The remote database" });
+
+        new Setting(containerMaintenanceEl)
+            .setName("Lock remote database")
+            .setDesc("Lock remote database to prevent synchronization with other devices.")
+            .addButton((button) =>
+                button
+                    .setButtonText("Lock")
+                    .setDisabled(false)
+                    .setWarning()
+                    .onClick(async () => {
+                        await this.plugin.markRemoteLocked();
+                    })
+            );
+
+        new Setting(containerMaintenanceEl)
+            .setName("Overwrite remote database")
+            .setDesc("Overwrite remote database with local DB and passphrase.")
+            .addButton((button) =>
+                button
+                    .setButtonText("Send")
+                    .setWarning()
+                    .setDisabled(false)
+                    .onClick(async () => {
+                        await rebuildDB("remoteOnly");
+                    })
+            )
+
+        new Setting(containerMaintenanceEl)
+            .setName("(Beta) Clean the remote database")
+            .setDesc("")
+            .addButton((button) =>
+                button.setButtonText("Count")
+                    .setDisabled(false)
+                    .onClick(async () => {
+                        await remoteDatabaseCleanup(this.plugin, true);
+                    })
+            ).addButton((button) =>
+                button.setButtonText("Perform cleaning")
+                    .setDisabled(false)
+                    .setWarning()
+                    .onClick(async () => {
+                        // @ts-ignore
+                        this.plugin.app.setting.close()
+                        await remoteDatabaseCleanup(this.plugin, false);
+                        await balanceChunks(this.plugin, false);
+                    })
+            );
+
+        containerMaintenanceEl.createEl("h4", { text: "The local database" });
+
+        new Setting(containerMaintenanceEl)
+            .setName("Fetch rebuilt DB")
+            .setDesc("Restore or reconstruct local database from remote database.")
+            .addButton((button) =>
+                button
+                    .setButtonText("Fetch")
+                    .setWarning()
+                    .setDisabled(false)
+                    .onClick(async () => {
+                        await rebuildDB("localOnly");
+                    })
+            )
+
+        new Setting(containerMaintenanceEl)
+            .setName("(Beta) Clean the local database")
+            .setDesc("This feature requires enabling 'Use new Adapter'")
+            .addButton((button) =>
+                button.setButtonText("Count")
+                    .setDisabled(false)
+                    .onClick(async () => {
+                        await localDatabaseCleanUp(this.plugin, false, true);
+                    })
+            ).addButton((button) =>
+                button.setButtonText("Perform cleaning")
+                    .setDisabled(false)
+                    .setWarning()
+                    .onClick(async () => {
+                        // @ts-ignore
+                        this.plugin.app.setting.close()
+                        await localDatabaseCleanUp(this.plugin, false, false);
+                    })
+            );
+
+        new Setting(containerMaintenanceEl)
             .setName("Discard local database to reset or uninstall Self-hosted LiveSync")
             .addButton((button) =>
                 button
@@ -1699,149 +1789,35 @@ ${stringifyYaml(pluginConfig)}`;
                     })
             );
 
-        addScreenElement("50", containerHatchEl);
-        // With great respect, thank you TfTHacker!
-        // Refer: https://github.com/TfTHacker/obsidian42-brat/blob/main/src/features/BetaPlugins.ts
-        const containerPluginSettings = containerEl.createDiv();
-        containerPluginSettings.createEl("h3", { text: "Plugins and settings (beta)" });
+        containerMaintenanceEl.createEl("h4", { text: "Both databases" });
 
-        const updateDisabledOfDeviceAndVaultName = () => {
-            vaultName.setDisabled(this.plugin.settings.autoSweepPlugins || this.plugin.settings.autoSweepPluginsPeriodic);
-            vaultName.setTooltip(this.plugin.settings.autoSweepPlugins || this.plugin.settings.autoSweepPluginsPeriodic ? "You could not change when you enabling auto scan." : "");
-        };
-        new Setting(containerPluginSettings).setName("Enable plugin synchronization").addToggle((toggle) =>
-            toggle.setValue(this.plugin.settings.usePluginSync).onChange(async (value) => {
-                this.plugin.settings.usePluginSync = value;
-                await this.plugin.saveSettings();
-            })
-        );
-
-        new Setting(containerPluginSettings)
-            .setName("Scan plugins automatically")
-            .setDesc("Scan plugins before replicating.")
-            .addToggle((toggle) =>
-                toggle.setValue(this.plugin.settings.autoSweepPlugins).onChange(async (value) => {
-                    this.plugin.settings.autoSweepPlugins = value;
-                    updateDisabledOfDeviceAndVaultName();
-                    await this.plugin.saveSettings();
-                })
-            );
-
-        new Setting(containerPluginSettings)
-            .setName("Scan plugins periodically")
-            .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;
-                    updateDisabledOfDeviceAndVaultName();
-                    await this.plugin.saveSettings();
-                })
-            );
-
-        new Setting(containerPluginSettings)
-            .setName("Notify updates")
-            .setDesc("Notify when any device has a newer plugin or its setting.")
-            .addToggle((toggle) =>
-                toggle.setValue(this.plugin.settings.notifyPluginOrSettingUpdated).onChange(async (value) => {
-                    this.plugin.settings.notifyPluginOrSettingUpdated = value;
-                    await this.plugin.saveSettings();
-                })
-            );
-        const vaultName = new Setting(containerPluginSettings)
-            .setName("Device and Vault name")
-            .setDesc("")
-            .addText((text) => {
-                text.setPlaceholder("desktop-main")
-                    .setValue(this.plugin.deviceAndVaultName)
-                    .onChange(async (value) => {
-                        this.plugin.deviceAndVaultName = value;
-                        await this.plugin.saveSettings();
-                    });
-                // text.inputEl.setAttribute("type", "password");
-            });
-        new Setting(containerPluginSettings)
-            .setName("Open")
-            .setDesc("Open the plugin dialog")
-            .addButton((button) => {
+        new Setting(containerMaintenanceEl)
+            .setName("Rebuild everything")
+            .setDesc("Rebuild local and remote database with local files.")
+            .addButton((button) =>
                 button
-                    .setButtonText("Open")
+                    .setButtonText("Rebuild")
+                    .setWarning()
                     .setDisabled(false)
-                    .onClick(() => {
-                        this.plugin.addOnPluginAndTheirSettings.showPluginSyncModal();
-                    });
-            });
+                    .onClick(async () => {
+                        await rebuildDB("rebuildBothByThisDevice");
+                    })
+            )
 
-        updateDisabledOfDeviceAndVaultName();
-
-        addScreenElement("60", containerPluginSettings);
-
-        // const containerCorruptedDataEl = containerEl.createDiv();
-
-        // containerCorruptedDataEl.createEl("h3", { text: "Corrupted or missing data" });
-        // containerCorruptedDataEl.createEl("h4", { text: "Corrupted" });
-        // if (Object.keys(this.plugin.localDatabase.corruptedEntries).length > 0) {
-        //     const cx = containerCorruptedDataEl.createEl("div", { text: "If you have a copy of these files on any device, simply edit them once and sync. If not, there's nothing we can do except deleting them. sorry.." });
-        //     for (const k in this.plugin.localDatabase.corruptedEntries) {
-        //         const xx = cx.createEl("div", { text: `${k}` });
-
-        //         const ba = xx.createEl("button", { text: `Delete this` }, (e) => {
-        //             e.addEventListener("click", async () => {
-        //                 await this.plugin.localDatabase.deleteDBEntry(k as string as FilePathWithPrefix /* should be explained */);
-        //                 xx.remove();
-        //             });
-        //         });
-        //         ba.addClass("mod-warning");
-        //         //TODO: FIX LATER
-        //         // xx.createEl("button", { text: `Restore from file` }, (e) => {
-        //         //     e.addEventListener("click", async () => {
-        //         //         const f = await this.app.vault.getFiles().filter((e) => this.plugin.path2id(e.path) == k);
-        //         //         if (f.length == 0) {
-        //         //             Logger("Not found in vault", LOG_LEVEL.NOTICE);
-        //         //             return;
-        //         //         }
-        //         //         await this.plugin.updateIntoDB(f[0]);
-        //         //         xx.remove();
-        //         //     });
-        //         // });
-        //         // xx.addClass("mod-warning");
-        //     }
-        // } else {
-        //     containerCorruptedDataEl.createEl("div", { text: "There is no corrupted data." });
-        // }
-        // containerCorruptedDataEl.createEl("h4", { text: "Missing or waiting" });
-        // if (Object.keys(this.plugin.queuedFiles).length > 0) {
-        //     const cx = containerCorruptedDataEl.createEl("div", {
-        //         text: "These files have missing or waiting chunks. Perhaps these chunks will arrive in a while after replication. But if they don't, you have to restore it's database entry from a existing local file by hitting the button below.",
-        //     });
-        //     const files = [...new Set([...this.plugin.queuedFiles.map((e) => e.entry._id)])];
-        //     for (const k of files) {
-        //         const xx = cx.createEl("div", { text: `${this.plugin.id2path(k)}` });
-
-        //         const ba = xx.createEl("button", { text: `Delete this` }, (e) => {
-        //             e.addEventListener("click", async () => {
-        //                 await this.plugin.localDatabase.deleteDBEntry(k);
-        //                 xx.remove();
-        //             });
-        //         });
-        //         ba.addClass("mod-warning");
-        //         xx.createEl("button", { text: `Restore from file` }, (e) => {
-        //             e.addEventListener("click", async () => {
-        //                 const f = await this.app.vault.getFiles().filter((e) => this.plugin.path2id(e.path) == k);
-        //                 if (f.length == 0) {
-        //                     Logger("Not found in vault", LOG_LEVEL.NOTICE);
-        //                     return;
-        //                 }
-        //                 await this.plugin.updateIntoDB(f[0]);
-        //                 xx.remove();
-        //             });
-        //         });
-        //         xx.addClass("mod-warning");
-        //     }
-        // } else {
-        //     containerCorruptedDataEl.createEl("div", { text: "There is no missing or waiting chunk." });
-        // }
-        // applyDisplayEnabled();
-        // addScreenElement("70", containerCorruptedDataEl);
+        new Setting(containerMaintenanceEl)
+            .setName("(Beta) Complement each other with possible missing chunks.")
+            .setDesc("")
+            .addButton((button) =>
+                button
+                    .setButtonText("Balance")
+                    .setWarning()
+                    .setDisabled(false)
+                    .onClick(async () => {
+                        await balanceChunks(this.plugin, false);
+                    })
+            )
+        applyDisplayEnabled();
+        addScreenElement("70", containerMaintenanceEl);
 
         applyDisplayEnabled();
         if (this.selectedScreen == "") {

src/PluginCombo.svelte

@@ -0,0 +1,318 @@
+<script lang="ts">
+    import type { PluginDataExDisplay } from "./CmdConfigSync";
+    import { Logger } from "./lib/src/logger";
+    import { versionNumberString2Number } from "./lib/src/strbin";
+    import { FilePath, LOG_LEVEL } from "./lib/src/types";
+    import { getDocData } from "./lib/src/utils";
+    import type ObsidianLiveSyncPlugin from "./main";
+    import { askString, scheduleTask } from "./utils";
+
+    export let list: PluginDataExDisplay[] = [];
+    export let thisTerm = "";
+    export let hideNotApplicable = false;
+    export let selectNewest = 0;
+    export let applyAllPluse = 0;
+
+    export let applyData: (data: PluginDataExDisplay) => Promise<boolean>;
+    export let compareData: (dataA: PluginDataExDisplay, dataB: PluginDataExDisplay) => Promise<boolean>;
+    export let deleteData: (data: PluginDataExDisplay) => Promise<boolean>;
+    export let hidden: boolean;
+    export let plugin: ObsidianLiveSyncPlugin;
+    export let isMaintenanceMode: boolean = false;
+    const addOn = plugin.addOnConfigSync;
+
+    let selected = "";
+    let freshness = "";
+    let equivalency = "";
+    let version = "";
+    let canApply: boolean = false;
+    let canCompare: boolean = false;
+    let currentSelectNewest = 0;
+    let currentApplyAll = 0;
+
+    // Selectable terminals
+    let terms = [] as string[];
+
+    async function comparePlugin(local: PluginDataExDisplay, remote: PluginDataExDisplay) {
+        let freshness = "";
+        let equivalency = "";
+        let version = "";
+        let contentCheck = false;
+        let canApply: boolean = false;
+        let canCompare = false;
+        if (!local && !remote) {
+            // NO OP. whats happened?
+            freshness = "";
+        } else if (local && !remote) {
+            freshness = "⚠ Local only";
+        } else if (remote && !local) {
+            freshness = "✓ Remote only";
+            canApply = true;
+        } else {
+            const dtDiff = (local?.mtime ?? 0) - (remote?.mtime ?? 0);
+            if (dtDiff / 1000 < -10) {
+                freshness = "✓ Newer";
+                canApply = true;
+                contentCheck = true;
+            } else if (dtDiff / 1000 > 10) {
+                freshness = "⚠ Older";
+                canApply = true;
+                contentCheck = true;
+            } else {
+                freshness = "⚖️ Same old";
+                canApply = false;
+                contentCheck = true;
+            }
+        }
+        const localVersionStr = local?.version || "0.0.0";
+        const remoteVersionStr = remote?.version || "0.0.0";
+        if (local?.version || remote?.version) {
+            const localVersion = versionNumberString2Number(localVersionStr);
+            const remoteVersion = versionNumberString2Number(remoteVersionStr);
+            if (localVersion == remoteVersion) {
+                version = "⚖️ Same ver.";
+            } else if (localVersion > remoteVersion) {
+                version = `⚠ Lower ${localVersionStr} > ${remoteVersionStr}`;
+            } else if (localVersion < remoteVersion) {
+                version = `✓ Higher ${localVersionStr} < ${remoteVersionStr}`;
+            }
+        }
+
+        if (contentCheck) {
+            const { canApply, equivalency, canCompare } = await checkEquivalency(local, remote);
+            return { canApply, freshness, equivalency, version, canCompare };
+        }
+        return { canApply, freshness, equivalency, version, canCompare };
+    }
+
+    async function checkEquivalency(local: PluginDataExDisplay, remote: PluginDataExDisplay) {
+        let equivalency = "";
+        let canApply = false;
+        let canCompare = false;
+        const filenames = [...new Set([...local.files.map((e) => e.filename), ...remote.files.map((e) => e.filename)])];
+        const matchingStatus = filenames
+            .map((filename) => {
+                const localFile = local.files.find((e) => e.filename == filename);
+                const remoteFile = remote.files.find((e) => e.filename == filename);
+                if (!localFile && !remoteFile) {
+                    return 0b0000000;
+                } else if (localFile && !remoteFile) {
+                    return 0b0000010; //"LOCAL_ONLY";
+                } else if (!localFile && remoteFile) {
+                    return 0b0001000; //"REMOTE ONLY"
+                } else {
+                    if (getDocData(localFile.data) == getDocData(remoteFile.data)) {
+                        return 0b0000100; //"EVEN"
+                    } else {
+                        return 0b0010000; //"DIFFERENT";
+                    }
+                }
+            })
+            .reduce((p, c) => p | c, 0);
+        if (matchingStatus == 0b0000100) {
+            equivalency = "⚖️ Same";
+            canApply = false;
+        } else if (matchingStatus <= 0b0000100) {
+            equivalency = "Same or local only";
+            canApply = false;
+        } else if (matchingStatus == 0b0010000) {
+            canApply = true;
+            canCompare = true;
+            equivalency = "≠ Different";
+        } else {
+            canApply = true;
+            canCompare = true;
+            equivalency = "≠ Different";
+        }
+        return { equivalency, canApply, canCompare };
+    }
+
+    async function performCompare(local: PluginDataExDisplay, remote: PluginDataExDisplay) {
+        const result = await comparePlugin(local, remote);
+        canApply = result.canApply;
+        freshness = result.freshness;
+        equivalency = result.equivalency;
+        version = result.version;
+        canCompare = result.canCompare;
+        if (local?.files.length != 1 || !local?.files?.first()?.filename?.endsWith(".json")) {
+            canCompare = false;
+        }
+    }
+
+    async function updateTerms(list: PluginDataExDisplay[], selectNewest: boolean, isMaintenanceMode: boolean) {
+        const local = list.find((e) => e.term == thisTerm);
+        selected = "";
+        if (isMaintenanceMode) {
+            terms = [...new Set(list.map((e) => e.term))];
+        } else if (hideNotApplicable) {
+            const termsTmp = [];
+            const wk = [...new Set(list.map((e) => e.term))];
+            for (const termName of wk) {
+                const remote = list.find((e) => e.term == termName);
+                if ((await comparePlugin(local, remote)).canApply) {
+                    termsTmp.push(termName);
+                }
+            }
+            terms = [...termsTmp];
+        } else {
+            terms = [...new Set(list.map((e) => e.term))].filter((e) => e != thisTerm);
+        }
+        let newest: PluginDataExDisplay = local;
+        if (selectNewest) {
+            for (const term of terms) {
+                const remote = list.find((e) => e.term == term);
+                if (remote && remote.mtime && (newest?.mtime || 0) < remote.mtime) {
+                    newest = remote;
+                }
+            }
+            if (newest && newest.term != thisTerm) {
+                selected = newest.term;
+            }
+            // selectNewest = false;
+        }
+    }
+    $: {
+        // React pulse and select
+        const doSelectNewest = selectNewest != currentSelectNewest;
+        currentSelectNewest = selectNewest;
+        updateTerms(list, doSelectNewest, isMaintenanceMode);
+    }
+    $: {
+        // React pulse and apply
+        const doApply = applyAllPluse != currentApplyAll;
+        currentApplyAll = applyAllPluse;
+        if (doApply && selected) {
+            if (!hidden) {
+                applySelected();
+            }
+        }
+    }
+    $: {
+        freshness = "";
+        equivalency = "";
+        version = "";
+        canApply = false;
+        if (selected == "") {
+            // NO OP.
+        } else if (selected == thisTerm) {
+            freshness = "This device";
+            canApply = false;
+        } else {
+            const local = list.find((e) => e.term == thisTerm);
+            const remote = list.find((e) => e.term == selected);
+            performCompare(local, remote);
+        }
+    }
+    async function applySelected() {
+        const local = list.find((e) => e.term == thisTerm);
+        const selectedItem = list.find((e) => e.term == selected);
+        if (selectedItem && (await applyData(selectedItem))) {
+            scheduleTask("update-plugin-list", 250, () => addOn.updatePluginList(true, local.documentPath));
+        }
+    }
+    async function compareSelected() {
+        const local = list.find((e) => e.term == thisTerm);
+        const selectedItem = list.find((e) => e.term == selected);
+        if (local && selectedItem && (await compareData(local, selectedItem))) {
+            scheduleTask("update-plugin-list", 250, () => addOn.updatePluginList(true, local.documentPath));
+        }
+    }
+    async function deleteSelected() {
+        const selectedItem = list.find((e) => e.term == selected);
+        // const deletedPath = selectedItem.documentPath;
+        if (selectedItem && (await deleteData(selectedItem))) {
+            scheduleTask("update-plugin-list", 250, () => addOn.reloadPluginList(true));
+        }
+    }
+    async function duplicateItem() {
+        const local = list.find((e) => e.term == thisTerm);
+        const duplicateTermName = await askString(plugin.app, "Duplicate", "device name", "");
+        if (duplicateTermName) {
+            if (duplicateTermName.contains("/")) {
+                Logger(`We can not use "/" to the device name`, LOG_LEVEL.NOTICE);
+                return;
+            }
+            const key = `${plugin.app.vault.configDir}/${local.files[0].filename}`;
+            await addOn.storeCustomizationFiles(key as FilePath, duplicateTermName);
+            await addOn.updatePluginList(false, addOn.filenameToUnifiedKey(key, duplicateTermName));
+        }
+    }
+</script>
+
+{#if terms.length > 0}
+    <span class="spacer" />
+    {#if !hidden}
+        <span class="messages">
+            <span class="message">{freshness}</span>
+            <span class="message">{equivalency}</span>
+            <span class="message">{version}</span>
+        </span>
+        <select bind:value={selected}>
+            <option value={""}>-</option>
+            {#each terms as term}
+                <option value={term}>{term}</option>
+            {/each}
+        </select>
+        {#if canApply || (isMaintenanceMode && selected != "")}
+            {#if canCompare}
+                <button on:click={compareSelected}>🔍</button>
+            {:else}
+                <button disabled />
+            {/if}
+            <button on:click={applySelected}>✓</button>
+        {:else}
+            <button disabled />
+            <button disabled />
+        {/if}
+        {#if isMaintenanceMode}
+            {#if selected != ""}
+                <button on:click={deleteSelected}>🗑️</button>
+            {:else}
+                <button on:click={duplicateItem}>📑</button>
+            {/if}
+        {/if}
+    {/if}
+{:else}
+    <span class="spacer" />
+    <span class="message even">All devices are even</span>
+    <button disabled />
+    <button disabled />
+{/if}
+
+<style>
+    .spacer {
+        min-width: 1px;
+        flex-grow: 1;
+    }
+    button {
+        margin: 2px 4px;
+        min-width: 3em;
+        max-width: 4em;
+    }
+    button:disabled {
+        border: none;
+        box-shadow: none;
+        background-color: transparent;
+        visibility: collapse;
+    }
+    button:disabled:hover {
+        border: none;
+        box-shadow: none;
+        background-color: transparent;
+        visibility: collapse;
+    }
+    span.message {
+        color: var(--text-muted);
+        font-size: var(--font-ui-smaller);
+        padding: 0 1em;
+        line-height: var(--line-height-tight);
+    }
+    span.messages {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+    }
+    :global(.is-mobile) .spacer {
+        margin-left: auto;
+    }
+</style>

src/PluginPane.svelte

@@ -1,309 +1,230 @@
 <script lang="ts">
     import { onMount } from "svelte";
-    import { DevicePluginList, PluginDataEntry } from "./types";
-    import { versionNumberString2Number } from "./lib/src/strbin";
     import ObsidianLiveSyncPlugin from "./main";
-    import { PluginAndTheirSettings } from "./CmdPluginAndTheirSettings";
-
-    type JudgeResult = "" | "NEWER" | "EVEN" | "EVEN_BUT_DIFFERENT" | "OLDER" | "REMOTE_ONLY";
-
-    interface PluginDataEntryDisp extends PluginDataEntry {
-        versionInfo: string;
-        mtimeInfo: string;
-        mtimeFlag: JudgeResult;
-        versionFlag: JudgeResult;
-    }
-
+    import { PluginDataExDisplay, pluginIsEnumerating, pluginList } from "./CmdConfigSync";
+    import PluginCombo from "./PluginCombo.svelte";
     export let plugin: ObsidianLiveSyncPlugin;
-    let plugins: PluginDataEntry[] = [];
-    let deviceAndPlugins: { [key: string]: PluginDataEntryDisp[] } = {};
-    let devicePluginList: [string, PluginDataEntryDisp[]][] = null;
-    let ownPlugins: DevicePluginList = null;
-    let showOwnPlugins = false;
-    let targetList: { [key: string]: boolean } = {};
 
-    let addOn: PluginAndTheirSettings;
-    $: {
-        const f = plugin.addOns.filter((e) => e instanceof PluginAndTheirSettings);
-        if (f && f.length > 0) {
-            addOn = f[0] as PluginAndTheirSettings;
-        }
+    $: hideNotApplicable = true;
+    $: thisTerm = plugin.deviceAndVaultName;
+
+    const addOn = plugin.addOnConfigSync;
+
+    let list: PluginDataExDisplay[] = [];
+
+    let selectNewestPulse = 0;
+    let hideEven = true;
+    let loading = false;
+    let applyAllPluse = 0;
+    let isMaintenanceMode = false;
+    async function requestUpdate() {
+        await addOn.updatePluginList(true);
     }
-    function saveTargetList() {
-        window.localStorage.setItem("ols-plugin-targetlist", JSON.stringify(targetList));
+    async function requestReload() {
+        await addOn.reloadPluginList(true);
     }
-
-    function loadTargetList() {
-        let e = window.localStorage.getItem("ols-plugin-targetlist") || "{}";
-        try {
-            targetList = JSON.parse(e);
-        } catch (_) {
-            // NO OP.
-        }
-    }
-
-    function clearSelection() {
-        targetList = {};
-    }
-
-    async function updateList() {
-        let x = await addOn.getPluginList();
-        ownPlugins = x.thisDevicePlugins;
-        plugins = Object.values(x.allPlugins);
-        let targetListItems = Array.from(new Set(plugins.map((e) => e.deviceVaultName + "---" + e.manifest.id)));
-        let newTargetList: { [key: string]: boolean } = {};
-        for (const id of targetListItems) {
-            for (const tag of ["---plugin", "---setting"]) {
-                newTargetList[id + tag] = id + tag in targetList && targetList[id + tag];
-            }
-        }
-        targetList = newTargetList;
-        saveTargetList();
-    }
-
-    $: {
-        deviceAndPlugins = {};
-        for (const p of plugins) {
-            if (p.deviceVaultName == plugin.deviceAndVaultName && !showOwnPlugins) {
-                continue;
-            }
-            if (!(p.deviceVaultName in deviceAndPlugins)) {
-                deviceAndPlugins[p.deviceVaultName] = [];
-            }
-            let dispInfo: PluginDataEntryDisp = {
-                ...p,
-                versionInfo: "",
-                mtimeInfo: "",
-                versionFlag: "",
-                mtimeFlag: "",
-            };
-            dispInfo.versionInfo = p.manifest.version;
-            let x = new Date().getTime() / 1000;
-            let mtime = p.mtime / 1000;
-            let diff = (x - mtime) / 60;
-            if (p.mtime == 0) {
-                dispInfo.mtimeInfo = `-`;
-            } else if (diff < 60) {
-                dispInfo.mtimeInfo = `${diff | 0} Mins ago`;
-            } else if (diff < 60 * 24) {
-                dispInfo.mtimeInfo = `${(diff / 60) | 0} Hours ago`;
-            } else if (diff < 60 * 24 * 10) {
-                dispInfo.mtimeInfo = `${(diff / (60 * 24)) | 0} Days ago`;
-            } else {
-                dispInfo.mtimeInfo = new Date(dispInfo.mtime).toLocaleString();
-            }
-            // compare with own plugin
-            let id = p.manifest.id;
-
-            if (id in ownPlugins) {
-                // Which we have.
-                const ownPlugin = ownPlugins[id];
-                let localVer = versionNumberString2Number(ownPlugin.manifest.version);
-                let pluginVer = versionNumberString2Number(p.manifest.version);
-                if (localVer > pluginVer) {
-                    dispInfo.versionFlag = "OLDER";
-                } else if (localVer == pluginVer) {
-                    if (ownPlugin.manifestJson + (ownPlugin.styleCss ?? "") + ownPlugin.mainJs != p.manifestJson + (p.styleCss ?? "") + p.mainJs) {
-                        dispInfo.versionFlag = "EVEN_BUT_DIFFERENT";
-                    } else {
-                        dispInfo.versionFlag = "EVEN";
-                    }
-                } else if (localVer < pluginVer) {
-                    dispInfo.versionFlag = "NEWER";
-                }
-                if ((ownPlugin.dataJson ?? "") == (p.dataJson ?? "")) {
-                    if (ownPlugin.mtime == 0 && p.mtime == 0) {
-                        dispInfo.mtimeFlag = "";
-                    } else {
-                        dispInfo.mtimeFlag = "EVEN";
-                    }
-                } else {
-                    if (((ownPlugin.mtime / 1000) | 0) > ((p.mtime / 1000) | 0)) {
-                        dispInfo.mtimeFlag = "OLDER";
-                    } else if (((ownPlugin.mtime / 1000) | 0) == ((p.mtime / 1000) | 0)) {
-                        dispInfo.mtimeFlag = "EVEN_BUT_DIFFERENT";
-                    } else if (((ownPlugin.mtime / 1000) | 0) < ((p.mtime / 1000) | 0)) {
-                        dispInfo.mtimeFlag = "NEWER";
-                    }
-                }
-            } else {
-                dispInfo.versionFlag = "REMOTE_ONLY";
-                dispInfo.mtimeFlag = "REMOTE_ONLY";
-            }
-
-            deviceAndPlugins[p.deviceVaultName].push(dispInfo);
-        }
-        devicePluginList = Object.entries(deviceAndPlugins);
-    }
-
-    function getDispString(stat: JudgeResult): string {
-        if (stat == "") return "";
-        if (stat == "NEWER") return " (Newer)";
-        if (stat == "OLDER") return " (Older)";
-        if (stat == "EVEN") return " (Even)";
-        if (stat == "EVEN_BUT_DIFFERENT") return " (Even but different)";
-        if (stat == "REMOTE_ONLY") return " (Remote Only)";
-        return "";
-    }
-
+    pluginList.subscribe((e) => {
+        list = e;
+    });
+    pluginIsEnumerating.subscribe((e) => {
+        loading = e;
+    });
     onMount(async () => {
-        loadTargetList();
-        await updateList();
+        requestUpdate();
     });
 
-    function toggleShowOwnPlugins() {
-        showOwnPlugins = !showOwnPlugins;
+    function filterList(list: PluginDataExDisplay[], categories: string[]) {
+        const w = list.filter((e) => categories.indexOf(e.category) !== -1);
+        return w.sort((a, b) => `${a.category}-${a.name}`.localeCompare(`${b.category}-${b.name}`));
     }
 
-    function toggleTarget(key: string) {
-        targetList[key] = !targetList[key];
-        saveTargetList();
-    }
-
-    function toggleAll(devicename: string) {
-        for (const c in targetList) {
-            if (c.startsWith(devicename)) {
-                targetList[c] = true;
-            }
+    function groupBy(items: PluginDataExDisplay[], key: string) {
+        let ret = {} as Record<string, PluginDataExDisplay[]>;
+        for (const v of items) {
+            //@ts-ignore
+            const k = (key in v ? v[key] : "") as string;
+            ret[k] = ret[k] || [];
+            ret[k].push(v);
         }
-    }
-
-    async function sweepPlugins() {
-        //@ts-ignore
-        await plugin.app.plugins.loadManifests();
-        await addOn.sweepPlugin(true);
-        updateList();
-    }
-
-    async function applyPlugins() {
-        for (const c in targetList) {
-            if (targetList[c] == true) {
-                const [deviceAndVault, id, opt] = c.split("---");
-                if (deviceAndVault in deviceAndPlugins) {
-                    const entry = deviceAndPlugins[deviceAndVault].find((e) => e.manifest.id == id);
-                    if (entry) {
-                        if (opt == "plugin") {
-                            if (entry.versionFlag != "EVEN") await addOn.applyPlugin(entry);
-                        } else if (opt == "setting") {
-                            if (entry.mtimeFlag != "EVEN") await addOn.applyPluginData(entry);
-                        }
-                    }
-                }
-            }
+        for (const k in ret) {
+            ret[k] = ret[k].sort((a, b) => `${a.category}-${a.name}`.localeCompare(`${b.category}-${b.name}`));
         }
-        //@ts-ignore
-        await plugin.app.plugins.loadManifests();
-        await addOn.sweepPlugin(true);
-        updateList();
+        const w = Object.entries(ret);
+        return w.sort(([a], [b]) => `${a}`.localeCompare(`${b}`));
     }
 
-    async function checkUpdates() {
-        await addOn.checkPluginUpdate();
+    const displays = {
+        CONFIG: "Configuration",
+        THEME: "Themes",
+        SNIPPET: "Snippets",
+    };
+    async function scanAgain() {
+        await addOn.scanAllConfigFiles(true);
+        await requestUpdate();
     }
-    async function replicateAndRefresh() {
+    async function replicate() {
         await plugin.replicate(true);
-        updateList();
     }
+    function selectAllNewest() {
+        selectNewestPulse++;
+    }
+    function applyAll() {
+        applyAllPluse++;
+    }
+    async function applyData(data: PluginDataExDisplay): Promise<boolean> {
+        return await addOn.applyData(data);
+    }
+    async function compareData(docA: PluginDataExDisplay, docB: PluginDataExDisplay): Promise<boolean> {
+        return await addOn.compareUsingDisplayData(docA, docB);
+    }
+    async function deleteData(data: PluginDataExDisplay): Promise<boolean> {
+        return await addOn.deleteData(data);
+    }
+
+    $: options = {
+        thisTerm,
+        hideNotApplicable,
+        selectNewest: selectNewestPulse,
+        applyAllPluse,
+        applyData,
+        compareData,
+        deleteData,
+        plugin,
+        isMaintenanceMode,
+    };
 </script>
 
 <div>
-    <h1>Plugins and their settings</h1>
-    <div class="ols-plugins-div-buttons">
-        Show own items
-        <div class="checkbox-container" class:is-enabled={showOwnPlugins} on:click={toggleShowOwnPlugins} />
-    </div>
-    <div class="sls-plugins-wrap">
-        <table class="sls-plugins-tbl">
-            <tr style="position:sticky">
-                <th class="sls-plugins-tbl-device-head">Name</th>
-                <th class="sls-plugins-tbl-device-head">Info</th>
-                <th class="sls-plugins-tbl-device-head">Target</th>
-            </tr>
-            {#if !devicePluginList}
-                <tr>
-                    <td colspan="3" class="sls-table-tail tcenter"> Retrieving... </td>
-                </tr>
-            {:else if devicePluginList.length == 0}
-                <tr>
-                    <td colspan="3" class="sls-table-tail tcenter"> No plugins found. </td>
-                </tr>
-            {:else}
-                {#each devicePluginList as [deviceName, devicePlugins]}
-                    <tr>
-                        <th colspan="2" class="sls-plugins-tbl-device-head">{deviceName}</th>
-                        <th class="sls-plugins-tbl-device-head">
-                            <button class="mod-cta" on:click={() => toggleAll(deviceName)}>✔</button>
-                        </th>
-                    </tr>
-                    {#each devicePlugins as plugin}
-                        <tr>
-                            <td class="sls-table-head">{plugin.manifest.name}</td>
-                            <td class="sls-table-tail tcenter">{plugin.versionInfo}{getDispString(plugin.versionFlag)}</td>
-                            <td class="sls-table-tail tcenter">
-                                {#if plugin.versionFlag === "EVEN" || plugin.versionFlag === ""}
-                                    -
-                                {:else}
-                                    <div class="wrapToggle">
-                                        <div
-                                            class="checkbox-container"
-                                            class:is-enabled={targetList[plugin.deviceVaultName + "---" + plugin.manifest.id + "---plugin"]}
-                                            on:click={() => toggleTarget(plugin.deviceVaultName + "---" + plugin.manifest.id + "---plugin")}
-                                        />
-                                    </div>
-                                {/if}
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="sls-table-head">Settings</td>
-                            <td class="sls-table-tail tcenter">{plugin.mtimeInfo}{getDispString(plugin.mtimeFlag)}</td>
-                            <td class="sls-table-tail tcenter">
-                                {#if plugin.mtimeFlag === "EVEN" || plugin.mtimeFlag === ""}
-                                    -
-                                {:else}
-                                    <div class="wrapToggle">
-                                        <div
-                                            class="checkbox-container"
-                                            class:is-enabled={targetList[plugin.deviceVaultName + "---" + plugin.manifest.id + "---setting"]}
-                                            on:click={() => toggleTarget(plugin.deviceVaultName + "---" + plugin.manifest.id + "---setting")}
-                                        />
-                                    </div>
-                                {/if}
-                            </td>
-                        </tr>
-                        <tr class="divider">
-                            <th colspan="3" />
-                        </tr>
-                    {/each}
-                {/each}
+    <div>
+        <h1>Customization sync</h1>
+        <div class="buttons">
+            <button on:click={() => scanAgain()}>Scan changes</button>
+            <button on:click={() => replicate()}>Sync once</button>
+            <button on:click={() => requestUpdate()}>Refresh</button>
+            {#if isMaintenanceMode}
+                <button on:click={() => requestReload()}>Reload</button>
             {/if}
-        </table>
+            <button on:click={() => selectAllNewest()}>Select All Shiny</button>
+        </div>
+        <div class="buttons">
+            <button on:click={() => applyAll()}>Apply All</button>
+        </div>
     </div>
-    <div class="ols-plugins-div-buttons">
-        <button class="" on:click={replicateAndRefresh}>Replicate and refresh</button>
-        <button class="" on:click={clearSelection}>Clear Selection</button>
+    {#if loading}
+        <div>
+            <span>Updating list...</span>
+        </div>
+    {/if}
+    <div class="list">
+        {#if list.length == 0}
+            <div class="center">No Items.</div>
+        {:else}
+            {#each Object.entries(displays) as [key, label]}
+                <div>
+                    <h3>{label}</h3>
+                    {#each groupBy(filterList(list, [key]), "name") as [name, listX]}
+                        <div class="labelrow {hideEven ? 'hideeven' : ''}">
+                            <div class="title">
+                                {name}
+                            </div>
+                            <PluginCombo {...options} list={listX} hidden={false} />
+                        </div>
+                    {/each}
+                </div>
+            {/each}
+            <div>
+                <h3>Plugins</h3>
+                {#each groupBy(filterList(list, ["PLUGIN_MAIN", "PLUGIN_DATA", "PLUGIN_ETC"]), "name") as [name, listX]}
+                    <div class="labelrow {hideEven ? 'hideeven' : ''}">
+                        <div class="title">
+                            {name}
+                        </div>
+                        <PluginCombo {...options} list={listX} hidden={true} />
+                    </div>
+                    <div class="filerow {hideEven ? 'hideeven' : ''}">
+                        <div class="filetitle">Main</div>
+                        <PluginCombo {...options} list={filterList(listX, ["PLUGIN_MAIN"])} hidden={false} />
+                    </div>
+                    <div class="filerow {hideEven ? 'hideeven' : ''}">
+                        <div class="filetitle">Data</div>
+                        <PluginCombo {...options} list={filterList(listX, ["PLUGIN_DATA"])} hidden={false} />
+                    </div>
+                {/each}
+            </div>
+        {/if}
     </div>
-
-    <div class="ols-plugins-div-buttons">
-        <button class="mod-cta" on:click={checkUpdates}>Check Updates</button>
-        <button class="mod-cta" on:click={sweepPlugins}>Scan installed</button>
-        <button class="mod-cta" on:click={applyPlugins}>Apply all</button>
+    <div class="buttons">
+        <label><span>Hide not applicable items</span><input type="checkbox" bind:checked={hideEven} /></label>
+    </div>
+    <div class="buttons">
+        <label><span>Maintenance mode</span><input type="checkbox" bind:checked={isMaintenanceMode} /></label>
     </div>
-    <!--    <div class="ols-plugins-div-buttons">-->
-    <!--        <button class="mod-warning" on:click={applyPlugins}>Delete all selected</button>-->
-    <!--    </div>-->
 </div>
 
 <style>
-    .ols-plugins-div-buttons {
+    .labelrow {
+        margin-left: 0.4em;
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        border-top: 1px solid var(--background-modifier-border);
+        padding: 4px;
+        flex-wrap: wrap;
+    }
+    .filerow {
+        margin-left: 1.25em;
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        padding-right: 4px;
+        flex-wrap: wrap;
+    }
+    .filerow.hideeven:has(.even),
+    .labelrow.hideeven:has(.even) {
+        display: none;
+    }
+
+    .title {
+        color: var(--text-normal);
+        font-size: var(--font-ui-medium);
+        line-height: var(--line-height-tight);
+        margin-right: auto;
+    }
+    .filetitle {
+        color: var(--text-normal);
+        font-size: var(--font-ui-medium);
+        line-height: var(--line-height-tight);
+        margin-right: auto;
+    }
+    .buttons {
         display: flex;
         flex-direction: row;
         justify-content: flex-end;
         margin-top: 8px;
+        flex-wrap: wrap;
+    }
+    .buttons > button {
+        margin-left: 4px;
+        width: auto;
     }
 
-    .wrapToggle {
+    label {
         display: flex;
         justify-content: center;
-        align-content: center;
+        align-items: center;
+    }
+    label > span {
+        margin-right: 0.25em;
+    }
+    :global(.is-mobile) .title,
+    :global(.is-mobile) .filetitle {
+        width: 100%;
+    }
+
+    .center {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        min-height: 3em;
     }
 </style>

src/StorageEventManager.ts

@@ -1,7 +1,7 @@
 import { Plugin_2, TAbstractFile, TFile, TFolder } from "./deps";
 import { isPlainText, shouldBeIgnored } from "./lib/src/path";
 import { getGlobalStore } from "./lib/src/store";
-import { ObsidianLiveSyncSettings } from "./lib/src/types";
+import { FilePath, ObsidianLiveSyncSettings } from "./lib/src/types";
 import { FileEventItem, FileEventType, FileInfo, InternalFileInfo, queueItem } from "./types";
 import { recentlyTouched } from "./utils";
 
@@ -57,14 +57,14 @@ export class StorageEventManagerObsidian extends StorageEventManager {
     watchVaultRename(file: TAbstractFile, oldFile: string, ctx?: any) {
         if (file instanceof TFile) {
             this.appendWatchEvent([
+                { type: "DELETE", file: { path: oldFile as FilePath, mtime: file.stat.mtime, ctime: file.stat.ctime, size: file.stat.size, deleted: true } },
                 { type: "CREATE", file },
-                { type: "DELETE", file: { path: oldFile, mtime: file.stat.mtime, ctime: file.stat.ctime, size: file.stat.size, deleted: true } }
             ], ctx);
         }
     }
     // Watch raw events (Internal API)
-    watchVaultRawEvents(path: string) {
-        if (!this.plugin.settings.syncInternalFiles) return;
+    watchVaultRawEvents(path: FilePath) {
+        if (!this.plugin.settings.syncInternalFiles && !this.plugin.settings.usePluginSync) return;
         if (!this.plugin.settings.watchInternalFileChanges) return;
         if (!path.startsWith(app.vault.configDir)) return;
         const ignorePatterns = this.plugin.settings.syncInternalFilesIgnorePatterns

src/deps.ts

@@ -3,6 +3,7 @@ import { FilePath } from "./lib/src/types";
 export {
     addIcon, App, DataWriteOptions, debounce, Editor, FuzzySuggestModal, MarkdownRenderer, MarkdownView, Modal, Notice, Platform, Plugin, PluginManifest,
     PluginSettingTab, Plugin_2, requestUrl, RequestUrlParam, RequestUrlResponse, sanitizeHTMLToDom, Setting, stringifyYaml, TAbstractFile, TextAreaComponent, TFile, TFolder,
+    parseYaml
 } from "obsidian";
 import {
     normalizePath as normalizePath_

src/dialogs.ts

@@ -1,4 +1,5 @@
-import { App, FuzzySuggestModal, Modal, Setting } from "./deps";
+import { ButtonComponent } from "obsidian";
+import { App, FuzzySuggestModal, MarkdownRenderer, Modal, Plugin, Setting } from "./deps";
 import ObsidianLiveSyncPlugin from "./main";
 
 //@ts-ignore
@@ -8,6 +9,9 @@ export class PluginDialogModal extends Modal {
     plugin: ObsidianLiveSyncPlugin;
     logEl: HTMLDivElement;
     component: PluginPane = null;
+    isOpened() {
+        return this.component != null;
+    }
 
     constructor(app: App, plugin: ObsidianLiveSyncPlugin) {
         super(app);
@@ -123,4 +127,103 @@ export class PopoverSelectString extends FuzzySuggestModal<string> {
             }
         }, 100);
     }
-}
+}
+
+export class MessageBox extends Modal {
+
+    plugin: Plugin;
+    title: string;
+    contentMd: string;
+    buttons: string[];
+    result: string;
+    isManuallyClosed = false;
+    defaultAction: string | undefined;
+    timeout: number | undefined;
+    timer: ReturnType<typeof setInterval> = undefined;
+    defaultButtonComponent: ButtonComponent | undefined;
+
+    onSubmit: (result: string | boolean) => void;
+
+    constructor(plugin: Plugin, title: string, contentMd: string, buttons: string[], defaultAction: (typeof buttons)[number], timeout: number, onSubmit: (result: (typeof buttons)[number] | false) => void) {
+        super(plugin.app);
+        this.plugin = plugin;
+        this.title = title;
+        this.contentMd = contentMd;
+        this.buttons = buttons;
+        this.onSubmit = onSubmit;
+        this.defaultAction = defaultAction;
+        this.timeout = timeout;
+        if (this.timeout) {
+            this.timer = setInterval(() => {
+                this.timeout--;
+                if (this.timeout < 0) {
+                    if (this.timer) {
+                        clearInterval(this.timer);
+                        this.timer = undefined;
+                    }
+                    this.result = defaultAction;
+                    this.isManuallyClosed = true;
+                    this.close();
+                } else {
+                    this.defaultButtonComponent.setButtonText(`( ${this.timeout} ) ${defaultAction}`);
+                }
+            }, 1000);
+        }
+    }
+
+    onOpen() {
+        const { contentEl } = this;
+        contentEl.addEventListener("click", () => {
+            if (this.timer) {
+                clearInterval(this.timer);
+                this.timer = undefined;
+            }
+        })
+        contentEl.createEl("h1", { text: this.title });
+        const div = contentEl.createDiv();
+        MarkdownRenderer.renderMarkdown(this.contentMd, div, "/", null);
+        const buttonSetting = new Setting(contentEl);
+        for (const button of this.buttons) {
+            buttonSetting.addButton((btn) => {
+                btn
+                    .setButtonText(button)
+                    .onClick(() => {
+                        this.isManuallyClosed = true;
+                        this.result = button;
+                        if (this.timer) {
+                            clearInterval(this.timer);
+                            this.timer = undefined;
+                        }
+                        this.close();
+                    })
+                if (button == this.defaultAction) {
+                    this.defaultButtonComponent = btn;
+                }
+                return btn;
+            }
+            )
+        }
+    }
+
+    onClose() {
+        const { contentEl } = this;
+        contentEl.empty();
+        if (this.timer) {
+            clearInterval(this.timer);
+            this.timer = undefined;
+        }
+        if (this.isManuallyClosed) {
+            this.onSubmit(this.result);
+        } else {
+            this.onSubmit(false);
+        }
+    }
+}
+
+
+export function confirmWithMessage(plugin: Plugin, title: string, contentMd: string, buttons: string[], defaultAction?: (typeof buttons)[number], timeout?: number): Promise<(typeof buttons)[number] | false> {
+    return new Promise((res) => {
+        const dialog = new MessageBox(plugin, title, contentMd, buttons, defaultAction, timeout, (result) => res(result));
+        dialog.open();
+    });
+}

src/main.ts

@@ -4,14 +4,14 @@ import { Diff, DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_patch } from "di
 import { debounce, Notice, Plugin, TFile, addIcon, TFolder, normalizePath, TAbstractFile, Editor, MarkdownView, RequestUrlParam, RequestUrlResponse, requestUrl } from "./deps";
 import { EntryDoc, LoadedEntry, ObsidianLiveSyncSettings, diff_check_result, diff_result_leaf, EntryBody, LOG_LEVEL, VER, DEFAULT_SETTINGS, diff_result, FLAGMD_REDFLAG, SYNCINFO_ID, SALT_OF_PASSPHRASE, ConfigPassphraseStore, CouchDBConnection, FLAGMD_REDFLAG2, FLAGMD_REDFLAG3, PREFIXMD_LOGFILE, DatabaseConnectingStatus, EntryHasPath, DocumentID, FilePathWithPrefix, FilePath, AnyEntry } from "./lib/src/types";
 import { InternalFileInfo, queueItem, CacheData, FileEventItem, FileWatchEventQueueMax } from "./types";
-import { delay, getDocData, isDocContentSame } from "./lib/src/utils";
+import { getDocData, isDocContentSame } from "./lib/src/utils";
 import { Logger } from "./lib/src/logger";
 import { PouchDB } from "./lib/src/pouchdb-browser.js";
 import { LogDisplayModal } from "./LogDisplayModal";
 import { ConflictResolveModal } from "./ConflictResolveModal";
 import { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab";
 import { DocumentHistoryModal } from "./DocumentHistoryModal";
-import { applyPatch, cancelAllPeriodicTask, cancelAllTasks, cancelTask, generatePatchObj, id2path, isObjectMargeApplicable, isSensibleMargeApplicable, flattenObject, path2id, scheduleTask, tryParseJSON, createFile, modifyFile, isValidPath, getAbstractFileByPath, touch, recentlyTouched, isIdOfInternalMetadata, isPluginMetadata, stripInternalMetadataPrefix, isChunk, askSelectString, askYesNo, askString, PeriodicProcessor, clearTouched, getPath, getPathWithoutPrefix, getPathFromTFile } from "./utils";
+import { applyPatch, cancelAllPeriodicTask, cancelAllTasks, cancelTask, generatePatchObj, id2path, isObjectMargeApplicable, isSensibleMargeApplicable, flattenObject, path2id, scheduleTask, tryParseJSON, createFile, modifyFile, isValidPath, getAbstractFileByPath, touch, recentlyTouched, isInternalMetadata, isPluginMetadata, stripInternalMetadataPrefix, isChunk, askSelectString, askYesNo, askString, PeriodicProcessor, clearTouched, getPath, getPathWithoutPrefix, getPathFromTFile, localDatabaseCleanUp, balanceChunks, performRebuildDB } from "./utils";
 import { encrypt, tryDecrypt } from "./lib/src/e2ee_v2";
 import { enableEncryption, isCloudantURI, isErrorOfMissingDoc, isValidRemoteCouchDBURI } from "./lib/src/utils_couchdb";
 import { getGlobalStore, ObservableStore, observeStores } from "./lib/src/store";
@@ -26,9 +26,10 @@ import { LiveSyncLocalDB, LiveSyncLocalDBEnv } from "./lib/src/LiveSyncLocalDB";
 import { LiveSyncDBReplicator, LiveSyncReplicatorEnv } from "./lib/src/LiveSyncReplicator";
 import { KeyValueDatabase, OpenKeyValueDatabase } from "./KeyValueDB";
 import { LiveSyncCommands } from "./LiveSyncCommands";
-import { PluginAndTheirSettings } from "./CmdPluginAndTheirSettings";
 import { HiddenFileSync } from "./CmdHiddenFileSync";
 import { SetupLiveSync } from "./CmdSetupLiveSync";
+import { ConfigSync } from "./CmdConfigSync";
+import { confirmWithMessage } from "./dialogs";
 
 setNoticeClass(Notice);
 
@@ -47,10 +48,11 @@ export default class ObsidianLiveSyncPlugin extends Plugin
     packageVersion = "";
     manifestVersion = "";
 
-    addOnPluginAndTheirSettings = new PluginAndTheirSettings(this);
+    // addOnPluginAndTheirSettings = new PluginAndTheirSettings(this);
     addOnHiddenFileSync = new HiddenFileSync(this);
     addOnSetup = new SetupLiveSync(this);
-    addOns = [this.addOnPluginAndTheirSettings, this.addOnHiddenFileSync, this.addOnSetup] as LiveSyncCommands[];
+    addOnConfigSync = new ConfigSync(this);
+    addOns = [this.addOnHiddenFileSync, this.addOnSetup, this.addOnConfigSync] as LiveSyncCommands[];
 
     periodicSyncProcessor = new PeriodicProcessor(this, async () => await this.replicate());
 
@@ -205,7 +207,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
 
     id2path(id: DocumentID, entry: EntryHasPath, stripPrefix?: boolean): FilePathWithPrefix {
         const tempId = id2path(id, entry);
-        if (stripPrefix && isIdOfInternalMetadata(tempId)) {
+        if (stripPrefix && isInternalMetadata(tempId)) {
             const out = stripInternalMetadataPrefix(tempId);
             return out;
         }
@@ -341,7 +343,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
     }
 
     async resolveConflicted(target: FilePathWithPrefix) {
-        if (isIdOfInternalMetadata(target)) {
+        if (isInternalMetadata(target)) {
             await this.addOnHiddenFileSync.resolveConflictOnInternalFile(target);
         } else if (isPluginMetadata(target)) {
             await this.resolveConflictByNewerEntry(target);
@@ -387,25 +389,13 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         try {
             if (this.isRedFlagRaised() || this.isRedFlag2Raised() || this.isRedFlag3Raised()) {
                 this.settings.batchSave = false;
-                this.settings.liveSync = false;
-                this.settings.periodicReplication = false;
-                this.settings.syncOnSave = false;
-                this.settings.syncOnStart = false;
-                this.settings.syncOnFileOpen = false;
-                this.settings.syncAfterMerge = false;
-                this.settings.autoSweepPlugins = false;
-                this.settings.usePluginSync = false;
+                this.addOnSetup.suspendAllSync();
+                this.addOnSetup.suspendExtraSync();
                 this.settings.suspendFileWatching = true;
-                this.settings.syncInternalFiles = false;
                 await this.saveSettings();
                 if (this.isRedFlag2Raised()) {
                     Logger(`${FLAGMD_REDFLAG2} has been detected! Self-hosted LiveSync suspends all sync and rebuild everything.`, LOG_LEVEL.NOTICE);
-                    await this.resetLocalDatabase();
-                    await this.initializeDatabase(true);
-                    await this.markRemoteLocked();
-                    await this.tryResetRemoteDatabase();
-                    await this.markRemoteLocked();
-                    await this.replicateAllToServer(true);
+                    await this.addOnSetup.rebuildEverything();
                     await this.deleteRedFlag2();
                     if (await askYesNo(this.app, "Do you want to disable Suspend file watching and restart obsidian now?") == "yes") {
                         this.settings.suspendFileWatching = false;
@@ -415,12 +405,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
                     }
                 } else if (this.isRedFlag3Raised()) {
                     Logger(`${FLAGMD_REDFLAG3} has been detected! Self-hosted LiveSync will discard the local database and fetch everything from the remote once again.`, LOG_LEVEL.NOTICE);
-                    await this.resetLocalDatabase();
-                    await delay(1000);
-                    await this.markRemoteResolved();
-                    await this.openDatabase();
-                    this.isReady = true;
-                    await this.replicateAllFromServer(true);
+                    await this.addOnSetup.fetchLocal();
                     await this.deleteRedFlag3();
                     if (await askYesNo(this.app, "Do you want to disable Suspend file watching and restart obsidian now?") == "yes") {
                         this.settings.suspendFileWatching = false;
@@ -912,10 +897,17 @@ export default class ObsidianLiveSyncPlugin extends Plugin
                 const file = queue.args.file;
                 const key = `file-last-proc-${queue.type}-${file.path}`;
                 const last = Number(await this.kvDB.get(key) || 0);
+                let mtime = file.mtime;
                 if (queue.type == "DELETE") {
                     await this.deleteFromDBbyPath(file.path);
+                    mtime = file.mtime - 1;
+                    const keyD1 = `file-last-proc-CREATE-${file.path}`;
+                    const keyD2 = `file-last-proc-CHANGED-${file.path}`;
+                    await this.kvDB.set(keyD1, mtime);
+                    await this.kvDB.set(keyD2, mtime);
                 } else if (queue.type == "INTERNAL") {
                     await this.addOnHiddenFileSync.watchVaultRawEventsAsync(file.path);
+                    await this.addOnConfigSync.watchVaultRawEventsAsync(file.path);
                 } else {
                     const targetFile = this.app.vault.getAbstractFileByPath(file.path);
                     if (!(targetFile instanceof TFile)) {
@@ -930,6 +922,8 @@ export default class ObsidianLiveSyncPlugin extends Plugin
 
                     const cache = queue.args.cache;
                     if (queue.type == "CREATE" || queue.type == "CHANGED") {
+                        const keyD1 = `file-last-proc-DELETED-${file.path}`;
+                        await this.kvDB.set(keyD1, mtime);
                         if (!await this.updateIntoDB(targetFile, false, cache)) {
                             Logger(`DB -> STORAGE: failed, cancel the relative operations: ${targetFile.path}`, LOG_LEVEL.INFO);
                             // cancel running queues and remove one of atomic operation
@@ -942,7 +936,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
                         await this.watchVaultRenameAsync(targetFile, queue.args.oldPath);
                     }
                 }
-                await this.kvDB.set(key, file.mtime);
+                await this.kvDB.set(key, mtime);
             } while (this.vaultManager.getQueueLength() > 0);
             return true;
         })
@@ -1114,13 +1108,16 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             // This occurs not only when files are deleted, but also when conflicts are resolved.
             // We have to check no other revisions are left.
             const lastDocs = await this.localDatabase.getDBEntry(path);
+            if (path != file.path) {
+                Logger(`delete skipped: ${file.path} :Not exactly matched`, LOG_LEVEL.VERBOSE);
+            }
             if (lastDocs === false) {
                 await this.deleteVaultItem(file);
             } else {
                 // it perhaps delete some revisions.
                 // may be we have to reload this
                 await this.pullFile(path, null, true);
-                Logger(`delete skipped:${lastDocs._id}`, LOG_LEVEL.VERBOSE);
+                Logger(`delete skipped:${file.path}`, LOG_LEVEL.VERBOSE);
             }
             return;
         }
@@ -1288,7 +1285,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             const now = new Date().getTime();
             if (queue.missingChildren.length == 0) {
                 queue.done = true;
-                if (isIdOfInternalMetadata(queue.entry._id)) {
+                if (isInternalMetadata(queue.entry._id)) {
                     //system file
                     const filename = this.getPathWithoutPrefix(queue.entry);
                     this.addOnHiddenFileSync.procInternalFile(filename);
@@ -1333,7 +1330,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         if (!this.isTargetFile(path)) return;
         const skipOldFile = this.settings.skipOlderFilesOnSync && false; //patched temporary.
         // Do not handle internal files if the feature has not been enabled.
-        if (isIdOfInternalMetadata(doc._id) && !this.settings.syncInternalFiles) return;
+        if (isInternalMetadata(doc._id) && !this.settings.syncInternalFiles) return;
         // It is better for your own safety, not to handle the following files
         const ignoreFiles = [
             "_design/replicate",
@@ -1341,11 +1338,11 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             FLAGMD_REDFLAG2,
             FLAGMD_REDFLAG3
         ];
-        if (!isIdOfInternalMetadata(doc._id) && ignoreFiles.contains(path)) {
+        if (!isInternalMetadata(doc._id) && ignoreFiles.contains(path)) {
             return;
 
         }
-        if ((!isIdOfInternalMetadata(doc._id)) && skipOldFile) {
+        if ((!isInternalMetadata(doc._id)) && skipOldFile) {
             const info = getAbstractFileByPath(stripAllPrefixes(path));
 
             if (info && info instanceof TFile) {
@@ -1353,7 +1350,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
                 const docMtime = ~~(doc.mtime / 1000);
                 //TODO: some margin required.
                 if (localMtime >= docMtime) {
-                    Logger(`${doc._id} Skipped, older than storage.`, LOG_LEVEL.VERBOSE);
+                    Logger(`${path} (${doc._id}, ${doc._rev}) Skipped, older than storage.`, LOG_LEVEL.VERBOSE);
                     return;
                 }
             }
@@ -1364,12 +1361,12 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             missingChildren: [] as string[],
             timeout: now + this.chunkWaitTimeout,
         };
-        // If `Read chunks online` is enabled, retrieve chunks from the remote CouchDB directly.
+        // If `Read chunks online` is disabled, chunks should be transferred before here.
+        // However, in some cases, chunks are after that. So, if missing chunks exist, we have to wait for them.
         if ((!this.settings.readChunksOnline) && "children" in doc) {
-            const c = await this.localDatabase.allDocsRaw<EntryDoc>({ keys: doc.children, include_docs: false });
-            const missing = c.rows.filter((e) => "error" in e).map((e) => e.key);
-            // fetch from remote
-            if (missing.length > 0) Logger(`${doc._id}(${doc._rev}) Queued (waiting ${missing.length} items)`, LOG_LEVEL.VERBOSE);
+            const c = await this.localDatabase.collectChunksWithCache(doc.children)
+            const missing = c.filter((e) => !e.chunk).map((e) => e.id);
+            if (missing.length > 0) Logger(`${path} (${doc._id}, ${doc._rev}) Queued (waiting ${missing.length} items)`, LOG_LEVEL.VERBOSE);
             newQueue.missingChildren = missing;
             this.queuedFiles.push(newQueue);
         } else {
@@ -1381,8 +1378,9 @@ export default class ObsidianLiveSyncPlugin extends Plugin
 
     //---> Sync
     async parseReplicationResult(docs: Array<PouchDB.Core.ExistingDocument<EntryDoc>>): Promise<void> {
+        const docsSorted = docs.sort((a, b) => b.mtime - a.mtime);
         L1:
-        for (const change of docs) {
+        for (const change of docsSorted) {
             for (const proc of this.addOns) {
                 if (await proc.parseReplicationResultItem(change)) {
                     continue L1;
@@ -1511,27 +1509,25 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         return;
     }
 
-    logHideTimer: NodeJS.Timeout = null;
     setStatusBarText(message: string = null, log: string = null) {
         if (!this.statusBar) return;
         const newMsg = typeof message == "string" ? message : this.lastMessage;
         const newLog = typeof log == "string" ? log : this.lastLog;
         if (`${this.lastMessage}-${this.lastLog}` != `${newMsg}-${newLog}`) {
-            this.statusBar.setText(newMsg.split("\n")[0]);
+            scheduleTask("update-display", 50, () => {
+                this.statusBar.setText(newMsg.split("\n")[0]);
 
-            if (this.settings.showStatusOnEditor) {
-                const root = activeDocument.documentElement;
-                const q = root.querySelectorAll(`.CodeMirror-wrap,.cm-s-obsidian>.cm-editor,.canvas-wrapper`);
-                q.forEach(e => e.setAttr("data-log", '' + (newMsg + "\n" + newLog) + ''))
-            } else {
-                const root = activeDocument.documentElement;
-                const q = root.querySelectorAll(`.CodeMirror-wrap,.cm-s-obsidian>.cm-editor,.canvas-wrapper`);
-                q.forEach(e => e.setAttr("data-log", ''))
-            }
-            if (this.logHideTimer != null) {
-                clearTimeout(this.logHideTimer);
-            }
-            this.logHideTimer = setTimeout(() => this.setStatusBarText(null, ""), 3000);
+                if (this.settings.showStatusOnEditor) {
+                    const root = activeDocument.documentElement;
+                    const q = root.querySelectorAll(`.CodeMirror-wrap,.cm-s-obsidian>.cm-editor,.canvas-wrapper`);
+                    q.forEach(e => e.setAttr("data-log", '' + (newMsg + "\n" + newLog) + ''))
+                } else {
+                    const root = activeDocument.documentElement;
+                    const q = root.querySelectorAll(`.CodeMirror-wrap,.cm-s-obsidian>.cm-editor,.canvas-wrapper`);
+                    q.forEach(e => e.setAttr("data-log", ''))
+                }
+            }, true);
+            scheduleTask("log-hide", 3000, () => this.setStatusBarText(null, ""));
             this.lastMessage = newMsg;
             this.lastLog = newLog;
         }
@@ -1547,7 +1543,43 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         await this.applyBatchChange();
         await Promise.all(this.addOns.map(e => e.beforeReplicate(showMessage)));
         await this.loadQueuedFiles();
-        return await this.replicator.openReplication(this.settings, false, showMessage);
+        const ret = await this.replicator.openReplication(this.settings, false, showMessage);
+        if (!ret) {
+            if (this.replicator.remoteLockedAndDeviceNotAccepted) {
+                if (this.replicator.remoteCleaned) {
+                    const message = `
+The remote database has been cleaned up.
+To synchronize, this device must also be cleaned up or fetch everything again once.
+Fetching may takes some time. Cleaning up is not stable yet but fast.
+`
+                    const CHOICE_CLEANUP = "Clean up";
+                    const CHOICE_FETCH = "Fetch again";
+                    const CHOICE_DISMISS = "Dismiss";
+                    const ret = await confirmWithMessage(this, "Locked", message, [CHOICE_CLEANUP, CHOICE_FETCH, CHOICE_DISMISS], CHOICE_DISMISS, 10);
+                    if (ret == CHOICE_CLEANUP) {
+                        await localDatabaseCleanUp(this, true, false);
+                        await balanceChunks(this, false);
+                    }
+                    if (ret == CHOICE_FETCH) {
+                        await performRebuildDB(this, "localOnly");
+                    }
+                } else {
+                    const message = `
+The remote database has been rebuilt.
+To synchronize, this device must fetch everything again once.
+Or if you are sure know what had been happened, we can unlock the database from the setting dialog.
+                    `
+                    const CHOICE_FETCH = "Fetch again";
+                    const CHOICE_DISMISS = "Dismiss";
+                    const ret = await confirmWithMessage(this, "Locked", message, [CHOICE_FETCH, CHOICE_DISMISS], CHOICE_DISMISS, 10);
+                    if (ret == CHOICE_FETCH) {
+                        await performRebuildDB(this, "localOnly");
+                    }
+                }
+            }
+        }
+
+        return ret;
     }
 
     async initializeDatabase(showingNotice?: boolean, reopenDatabase = true) {
@@ -1578,12 +1610,12 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         return await this.replicator.replicateAllFromServer(this.settings, showingNotice);
     }
 
-    async markRemoteLocked() {
-        return await this.replicator.markRemoteLocked(this.settings, true);
+    async markRemoteLocked(lockByClean?: boolean) {
+        return await this.replicator.markRemoteLocked(this.settings, true, lockByClean);
     }
 
     async markRemoteUnlocked() {
-        return await this.replicator.markRemoteLocked(this.settings, false);
+        return await this.replicator.markRemoteLocked(this.settings, false, false);
     }
 
     async markRemoteResolved() {
@@ -2043,74 +2075,70 @@ export default class ObsidianLiveSyncPlugin extends Plugin
     }
 
     showMergeDialog(filename: FilePathWithPrefix, conflictCheckResult: diff_result): Promise<boolean> {
-        return new Promise((res, rej) => {
-            Logger("open conflict dialog", LOG_LEVEL.VERBOSE);
-            new ConflictResolveModal(this.app, filename, conflictCheckResult, async (selected) => {
-                const testDoc = await this.localDatabase.getDBEntry(filename, { conflicts: true }, false, false, true);
-                if (testDoc === false) {
-                    Logger("Missing file..", LOG_LEVEL.VERBOSE);
-                    return res(true);
-                }
-                if (!testDoc._conflicts) {
-                    Logger("Nothing have to do with this conflict", LOG_LEVEL.VERBOSE);
-                    return res(true);
-                }
-                const toDelete = selected;
-                const toKeep = conflictCheckResult.left.rev != toDelete ? conflictCheckResult.left.rev : conflictCheckResult.right.rev;
-                if (toDelete == "") {
-                    // concat both,
-                    // delete conflicted revision and write a new file, store it again.
-                    const p = conflictCheckResult.diff.map((e) => e[1]).join("");
-                    await this.localDatabase.deleteDBEntry(filename, { rev: testDoc._conflicts[0] });
-                    const file = getAbstractFileByPath(stripAllPrefixes(filename)) as TFile;
-                    if (file) {
-                        await this.app.vault.modify(file, p);
-                        await this.updateIntoDB(file);
+        return runWithLock("resolve-conflict:" + filename, false, () =>
+            new Promise((res, rej) => {
+                Logger("open conflict dialog", LOG_LEVEL.VERBOSE);
+                new ConflictResolveModal(this.app, filename, conflictCheckResult, async (selected) => {
+                    const testDoc = await this.localDatabase.getDBEntry(filename, { conflicts: true }, false, false, true);
+                    if (testDoc === false) {
+                        Logger("Missing file..", LOG_LEVEL.VERBOSE);
+                        return res(true);
+                    }
+                    if (!testDoc._conflicts) {
+                        Logger("Nothing have to do with this conflict", LOG_LEVEL.VERBOSE);
+                        return res(true);
+                    }
+                    const toDelete = selected;
+                    const toKeep = conflictCheckResult.left.rev != toDelete ? conflictCheckResult.left.rev : conflictCheckResult.right.rev;
+                    if (toDelete == "") {
+                        // concat both,
+                        // delete conflicted revision and write a new file, store it again.
+                        const p = conflictCheckResult.diff.map((e) => e[1]).join("");
+                        await this.localDatabase.deleteDBEntry(filename, { rev: testDoc._conflicts[0] });
+                        const file = getAbstractFileByPath(stripAllPrefixes(filename)) as TFile;
+                        if (file) {
+                            await this.app.vault.modify(file, p);
+                            await this.updateIntoDB(file);
+                        } else {
+                            const newFile = await this.app.vault.create(filename, p);
+                            await this.updateIntoDB(newFile);
+                        }
+                        await this.pullFile(filename);
+                        Logger("concat both file");
+                        if (this.settings.syncAfterMerge && !this.suspended) {
+                            await this.replicate();
+                        }
+                        setTimeout(() => {
+                            //resolved, check again.
+                            this.showIfConflicted(filename);
+                        }, 500);
+                    } else if (toDelete == null) {
+                        Logger("Leave it still conflicted");
                     } else {
-                        const newFile = await this.app.vault.create(filename, p);
-                        await this.updateIntoDB(newFile);
+                        await this.localDatabase.deleteDBEntry(filename, { rev: toDelete });
+                        await this.pullFile(filename, null, true, toKeep);
+                        Logger(`Conflict resolved:${filename}`);
+                        if (this.settings.syncAfterMerge && !this.suspended) {
+                            await this.replicate();
+                        }
+                        setTimeout(() => {
+                            //resolved, check again.
+                            this.showIfConflicted(filename);
+                        }, 500);
                     }
-                    await this.pullFile(filename);
-                    Logger("concat both file");
-                    if (this.settings.syncAfterMerge && !this.suspended) {
-                        await this.replicate();
-                    }
-                    setTimeout(() => {
-                        //resolved, check again.
-                        this.showIfConflicted(filename);
-                    }, 500);
-                } else if (toDelete == null) {
-                    Logger("Leave it still conflicted");
-                } else {
-                    await this.localDatabase.deleteDBEntry(filename, { rev: toDelete });
-                    await this.pullFile(filename, null, true, toKeep);
-                    Logger(`Conflict resolved:${filename}`);
-                    if (this.settings.syncAfterMerge && !this.suspended) {
-                        await this.replicate();
-                    }
-                    setTimeout(() => {
-                        //resolved, check again.
-                        this.showIfConflicted(filename);
-                    }, 500);
-                }
 
-                return res(true);
-            }).open();
-        });
+                    return res(true);
+                }).open();
+            })
+        );
     }
     conflictedCheckFiles: FilePath[] = [];
 
     // queueing the conflicted file check
-    conflictedCheckTimer: number;
-
     queueConflictedCheck(file: TFile) {
         this.conflictedCheckFiles = this.conflictedCheckFiles.filter((e) => e != file.path);
         this.conflictedCheckFiles.push(getPathFromTFile(file));
-        if (this.conflictedCheckTimer != null) {
-            window.clearTimeout(this.conflictedCheckTimer);
-        }
-        this.conflictedCheckTimer = window.setTimeout(async () => {
-            this.conflictedCheckTimer = null;
+        scheduleTask("check-conflict", 100, async () => {
             const checkFiles = JSON.parse(JSON.stringify(this.conflictedCheckFiles)) as FilePath[];
             for (const filename of checkFiles) {
                 try {
@@ -2122,7 +2150,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
                     Logger(ex);
                 }
             }
-        }, 100);
+        });
     }
 
     async showIfConflicted(filename: FilePathWithPrefix) {
@@ -2193,7 +2221,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         const dK = `${file.path}-diff`;
         const isLastDiff = dK in caches ? caches[dK] : { storageMtime: 0, docMtime: 0 };
         if (isLastDiff.docMtime == docMtime && isLastDiff.storageMtime == storageMtime) {
-            Logger("STORAGE .. DB :" + file.path, LOG_LEVEL.VERBOSE);
+            // Logger("STORAGE .. DB :" + file.path, LOG_LEVEL.VERBOSE);
             caches[dK] = { storageMtime, docMtime };
             return caches;
         }

src/types.ts

@@ -62,13 +62,21 @@ export type FileEventItem = {
     key: string,
 }
 
+// Hidden items (Now means `chunk`)
 export const CHeader = "h:";
+
+// Plug-in Stored Container (Obsolete)
 export const PSCHeader = "ps:";
 export const PSCHeaderEnd = "ps;";
+
+// Internal data Container
 export const ICHeader = "i:";
 export const ICHeaderEnd = "i;";
 export const ICHeaderLength = ICHeader.length;
 
+// Internal data Container (eXtended)
+export const ICXHeader = "ix:";
+
 export const FileWatchEventQueueMax = 10;
 export const configURIBase = "obsidian://setuplivesync?settings=";
 

src/utils.ts

@@ -1,10 +1,12 @@
-import { DataWriteOptions, normalizePath, TFile, Platform, TAbstractFile, App, Plugin_2 } from "./deps";
+import { DataWriteOptions, normalizePath, TFile, Platform, TAbstractFile, App, Plugin_2, RequestUrlParam, requestUrl } from "./deps";
 import { path2id_base, id2path_base, isValidFilenameInLinux, isValidFilenameInDarwin, isValidFilenameInWidows, isValidFilenameInAndroid, stripAllPrefixes } from "./lib/src/path";
 
 import { Logger } from "./lib/src/logger";
-import { AnyEntry, DocumentID, EntryHasPath, FilePath, FilePathWithPrefix, LOG_LEVEL } from "./lib/src/types";
+import { AnyEntry, DocumentID, EntryDoc, EntryHasPath, FilePath, FilePathWithPrefix, LOG_LEVEL, NewEntry } from "./lib/src/types";
 import { CHeader, ICHeader, ICHeaderLength, PSCHeader } from "./types";
 import { InputStringDialog, PopoverSelectString } from "./dialogs";
+import ObsidianLiveSyncPlugin from "./main";
+import { runWithLock } from "./lib/src/lock";
 
 // For backward compatibility, using the path for determining id.
 // Only CouchDB unacceptable ID (that starts with an underscore) has been prefixed with "/".
@@ -42,7 +44,10 @@ export function getPathFromTFile(file: TAbstractFile) {
 }
 
 const tasks: { [key: string]: ReturnType<typeof setTimeout> } = {};
-export function scheduleTask(key: string, timeout: number, proc: (() => Promise<any> | void)) {
+export function scheduleTask(key: string, timeout: number, proc: (() => Promise<any> | void), skipIfTaskExist?: boolean) {
+    if (skipIfTaskExist && key in tasks) {
+        return;
+    }
     cancelTask(key);
     tasks[key] = setTimeout(async () => {
         delete tasks[key];
@@ -232,8 +237,8 @@ export function applyPatch(from: Record<string | number | symbol, any>, patch: R
 }
 
 export function mergeObject(
-    objA: Record<string | number | symbol, any>,
-    objB: Record<string | number | symbol, any>
+    objA: Record<string | number | symbol, any> | [any],
+    objB: Record<string | number | symbol, any> | [any]
 ) {
     const newEntries = Object.entries(objB);
     const ret: any = { ...objA };
@@ -276,6 +281,11 @@ export function mergeObject(
             ret[key] = v;
         }
     }
+    if (Array.isArray(objA) && Array.isArray(objB)) {
+        return Object.values(Object.entries(ret)
+            .sort()
+            .reduce((p, [key, value]) => ({ ...p, [key]: value }), {}));
+    }
     return Object.entries(ret)
         .sort()
         .reduce((p, [key, value]) => ({ ...p, [key]: value }), {});
@@ -325,14 +335,16 @@ export function isValidPath(filename: string) {
 let touchedFiles: string[] = [];
 
 export function getAbstractFileByPath(path: FilePath): TAbstractFile | null {
-    // Hidden API but so useful.
-    // @ts-ignore
-    if ("getAbstractFileByPathInsensitive" in app.vault && (app.vault.adapter?.insensitive ?? false)) {
-        // @ts-ignore
-        return app.vault.getAbstractFileByPathInsensitive(path);
-    } else {
-        return app.vault.getAbstractFileByPath(path);
-    }
+    // Disabled temporary.
+    return app.vault.getAbstractFileByPath(path);
+    // // Hidden API but so useful.
+    // // @ts-ignore
+    // if ("getAbstractFileByPathInsensitive" in app.vault && (app.vault.adapter?.insensitive ?? false)) {
+    //     // @ts-ignore
+    //     return app.vault.getAbstractFileByPathInsensitive(path);
+    // } else {
+    //    return app.vault.getAbstractFileByPath(path);
+    // }
 }
 export function trimPrefix(target: string, prefix: string) {
     return target.startsWith(prefix) ? target.substring(prefix.length) : target;
@@ -358,7 +370,7 @@ export function clearTouched() {
  * @param id ID
  * @returns 
  */
-export function isIdOfInternalMetadata(id: FilePath | FilePathWithPrefix | DocumentID): boolean {
+export function isInternalMetadata(id: FilePath | FilePathWithPrefix | DocumentID): boolean {
     return id.startsWith(ICHeader);
 }
 export function stripInternalMetadataPrefix<T extends FilePath | FilePathWithPrefix | DocumentID>(id: T): T {
@@ -426,3 +438,303 @@ export class PeriodicProcessor {
         if (this._timer) clearInterval(this._timer);
     }
 }
+
+function sizeToHumanReadable(size: number | undefined) {
+    if (!size) return "-";
+    const i = Math.floor(Math.log(size) / Math.log(1024));
+    return Number.parseInt((size / Math.pow(1024, i)).toFixed(2)) + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i];
+}
+
+export const _requestToCouchDBFetch = async (baseUri: string, username: string, password: string, path?: string, body?: string | any, method?: string) => {
+    const utf8str = String.fromCharCode.apply(null, new TextEncoder().encode(`${username}:${password}`));
+    const encoded = window.btoa(utf8str);
+    const authHeader = "Basic " + encoded;
+    const transformedHeaders: Record<string, string> = { authorization: authHeader, "content-type": "application/json" };
+    const uri = `${baseUri}/${path}`;
+    const requestParam = {
+        url: uri,
+        method: method || (body ? "PUT" : "GET"),
+        headers: new Headers(transformedHeaders),
+        contentType: "application/json",
+        body: JSON.stringify(body),
+    };
+    return await fetch(uri, requestParam);
+}
+
+export const _requestToCouchDB = async (baseUri: string, username: string, password: string, origin: string, path?: string, body?: any, method?: string) => {
+    const utf8str = String.fromCharCode.apply(null, new TextEncoder().encode(`${username}:${password}`));
+    const encoded = window.btoa(utf8str);
+    const authHeader = "Basic " + encoded;
+    const transformedHeaders: Record<string, string> = { authorization: authHeader, origin: origin };
+    const uri = `${baseUri}/${path}`;
+    const requestParam: RequestUrlParam = {
+        url: uri,
+        method: method || (body ? "PUT" : "GET"),
+        headers: transformedHeaders,
+        contentType: "application/json",
+        body: body ? JSON.stringify(body) : undefined,
+    };
+    return await requestUrl(requestParam);
+}
+export const requestToCouchDB = async (baseUri: string, username: string, password: string, origin: string, key?: string, body?: string, method?: string) => {
+    const uri = `_node/_local/_config${key ? "/" + key : ""}`;
+    return await _requestToCouchDB(baseUri, username, password, origin, uri, body, method);
+};
+
+export async function performRebuildDB(plugin: ObsidianLiveSyncPlugin, method: "localOnly" | "remoteOnly" | "rebuildBothByThisDevice") {
+    if (method == "localOnly") {
+        await plugin.addOnSetup.fetchLocal();
+    }
+    if (method == "remoteOnly") {
+        await plugin.addOnSetup.rebuildRemote();
+    }
+    if (method == "rebuildBothByThisDevice") {
+        await plugin.addOnSetup.rebuildEverything();
+    }
+}
+
+export const gatherChunkUsage = async (db: PouchDB.Database<EntryDoc>) => {
+    const used = new Map();
+    const unreferenced = new Map();
+    const removed = new Map();
+    const missing = new Map();
+    const xx = await db.allDocs({ startkey: "h:", endkey: `h:\u{10ffff}` });
+    for (const xxd of xx.rows) {
+        const chunk = xxd.id
+        unreferenced.set(chunk, xxd.value.rev);
+    }
+
+    const x = await db.find({ limit: 999999999, selector: { children: { $exists: true, $type: "array" } }, fields: ["_id", "path", "mtime", "children"] });
+    for (const temp of x.docs) {
+        for (const chunk of (temp as NewEntry).children) {
+            used.set(chunk, (used.has(chunk) ? used.get(chunk) : 0) + 1);
+            if (unreferenced.has(chunk)) {
+                removed.set(chunk, unreferenced.get(chunk));
+                unreferenced.delete(chunk);
+            } else {
+                if (!removed.has(chunk)) {
+                    if (!missing.has(temp._id)) {
+                        missing.set(temp._id, []);
+                    }
+                    missing.get(temp._id).push(chunk);
+                }
+            }
+        }
+    }
+
+    return { used, unreferenced, missing };
+}
+
+export const localDatabaseCleanUp = async (plugin: ObsidianLiveSyncPlugin, force: boolean, dryRun: boolean) => {
+
+    await runWithLock("clean-up:local", true, async () => {
+        const db = plugin.localDatabase.localDatabase;
+        if ((db as any)?.adapter != "indexeddb") {
+            if (force && !dryRun) {
+                Logger("Fetch from the remote database", LOG_LEVEL.NOTICE, "clean-up-db");
+                await performRebuildDB(plugin, "localOnly");
+                return;
+            } else {
+                Logger("This feature requires enabling `Use new adapter`. Please enable it", LOG_LEVEL.NOTICE, "clean-up-db");
+                return;
+            }
+        }
+        Logger(`The remote database has been locked for garbage collection`, LOG_LEVEL.NOTICE, "clean-up-db");
+        Logger(`Gathering chunk usage information`, LOG_LEVEL.NOTICE, "clean-up-db");
+
+        const { unreferenced, missing } = await gatherChunkUsage(db);
+        if (missing.size != 0) {
+            Logger(`Some chunks are not found! We have to rescue`, LOG_LEVEL.NOTICE);
+            Logger(missing, LOG_LEVEL.VERBOSE);
+        } else {
+            Logger(`All chunks are OK`, LOG_LEVEL.NOTICE);
+        }
+        const payload = {} as Record<string, string[]>;
+        for (const [id, rev] of unreferenced) {
+            payload[id] = [rev];
+        }
+        const removeItems = Object.keys(payload).length;
+        if (removeItems == 0) {
+            Logger(`No unreferenced chunks found (Local)`, LOG_LEVEL.NOTICE);
+            await plugin.markRemoteResolved();
+        }
+        if (dryRun) {
+            Logger(`There are ${removeItems} unreferenced chunks (Local)`, LOG_LEVEL.NOTICE);
+            return;
+        }
+        Logger(`Deleting unreferenced chunks: ${removeItems}`, LOG_LEVEL.NOTICE, "clean-up-db");
+        for (const [id, rev] of unreferenced) {
+            //@ts-ignore
+            const ret = await db.purge(id, rev);
+            Logger(ret, LOG_LEVEL.VERBOSE);
+        }
+        plugin.localDatabase.refreshSettings();
+        Logger(`Compacting local database...`, LOG_LEVEL.NOTICE, "clean-up-db");
+        await db.compact();
+        await plugin.markRemoteResolved();
+        Logger("Done!", LOG_LEVEL.NOTICE, "clean-up-db");
+    })
+}
+
+
+export const balanceChunks = async (plugin: ObsidianLiveSyncPlugin, dryRun: boolean) => {
+
+    await runWithLock("clean-up:balance", true, async () => {
+        const localDB = plugin.localDatabase.localDatabase;
+        Logger(`Gathering chunk usage information`, LOG_LEVEL.NOTICE, "clean-up-db");
+
+        const ret = await plugin.replicator.connectRemoteCouchDBWithSetting(plugin.settings, plugin.isMobile);
+        if (typeof ret === "string") {
+            Logger(`Connect error: ${ret}`, LOG_LEVEL.NOTICE, "clean-up-db");
+            return;
+        }
+        const localChunks = new Map<string, string>();
+        const xx = await localDB.allDocs({ startkey: "h:", endkey: `h:\u{10ffff}` });
+        for (const xxd of xx.rows) {
+            const chunk = xxd.id
+            localChunks.set(chunk, xxd.value.rev);
+        }
+        // const info = ret.info;
+        const remoteDB = ret.db;
+        const remoteChunks = new Map<string, string>();
+        const xxr = await remoteDB.allDocs({ startkey: "h:", endkey: `h:\u{10ffff}` });
+        for (const xxd of xxr.rows) {
+            const chunk = xxd.id
+            remoteChunks.set(chunk, xxd.value.rev);
+        }
+        const localToRemote = new Map<string, string>([...localChunks]);
+        const remoteToLocal = new Map<string, string>([...remoteChunks]);
+        for (const id of new Set([...localChunks.keys(), ...remoteChunks.keys()])) {
+            if (remoteChunks.has(id)) {
+                localToRemote.delete(id);
+            }
+            if (localChunks.has(id)) {
+                remoteToLocal.delete(id);
+            }
+        }
+
+        function arrayToChunkedArray<T>(src: T[], size = 25) {
+            const ret = [] as T[][];
+            let i = 0;
+            while (i < src.length) {
+                ret.push(src.slice(i, i += size));
+            }
+            return ret;
+        }
+
+        if (localToRemote.size == 0) {
+            Logger(`No chunks need to be sent`, LOG_LEVEL.NOTICE);
+        } else {
+            Logger(`${localToRemote.size} chunks need to be sent`, LOG_LEVEL.NOTICE);
+            if (!dryRun) {
+                const w = arrayToChunkedArray([...localToRemote]);
+                for (const chunk of w) {
+                    for (const [id,] of chunk) {
+                        const queryRet = await localDB.allDocs({ keys: [id], include_docs: true });
+                        const docs = queryRet.rows.filter(e => !("error" in e)).map(x => x.doc);
+
+                        const ret = await remoteDB.bulkDocs(docs, { new_edits: false });
+                        Logger(ret, LOG_LEVEL.VERBOSE);
+                    }
+                }
+                Logger(`Done! ${remoteToLocal.size} chunks have been sent`, LOG_LEVEL.NOTICE);
+            }
+        }
+        if (remoteToLocal.size == 0) {
+            Logger(`No chunks need to be retrieved`, LOG_LEVEL.NOTICE);
+        } else {
+            Logger(`${remoteToLocal.size} chunks need to be retrieved`, LOG_LEVEL.NOTICE);
+            if (!dryRun) {
+                const w = arrayToChunkedArray([...remoteToLocal]);
+                for (const chunk of w) {
+                    for (const [id,] of chunk) {
+                        const queryRet = await remoteDB.allDocs({ keys: [id], include_docs: true });
+                        const docs = queryRet.rows.filter(e => !("error" in e)).map(x => x.doc);
+
+                        const ret = await localDB.bulkDocs(docs, { new_edits: false });
+                        Logger(ret, LOG_LEVEL.VERBOSE);
+                    }
+                }
+                Logger(`Done! ${remoteToLocal.size} chunks have been retrieved`, LOG_LEVEL.NOTICE);
+            }
+        }
+    })
+}
+
+export const remoteDatabaseCleanup = async (plugin: ObsidianLiveSyncPlugin, dryRun: boolean) => {
+    const getSize = function (info: PouchDB.Core.DatabaseInfo, key: "active" | "external" | "file") {
+        return Number.parseInt((info as any)?.sizes?.[key] ?? 0);
+    }
+    await runWithLock("clean-up:remote", true, async () => {
+        const CHUNK_SIZE = 100;
+        function makeChunkedArrayFromArray<T>(items: T[]): T[][] {
+            const chunked = [];
+            for (let i = 0; i < items.length; i += CHUNK_SIZE) {
+                chunked.push(items.slice(i, i + CHUNK_SIZE));
+            }
+            return chunked;
+        }
+        try {
+            const ret = await plugin.replicator.connectRemoteCouchDBWithSetting(plugin.settings, plugin.isMobile);
+            if (typeof ret === "string") {
+                Logger(`Connect error: ${ret}`, LOG_LEVEL.NOTICE, "clean-up-db");
+                return;
+            }
+            const info = ret.info;
+            Logger(JSON.stringify(info), LOG_LEVEL.VERBOSE, "clean-up-db");
+            Logger(`Database active-size: ${sizeToHumanReadable(getSize(info, "active"))}, external-size:${sizeToHumanReadable(getSize(info, "external"))}, file-size: ${sizeToHumanReadable(getSize(info, "file"))}`, LOG_LEVEL.NOTICE);
+
+            if (!dryRun) {
+                Logger(`The remote database has been locked for garbage collection`, LOG_LEVEL.NOTICE, "clean-up-db");
+                await plugin.markRemoteLocked(true);
+            }
+            Logger(`Gathering chunk usage information`, LOG_LEVEL.NOTICE, "clean-up-db");
+            const db = ret.db;
+
+            const { unreferenced, missing } = await gatherChunkUsage(db);
+            if (missing.size != 0) {
+                Logger(`Some chunks are not found! We have to rescue`, LOG_LEVEL.NOTICE);
+                Logger(missing, LOG_LEVEL.VERBOSE);
+            } else {
+                Logger(`All chunks are OK`, LOG_LEVEL.NOTICE);
+            }
+            const payload = {} as Record<string, string[]>;
+            for (const [id, rev] of unreferenced) {
+                payload[id] = [rev];
+            }
+            const removeItems = Object.keys(payload).length;
+            if (removeItems == 0) {
+                Logger(`No unreferenced chunk found (Remote)`, LOG_LEVEL.NOTICE);
+                return;
+            }
+            if (dryRun) {
+                Logger(`There are ${removeItems} unreferenced chunks (Remote)`, LOG_LEVEL.NOTICE);
+                return;
+            }
+            Logger(`Deleting unreferenced chunks: ${removeItems}`, LOG_LEVEL.NOTICE, "clean-up-db");
+            const buffer = makeChunkedArrayFromArray(Object.entries(payload));
+            for (const chunkedPayload of buffer) {
+                const rets = await _requestToCouchDBFetch(
+                    `${plugin.settings.couchDB_URI}/${plugin.settings.couchDB_DBNAME}`,
+                    plugin.settings.couchDB_USER,
+                    plugin.settings.couchDB_PASSWORD,
+                    "_purge",
+                    chunkedPayload.reduce((p, c) => ({ ...p, [c[0]]: c[1] }), {}), "POST");
+                // const result = await rets();
+                Logger(JSON.stringify(await rets.json()), LOG_LEVEL.VERBOSE);
+            }
+            Logger(`Compacting database...`, LOG_LEVEL.NOTICE, "clean-up-db");
+            await db.compact();
+            const endInfo = await db.info();
+
+            Logger(`Processed database active-size: ${sizeToHumanReadable(getSize(endInfo, "active"))}, external-size:${sizeToHumanReadable(getSize(endInfo, "external"))}, file-size: ${sizeToHumanReadable(getSize(endInfo, "file"))}`, LOG_LEVEL.NOTICE);
+            Logger(`Reduced sizes: active-size: ${sizeToHumanReadable(getSize(info, "active") - getSize(endInfo, "active"))}, external-size:${sizeToHumanReadable(getSize(info, "external") - getSize(endInfo, "external"))}, file-size: ${sizeToHumanReadable(getSize(info, "file") - getSize(endInfo, "file"))}`, LOG_LEVEL.NOTICE);
+            Logger(JSON.stringify(endInfo), LOG_LEVEL.VERBOSE, "clean-up-db");
+            Logger(`Local database cleaning up...`);
+            await localDatabaseCleanUp(plugin, true, false);
+        } catch (ex) {
+            Logger("Failed to clean up db.")
+            Logger(ex, LOG_LEVEL.VERBOSE);
+        }
+    });
+}

updates.md

@@ -1,43 +1,31 @@
-### 0.18.0
+### 0.19.0
 
-#### Now, paths of files in the database can now be obfuscated. (Experimental Feature)
-At before v0.18.0, Self-hosted LiveSync used the path of files, to detect and resolve conflicts. In naive. The ID of the document stored in the CouchDB was naturally the filename.
-However, it means a sort of lacking confidentiality. If the credentials of the database have been leaked, the attacker (or an innocent bystander) can read the path of files. So we could not use confidential things in the filename in some environments.
-Since v0.18.0, they can be obfuscated. so it is no longer possible to decipher the path from the ID. Instead of that, it costs a bit CPU load than before, and the data structure has been changed a bit.
+#### Customization sync
 
-We can configure the `Path Obfuscation` in the `Remote database configuration` pane.  
-Note: **When changing this configuration, we need to rebuild both of the local and the remote databases**.
+Since `Plugin and their settings` have been broken, so I tried to fix it, not just fix it, but fix it the way it should be.
 
-### 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.
+Now, we have `Customization sync`.
 
-  - Improved:
-    - Splitting markdown
-    - Saving chunks
+It is a real shame that the compatibility between these features has been broken. However, this new feature is surely useful and I believe that worth getting over the pain.
+We can use the new feature with the same configuration. Only the menu on the command palette has been changed. The dialog can be opened by `Show customization sync dialog`.
+
+I hope you will give it a try.
 
-  - Changed:
-    - Chunk ID numbering rules
 
 #### Minors
-- __0.17.1 to 0.17.30 has been moved into `update_old.md`__
-- 0.17.31
+
+- 0.19.1
+  - Fixed: Fixed hidden file handling on Linux
+  - Improved: Now customization sync works more smoothly.
+- 0.19.2
   - Fixed:
-    - Now `redflag3` can be run surely.
-    - Synchronisation can now be aborted.
-  - Note: The synchronisation flow has been rewritten drastically. Please do not haste to inform me if you have noticed anything.
-- 0.17.32
-  - Fixed:
-    - Now periodic internal file scanning works well.
-    - The handler of Window-visibility-changed has been fixed.
-    - And minor fixes possibly included.
-  - Refactored:
-    - Unused logic has been removed.
-    - Some utility functions have been moved into suitable files.
-    - Function names have been renamed.
-- 0.17.33
-  - Maintenance update: Refactored; the responsibilities that `LocalDatabase` had were shared. (Hoping) No changes in behaviour.
-- 0.17.34
-  - Fixed: The `Fetch` that was broken at 0.17.33 has been fixed.
-  - Refactored again: Internal file sync, plug-in sync and Set up URI have been moved into each file.
-... To continue on to `updates_old.md`.
+    - Fixed garbage collection error while unreferenced chunks exist many.
+    - Fixed filename validation on Linux.
+  - Improved:
+    - Showing status is now thinned for performance.
+    - Enhance caching while collecting chunks.
+- 0.19.3
+  - Improved:
+    - Now replication will be paced by collecting chunks. If synchronisation has been deadlocked, please enable `Do not pace synchronization` once.
+
+... To continue on to `updates_old.md`.

updates_old.md

@@ -1,3 +1,46 @@
+
+### 0.18.0
+
+#### Now, paths of files in the database can now be obfuscated. (Experimental Feature)
+At before v0.18.0, Self-hosted LiveSync used the path of files, to detect and resolve conflicts. In naive. The ID of the document stored in the CouchDB was naturally the filename.
+However, it means a sort of lacking confidentiality. If the credentials of the database have been leaked, the attacker (or an innocent bystander) can read the path of files. So we could not use confidential things in the filename in some environments.
+Since v0.18.0, they can be obfuscated. so it is no longer possible to decipher the path from the ID. Instead of that, it costs a bit CPU load than before, and the data structure has been changed a bit.
+
+We can configure the `Path Obfuscation` in the `Remote database configuration` pane.  
+Note: **When changing this configuration, we need to rebuild both of the local and the remote databases**.
+
+#### Minors 
+- 0.18.1
+  - Fixed:
+    - Some messages are fixed (Typo)
+    - File type detection now works fine!
+- 0.18.2
+  - Improved:
+    - The setting pane has been refined.
+    - We can enable `hidden files sync` with several initial behaviours; `Merge`, `Fetch` remote, and `Overwrite` remote.
+    - No longer `Touch hidden files`.
+- 0.18.3
+  - Fixed Pop-up is now correctly shown after hidden file synchronisation.
+- 0.18.4
+  - Fixed:
+      - `Fetch` and `Rebuild database` will work more safely.
+      - Case-sensitive renaming now works fine.
+        Revoked the logic which was made at #130, however, looks fine now.
+- 0.18.5
+  - Improved:
+    - Actions for maintaining databases moved to the `🎛️Maintain databases`.
+    - Clean-up of unreferenced chunks has been implemented on an **experimental**.
+      - This feature requires enabling `Use new adapter`.
+      - Be sure to fully all devices synchronised before perform it.
+      - After cleaning up the remote, all devices will be locked out. If we are sure had it be synchronised, we can perform only cleaning-up locally. If not, we have to perform `Fetch`.
+
+- 0.18.6
+  - New features:
+    - Now remote database cleaning-up will be detected automatically.
+    - A solution selection dialogue will be shown if synchronisation is rejected after cleaning or rebuilding the remote database.
+    - During fetching or rebuilding, we can configure `Hidden file synchronisation` on the spot.
+      - It let us free from conflict resolution on initial synchronising.
+
 ### 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.
@@ -155,6 +198,26 @@
     - Fixed a problem about reading chunks online when a file has more chunks than the concurrency limit.
   - Rollbacked:
     - Logs are kept only for 100 lines, again.
+- 0.17.31
+  - Fixed:
+    - Now `redflag3` can be run surely.
+    - Synchronisation can now be aborted.
+  - Note: The synchronisation flow has been rewritten drastically. Please do not haste to inform me if you have noticed anything.
+- 0.17.32
+  - Fixed:
+    - Now periodic internal file scanning works well.
+    - The handler of Window-visibility-changed has been fixed.
+    - And minor fixes possibly included.
+  - Refactored:
+    - Unused logic has been removed.
+    - Some utility functions have been moved into suitable files.
+    - Function names have been renamed.
+- 0.17.33
+  - Maintenance update: Refactored; the responsibilities that `LocalDatabase` had were shared. (Hoping) No changes in behaviour.
+- 0.17.34
+  - Fixed: The `Fetch` that was broken at 0.17.33 has been fixed.
+  - Refactored again: Internal file sync, plug-in sync and Set up URI have been moved into each file.
+
 ### 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`.