bump

- We can delete all data of customization sync from the `Delete all customization sync data` on the `Hatch` pane.
Fixed:
- Prevent keep restarting on iOS by yielding microtasks.

docs/quick_setup.md

@@ -1,4 +1,7 @@
 # Quick setup
+
+[Japanese docs](./quick_setup_ja.md) - [Chinese docs](./quick_setup_cn.md).
+
 The plugin has so many configuration options to deal with different circumstances. However, there are not so many settings that are actually used. Therefore, `The Setup wizard` has been implemented to simplify the initial setup.
 
 Note: Subsequent devices are recommended to be set up using the `Copy setup URI` and `Open setup URI`.

docs/quick_setup_cn.md

@@ -0,0 +1,93 @@
+# 快速配置 (Quick setup)
+
+该插件有较多配置项, 可以应对不同的情况. 不过, 实际使用的设置并不多. 因此, 我们采用了 "设置向导 (The Setup wizard)" 来简化初始设置.
+
+Note: 建议使用 `Copy setup URI` and `Open setup URI` 来设置后续设备.
+
+## 设置向导 (The Setup wizard)
+
+在设置对话框中打开 `🧙‍♂️ Setup wizard`. 如果之前未配置插件, 则会自动打开该页面.
+
+![quick_setup_1](../images/quick_setup_1.png)
+
+- 放弃现有配置并进行设置  
+如果您先前有过任何设置, 此按钮允许您在设置前放弃所有更改.
+
+- 保留现有配置和设置  
+快速重新配置. 请注意, 在向导模式下, 您无法看到所有已经配置过的配置项.
+
+在上述选项中按下 `Next`, 配置对话框将进入向导模式 (wizard mode).
+
+### 向导模式 (Wizard mode)
+
+![quick_setup_2](../images/quick_setup_2.png)
+
+接下来将介绍如何逐步使用向导模式.
+
+## 配置远程数据库
+
+### 开始配置远程数据库
+
+输入已部署好的数据库的信息.  
+
+![quick_setup_3](../images/quick_setup_3.png)
+
+#### 测试数据库连接并检查数据库配置
+
+我们可以检查数据库的连接性和数据库设置.
+
+![quick_setup_5](../images/quick_setup_5.png)
+
+#### 测试数据库连接
+
+检查是否能成功连接数据库. 如果连接失败, 可能是多种原因导致的, 但请先点击 `Check database configuration` 来检查数据库配置是否有问题.
+
+#### 检查数据库配置
+
+检查数据库设置并修复问题.
+
+![quick_setup_6](../images/quick_setup_6.png)
+
+Config check 的显示内容可能因不同连接而异. 在上图情况下, 按下所有三个修复按钮.
+如果修复按钮消失, 全部变为复选标记, 则表示修复完成.
+
+### 加密配置
+
+![quick_setup_4](../images/quick_setup_4.png)
+
+为您的数据库加密, 以防数据库意外曝光; 启用端到端加密后, 笔记内容在离开设备时就会被加密. 我们强烈建议启用该功能. `路径混淆 (Path Obfuscation)` 还能混淆文件名. 现已稳定并推荐使用.
+加密基于 256 位 AES-GCM.
+如果你在一个封闭的网络中, 而且很明显第三方不会访问你的文件, 则可以禁用这些设置.
+
+![quick_setup_7](../images/quick_setup_7.png)
+
+#### Next
+
+转到同步设置.
+
+#### 放弃现有数据库并继续
+
+清除远程数据库的内容, 然后转到同步设置.
+
+### 同步设置
+
+最后, 选择一个同步预设完成向导.
+
+![quick_setup_9_1](../images/quick_setup_9_1.png)
+
+选择我们要使用的任何同步方法, 然后 `Apply` 初始化并按要求建立本地和远程数据库. 如果显示 `All done!`, 我们就完成了. `Copy setup URI` 将自动打开，并要求我们输入密码以加密 `Setup URI`.
+
+![quick_setup_10](../images/quick_setup_10.png)
+
+根据需要设置密码。.
+设置 URI (Setup URI) 将被复制到剪贴板, 然后您可以通过某种方式将其传输到第二个及后续设备.
+
+## 如何设置第二单元和后续单元 (the second and subsequent units)
+
+在第一台设备上安装 Self-hosted LiveSync 后, 从命令面板上选择 `Open setup URI`, 然后输入您传输的设置 URI (Setup URI). 然后输入密码，安装向导就会打开.
+在弹窗中选择以下内容.
+
+- `Importing LiveSync's conf, OK?` 选择 `Yes`
+- `How would you like to set it up?`. 选择 `Set it up as secondary or subsequent device`
+
+然后, 配置将生效并开始复制. 您的文件很快就会同步! 您可能需要关闭设置对话框并重新打开, 才能看到设置字段正确填充, 但它们都将设置好.

esbuild.config.mjs

@@ -48,7 +48,9 @@ const terserOpt = {
         lhs_constants: true,
         hoist_props: true,
         side_effects: true,
-        // if_return: true,
+        if_return: true,
+        ecma: 2018,
+        unused: true,
     },
     // mangle: {
     //     // mangle options

manifest.json

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

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.19.19",
+    "version": "0.20.2",
     "description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "main": "main.js",
     "type": "module",

src/CmdConfigSync.ts

@@ -1,14 +1,14 @@
 import { writable } from 'svelte/store';
-import { Notice, type PluginManifest, parseYaml } from "./deps";
+import { Notice, type PluginManifest, parseYaml, normalizePath } from "./deps";
 
 import type { EntryDoc, LoadedEntry, InternalFileEntry, FilePathWithPrefix, FilePath, DocumentID, AnyEntry } from "./lib/src/types";
-import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "./lib/src/types";
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, MODE_SELECTIVE } 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 { WrappedNotice } from "./lib/src/wrapper";
-import { base64ToArrayBuffer, arrayBufferToBase64, readString, crc32CKHash } from "./lib/src/strbin";
-import { runWithLock } from "./lib/src/lock";
+import { readString, crc32CKHash, decodeBinary, encodeBinary } from "./lib/src/strbin";
+import { serialized } from "./lib/src/lock";
 import { LiveSyncCommands } from "./LiveSyncCommands";
 import { stripAllPrefixes } from "./lib/src/path";
 import { PeriodicProcessor, askYesNo, disposeMemoObject, memoIfNotExist, memoObject, retrieveMemoObject, scheduleTask } from "./utils";
@@ -16,12 +16,108 @@ import { PluginDialogModal } from "./dialogs";
 import { JsonResolveModal } from "./JsonResolveModal";
 import { pipeGeneratorToGenerator, processAllGeneratorTasksWithConcurrencyLimit } from './lib/src/task';
 
+const d = "\u200b";
+const d2 = "\n";
 
-function serialize<T>(obj: T): string {
-    return JSON.stringify(obj, null, 1);
+function serialize(data: PluginDataEx): string {
+    // For higher performance, create custom plug-in data strings.
+    // Self-hosted LiveSync uses `\n` to split chunks. Therefore, grouping together those with similar entropy would work nicely.
+    let ret = "";
+    ret += ":";
+    ret += data.category + d + data.name + d + data.term + d2;
+    ret += (data.version ?? "") + d2;
+    ret += data.mtime + d2;
+    for (const file of data.files) {
+        ret += file.filename + d + (file.displayName ?? "") + d + (file.version ?? "") + d2;
+        ret += file.mtime + d + file.size + d2;
+        for (const data of file.data ?? []) {
+            ret += data + d
+        }
+        ret += d2;
+    }
+    return ret;
 }
+function fetchToken(source: string, from: number): [next: number, token: string] {
+    const limitIdx = source.indexOf(d2, from);
+    const limit = limitIdx == -1 ? source.length : limitIdx;
+    const delimiterIdx = source.indexOf(d, from);
+    const delimiter = delimiterIdx == -1 ? source.length : delimiterIdx;
+    const tokenEnd = Math.min(limit, delimiter);
+    let next = tokenEnd;
+    if (limit < delimiter) {
+        next = tokenEnd;
+    } else {
+        next = tokenEnd + 1
+    }
+    return [next, source.substring(from, tokenEnd)];
+}
+function getTokenizer(source: string) {
+    const t = {
+        pos: 1,
+        next() {
+            const [next, token] = fetchToken(source, this.pos);
+            this.pos = next;
+            return token;
+        },
+        nextLine() {
+            const nextPos = source.indexOf(d2, this.pos);
+            if (nextPos == -1) {
+                this.pos = source.length;
+            } else {
+                this.pos = nextPos + 1;
+            }
+        }
+    }
+    return t;
+}
+
+function deserialize2(str: string): PluginDataEx {
+    const tokens = getTokenizer(str);
+    const ret = {} as PluginDataEx;
+    const category = tokens.next();
+    const name = tokens.next();
+    const term = tokens.next();
+    tokens.nextLine();
+    const version = tokens.next();
+    tokens.nextLine();
+    const mtime = Number(tokens.next());
+    tokens.nextLine();
+    const result: PluginDataEx = Object.assign(ret,
+        { category, name, term, version, mtime, files: [] as PluginDataExFile[] })
+    let filename = "";
+    do {
+        filename = tokens.next();
+        if (!filename) break;
+        const displayName = tokens.next();
+        const version = tokens.next();
+        tokens.nextLine();
+        const mtime = Number(tokens.next());
+        const size = Number(tokens.next());
+        tokens.nextLine();
+        const data = [] as string[];
+        let piece = "";
+        do {
+            piece = tokens.next();
+            if (piece == "") break;
+            data.push(piece);
+        } while (piece != "");
+        result.files.push(
+            {
+                filename,
+                displayName,
+                version,
+                mtime,
+                size,
+                data
+            }
+        )
+    } while (filename);
+    return result;
+}
+
 function deserialize<T>(str: string, def: T) {
     try {
+        if (str[0] == ":") return deserialize2(str);
         return JSON.parse(str) as T;
     } catch (ex) {
         try {
@@ -107,6 +203,7 @@ export class ConfigSync extends LiveSyncCommands {
             },
         });
     }
+
     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";
@@ -164,6 +261,46 @@ export class ConfigSync extends LiveSyncCommands {
         pluginList.set(this.pluginList)
         await this.updatePluginList(showMessage);
     }
+    async loadPluginData(path: FilePathWithPrefix): Promise<PluginDataExDisplay | false> {
+        const wx = await this.localDatabase.getDBEntry(path, null, false, false);
+        if (wx) {
+            const data = deserialize(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 = [crc32CKHash(tempStr)];
+                xFiles.push(work);
+            }
+            return ({
+                ...data,
+                documentPath: this.getPath(wx),
+                files: xFiles
+            }) as PluginDataExDisplay;
+        }
+        return false;
+    }
+    createMissingConfigurationEntry() {
+        let saveRequired = false;
+        for (const v of this.pluginList) {
+            const key = `${v.category}/${v.name}`;
+            if (!(key in this.plugin.settings.pluginSyncExtendedSetting)) {
+                this.plugin.settings.pluginSyncExtendedSetting[key] = {
+                    key,
+                    mode: MODE_SELECTIVE,
+                    files: []
+                }
+            }
+            if (this.plugin.settings.pluginSyncExtendedSetting[key].files.sort().join(",").toLowerCase() !=
+                v.files.map(e => e.filename).sort().join(",").toLowerCase()) {
+                this.plugin.settings.pluginSyncExtendedSetting[key].files = v.files.map(e => e.filename).sort();
+                saveRequired = true;
+            }
+        }
+        if (saveRequired) {
+            this.plugin.saveSettingData();
+        }
+    }
     async updatePluginList(showMessage: boolean, updatedDocumentPath?: FilePathWithPrefix): Promise<void> {
         const logLevel = showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO;
         // pluginList.set([]);
@@ -174,7 +311,7 @@ export class ConfigSync extends LiveSyncCommands {
         }
         await Promise.resolve(); // Just to prevent warning.
         scheduleTask("update-plugin-list-task", 200, async () => {
-            await runWithLock("update-plugin-list", false, async () => {
+            await serialized("update-plugin-list", async () => {
                 try {
                     const updatedDocumentId = updatedDocumentPath ? await this.path2id(updatedDocumentPath) : "";
                     const plugins = updatedDocumentPath ?
@@ -193,22 +330,7 @@ export class ConfigSync extends LiveSyncCommands {
                             count++;
                             if (count % 10 == 0) 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 = deserialize(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 = [crc32CKHash(tempStr)];
-                                    xFiles.push(work);
-                                }
-                                return ({
-                                    ...data,
-                                    documentPath: this.getPath(wx),
-                                    files: xFiles
-                                });
-                            }
+                            return this.loadPluginData(path);
                             // return entries;
                         } catch (ex) {
                             //TODO
@@ -218,7 +340,7 @@ export class ConfigSync extends LiveSyncCommands {
                         return false;
                     }))) {
                         if ("ok" in v) {
-                            if (v.ok != false) {
+                            if (v.ok !== false) {
                                 let newList = [...this.pluginList];
                                 const item = v.ok;
                                 newList = newList.filter(x => x.documentPath != item.documentPath);
@@ -230,6 +352,7 @@ export class ConfigSync extends LiveSyncCommands {
                         }
                     }
                     Logger(`All files enumerated`, logLevel, "get-plugins");
+                    this.createMissingConfigurationEntry();
                 } finally {
                     pluginIsEnumerating.set(false);
                 }
@@ -257,7 +380,7 @@ export class ConfigSync extends LiveSyncCommands {
         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) => {
+        return serialized("config:merge-data", () => 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);
@@ -291,7 +414,7 @@ export class ConfigSync extends LiveSyncCommands {
                     const path = `${baseDir}/${f.filename}`;
                     await this.ensureDirectoryEx(path);
                     if (!content) {
-                        const dt = base64ToArrayBuffer(f.data);
+                        const dt = decodeBinary(f.data);
                         await this.app.vault.adapter.writeBinary(path, dt);
                     } else {
                         await this.app.vault.adapter.write(path, content);
@@ -411,6 +534,7 @@ export class ConfigSync extends LiveSyncCommands {
         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);
@@ -422,7 +546,7 @@ export class ConfigSync extends LiveSyncCommands {
         const contentBin = await this.app.vault.adapter.readBinary(path);
         let content: string[];
         try {
-            content = await arrayBufferToBase64(contentBin);
+            content = await encodeBinary(contentBin, this.settings.useV1);
             if (path.toLowerCase().endsWith("/manifest.json")) {
                 const v = readString(new Uint8Array(contentBin));
                 try {
@@ -470,7 +594,7 @@ export class ConfigSync extends LiveSyncCommands {
             return;
         }
         const vf = this.filenameToUnifiedKey(path, term);
-        return await runWithLock(`plugin-${vf}`, false, async () => {
+        return await serialized(`plugin-${vf}`, async () => {
             const category = this.getFileCategory(path);
             let mtime = 0;
             let fileTargets = [] as FilePath[];
@@ -578,6 +702,13 @@ export class ConfigSync extends LiveSyncCommands {
         // Make sure that target is a file.
         if (stat && stat.type != "file")
             return false;
+
+        const configDir = normalizePath(this.app.vault.configDir);
+        const synchronisedInConfigSync = Object.values(this.settings.pluginSyncExtendedSetting).filter(e => e.mode != MODE_SELECTIVE).map(e => e.files).flat().map(e => `${configDir}/${e}`.toLowerCase());
+        if (synchronisedInConfigSync.some(e => e.startsWith(path.toLowerCase()))) {
+            Logger(`Customization file skipped: ${path}`, LOG_LEVEL_VERBOSE);
+            return;
+        }
         const storageMTime = ~~((stat && stat.mtime || 0) / 1000);
         const key = `${path}-${storageMTime}`;
         if (this.recentProcessedInternalFiles.contains(key)) {
@@ -618,7 +749,7 @@ export class ConfigSync extends LiveSyncCommands {
 
         // const id = await this.path2id(prefixedFileName);
         const mtime = new Date().getTime();
-        await runWithLock("file-x-" + prefixedFileName, false, async () => {
+        await serialized("file-x-" + prefixedFileName, async () => {
             try {
                 const old = await this.localDatabase.getDBEntryMeta(prefixedFileName, null, false) as InternalFileEntry | false;
                 let saveData: InternalFileEntry;

src/CmdHiddenFileSync.ts

@@ -1,13 +1,13 @@
-import { Notice, normalizePath, type PluginManifest } from "./deps";
-import { type EntryDoc, type LoadedEntry, type InternalFileEntry, type FilePathWithPrefix, type FilePath, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "./lib/src/types";
+import { normalizePath, type PluginManifest } from "./deps";
+import { type EntryDoc, type LoadedEntry, type InternalFileEntry, type FilePathWithPrefix, type FilePath, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, MODE_SELECTIVE, MODE_PAUSED } from "./lib/src/types";
 import { type InternalFileInfo, ICHeader, ICHeaderEnd } from "./types";
 import { Parallels, 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, isInternalMetadata, PeriodicProcessor } from "./utils";
+import { scheduleTask, isInternalMetadata, PeriodicProcessor } from "./utils";
 import { WrappedNotice } from "./lib/src/wrapper";
-import { base64ToArrayBuffer, arrayBufferToBase64 } from "./lib/src/strbin";
-import { runWithLock } from "./lib/src/lock";
+import { decodeBinary, encodeBinary } from "./lib/src/strbin";
+import { serialized } from "./lib/src/lock";
 import { JsonResolveModal } from "./JsonResolveModal";
 import { LiveSyncCommands } from "./LiveSyncCommands";
 import { addPrefix, stripAllPrefixes } from "./lib/src/path";
@@ -77,7 +77,7 @@ export class HiddenFileSync extends LiveSyncCommands {
 
     procInternalFiles: string[] = [];
     async execInternalFile() {
-        await runWithLock("execInternal", false, async () => {
+        await serialized("execInternal", async () => {
             const w = [...this.procInternalFiles];
             this.procInternalFiles = [];
             Logger(`Applying hidden ${w.length} files change...`);
@@ -95,6 +95,14 @@ export class HiddenFileSync extends LiveSyncCommands {
     recentProcessedInternalFiles = [] as string[];
     async watchVaultRawEventsAsync(path: FilePath) {
         if (!this.settings.syncInternalFiles) return;
+
+        // Exclude files handled by customization sync
+        const configDir = normalizePath(this.app.vault.configDir);
+        const synchronisedInConfigSync = !this.settings.usePluginSync ? [] : Object.values(this.settings.pluginSyncExtendedSetting).filter(e => e.mode == MODE_SELECTIVE || e.mode == MODE_PAUSED).map(e => e.files).flat().map(e => `${configDir}/${e}`.toLowerCase());
+        if (synchronisedInConfigSync.some(e => e.startsWith(path.toLowerCase()))) {
+            Logger(`Hidden file skipped: ${path} is synchronized in customization sync.`, LOG_LEVEL_VERBOSE);
+            return;
+        }
         const stat = await this.app.vault.adapter.stat(path);
         // sometimes folder is coming.
         if (stat && stat.type != "file")
@@ -209,18 +217,24 @@ export class HiddenFileSync extends LiveSyncCommands {
     }
 
     //TODO: Tidy up. Even though it is experimental feature, So dirty...
-    async syncInternalFilesAndDatabase(direction: "push" | "pull" | "safe" | "pullForce" | "pushForce", showMessage: boolean, files: InternalFileInfo[] | false = false, targetFiles: string[] | false = false) {
+    async syncInternalFilesAndDatabase(direction: "push" | "pull" | "safe" | "pullForce" | "pushForce", showMessage: boolean, filesAll: 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");
         const ignorePatterns = this.settings.syncInternalFilesIgnorePatterns
             .replace(/\n| /g, "")
             .split(",").filter(e => e).map(e => new RegExp(e, "i"));
-        if (!files)
-            files = await this.scanInternalFiles();
+
+        const configDir = normalizePath(this.app.vault.configDir);
+        let files: InternalFileInfo[] =
+            filesAll ? filesAll : (await this.scanInternalFiles())
+
+        const synchronisedInConfigSync = !this.settings.usePluginSync ? [] : Object.values(this.settings.pluginSyncExtendedSetting).filter(e => e.mode == MODE_SELECTIVE || e.mode == MODE_PAUSED).map(e => e.files).flat().map(e => `${configDir}/${e}`.toLowerCase());
+        files = files.filter(file => synchronisedInConfigSync.every(filterFile => !file.path.toLowerCase().startsWith(filterFile)))
+
         const filesOnDB = ((await this.localDatabase.allDocsRaw({ startkey: ICHeader, endkey: ICHeaderEnd, include_docs: true })).rows.map(e => e.doc) as InternalFileEntry[]).filter(e => !e.deleted);
         const allFileNamesSrc = [...new Set([...files.map(e => normalizePath(e.path)), ...filesOnDB.map(e => stripAllPrefixes(this.getPath(e)))])];
-        const allFileNames = allFileNamesSrc.filter(filename => !targetFiles || (targetFiles && targetFiles.indexOf(filename) !== -1));
+        const allFileNames = allFileNamesSrc.filter(filename => !targetFiles || (targetFiles && targetFiles.indexOf(filename) !== -1)).filter(path => synchronisedInConfigSync.every(filterFile => !path.toLowerCase().startsWith(filterFile)))
         function compareMTime(a: number, b: number) {
             const wa = ~~(a / 1000);
             const wb = ~~(b / 1000);
@@ -274,7 +288,7 @@ export class HiddenFileSync extends LiveSyncCommands {
             if (ignorePatterns.some(e => filename.match(e)))
                 continue;
             if (await this.plugin.isIgnoredByIgnoreFiles(filename)) {
-                continue
+                continue;
             }
 
             const fileOnStorage = filename in filesMap ? filesMap[filename] : undefined;
@@ -335,7 +349,6 @@ export class HiddenFileSync extends LiveSyncCommands {
 
         // When files has been retrieved from the database. they must be reloaded.
         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) {
                 // Numbers of updated files that is below of configDir.
@@ -352,44 +365,18 @@ export class HiddenFileSync extends LiveSyncCommands {
                             updatedCount -= updatedFolders[manifest.dir];
                             const updatePluginId = manifest.id;
                             const updatePluginName = manifest.name;
-                            const fragment = createFragment((doc) => {
-                                doc.createEl("span", null, (a) => {
-                                    a.appendText(`Files in ${updatePluginName} has been updated, Press `);
-                                    a.appendChild(a.createEl("a", null, (anchor) => {
-                                        anchor.text = "HERE";
-                                        anchor.addEventListener("click", async () => {
-                                            Logger(`Unloading plugin: ${updatePluginName}`, LOG_LEVEL_NOTICE, "plugin-reload-" + updatePluginId);
-                                            // @ts-ignore
-                                            await this.app.plugins.unloadPlugin(updatePluginId);
-                                            // @ts-ignore
-                                            await this.app.plugins.loadPlugin(updatePluginId);
-                                            Logger(`Plugin reloaded: ${updatePluginName}`, LOG_LEVEL_NOTICE, "plugin-reload-" + updatePluginId);
-                                        });
-                                    }));
-
-                                    a.appendText(` to reload ${updatePluginName}, or press elsewhere to dismiss this message.`);
+                            this.plugin.askInPopup(`updated-${updatePluginId}`, `Files in ${updatePluginName} has been updated, Press {HERE} to reload ${updatePluginName}, or press elsewhere to dismiss this message.`, (anchor) => {
+                                anchor.text = "HERE";
+                                anchor.addEventListener("click", async () => {
+                                    Logger(`Unloading plugin: ${updatePluginName}`, LOG_LEVEL_NOTICE, "plugin-reload-" + updatePluginId);
+                                    // @ts-ignore
+                                    await this.app.plugins.unloadPlugin(updatePluginId);
+                                    // @ts-ignore
+                                    await this.app.plugins.loadPlugin(updatePluginId);
+                                    Logger(`Plugin reloaded: ${updatePluginName}`, LOG_LEVEL_NOTICE, "plugin-reload-" + updatePluginId);
                                 });
-                            });
-
-                            const updatedPluginKey = "popupUpdated-" + updatePluginId;
-                            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);
-                                });
-                            });
+                            }
+                            );
                         }
                     }
                 } catch (ex) {
@@ -400,30 +387,11 @@ export class HiddenFileSync extends LiveSyncCommands {
 
                 // If something changes left, notify for reloading Obsidian.
                 if (updatedCount != 0) {
-                    const fragment = createFragment((doc) => {
-                        doc.createEl("span", null, (a) => {
-                            a.appendText(`Hidden files have been synchronized, Press `);
-                            a.appendChild(a.createEl("a", null, (anchor) => {
-                                anchor.text = "HERE";
-                                anchor.addEventListener("click", () => {
-                                    // @ts-ignore
-                                    this.app.commands.executeCommandById("app:reload");
-                                });
-                            }));
-
-                            a.appendText(` to reload obsidian, or press elsewhere to dismiss this message.`);
-                        });
-                    });
-
-                    scheduleTask("popupUpdated-" + configDir, 1000, () => {
-                        //@ts-ignore
-                        const isShown = this.confirmPopup?.noticeEl?.isShown();
-                        if (!isShown) {
-                            this.confirmPopup = new Notice(fragment, 0);
-                        }
-                        scheduleTask("popupClose" + configDir, 20000, () => {
-                            this.confirmPopup?.hide();
-                            this.confirmPopup = null;
+                    this.plugin.askInPopup(`updated-any-hidden`, `Hidden files have been synchronized, Press  {HERE} to reload Obsidian, or press elsewhere to dismiss this message.`, (anchor) => {
+                        anchor.text = "HERE";
+                        anchor.addEventListener("click", () => {
+                            // @ts-ignore
+                            this.app.commands.executeCommandById("app:reload");
                         });
                     });
                 }
@@ -437,19 +405,20 @@ export class HiddenFileSync extends LiveSyncCommands {
         if (await this.plugin.isIgnoredByIgnoreFiles(file.path)) {
             return
         }
+
         const id = await this.path2id(file.path, ICHeader);
         const prefixedFileName = addPrefix(file.path, ICHeader);
         const contentBin = await this.app.vault.adapter.readBinary(file.path);
         let content: string[];
         try {
-            content = await arrayBufferToBase64(contentBin);
+            content = await encodeBinary(contentBin, this.settings.useV1);
         } catch (ex) {
             Logger(`The file ${file.path} could not be encoded`);
             Logger(ex, LOG_LEVEL_VERBOSE);
             return false;
         }
         const mtime = file.mtime;
-        return await runWithLock("file-" + prefixedFileName, false, async () => {
+        return await serialized("file-" + prefixedFileName, async () => {
             try {
                 const old = await this.localDatabase.getDBEntry(prefixedFileName, null, false, false);
                 let saveData: LoadedEntry;
@@ -501,7 +470,7 @@ export class HiddenFileSync extends LiveSyncCommands {
         if (await this.plugin.isIgnoredByIgnoreFiles(filename)) {
             return
         }
-        await runWithLock("file-" + prefixedFileName, false, async () => {
+        await serialized("file-" + prefixedFileName, async () => {
             try {
                 const old = await this.localDatabase.getDBEntryMeta(prefixedFileName, null, true) as InternalFileEntry | false;
                 let saveData: InternalFileEntry;
@@ -547,7 +516,7 @@ export class HiddenFileSync extends LiveSyncCommands {
         if (await this.plugin.isIgnoredByIgnoreFiles(filename)) {
             return;
         }
-        return await runWithLock("file-" + prefixedFileName, false, async () => {
+        return await serialized("file-" + prefixedFileName, async () => {
             try {
                 // Check conflicted status 
                 //TODO option
@@ -578,7 +547,7 @@ export class HiddenFileSync extends LiveSyncCommands {
                 }
                 if (!isExists) {
                     await this.ensureDirectoryEx(filename);
-                    await this.app.vault.adapter.writeBinary(filename, base64ToArrayBuffer(fileOnDB.data), { mtime: fileOnDB.mtime, ctime: fileOnDB.ctime });
+                    await this.app.vault.adapter.writeBinary(filename, decodeBinary(fileOnDB.data), { mtime: fileOnDB.mtime, ctime: fileOnDB.ctime });
                     try {
                         //@ts-ignore internalAPI
                         await this.app.vault.adapter.reconcileInternalFile(filename);
@@ -590,12 +559,12 @@ export class HiddenFileSync extends LiveSyncCommands {
                     return true;
                 } else {
                     const contentBin = await this.app.vault.adapter.readBinary(filename);
-                    const content = await arrayBufferToBase64(contentBin);
+                    const content = await encodeBinary(contentBin, this.settings.useV1);
                     if (isDocContentSame(content, fileOnDB.data) && !force) {
                         // Logger(`STORAGE <-- DB:${filename}: skipped (hidden) Not changed`, LOG_LEVEL_VERBOSE);
                         return true;
                     }
-                    await this.app.vault.adapter.writeBinary(filename, base64ToArrayBuffer(fileOnDB.data), { mtime: fileOnDB.mtime, ctime: fileOnDB.ctime });
+                    await this.app.vault.adapter.writeBinary(filename, decodeBinary(fileOnDB.data), { mtime: fileOnDB.mtime, ctime: fileOnDB.ctime });
                     try {
                         //@ts-ignore internalAPI
                         await this.app.vault.adapter.reconcileInternalFile(filename);
@@ -618,7 +587,7 @@ export class HiddenFileSync extends LiveSyncCommands {
 
 
     showJSONMergeDialogAndMerge(docA: LoadedEntry, docB: LoadedEntry): Promise<boolean> {
-        return runWithLock("conflict:merge-data", false, () => new Promise((res) => {
+        return serialized("conflict:merge-data", () => new Promise((res) => {
             Logger("Opening data-merging dialog", LOG_LEVEL_VERBOSE);
             const docs = [docA, docB];
             const path = stripAllPrefixes(docA.path);
@@ -676,13 +645,16 @@ export class HiddenFileSync extends LiveSyncCommands {
     }
 
     async scanInternalFiles(): Promise<InternalFileInfo[]> {
+        const configDir = normalizePath(this.app.vault.configDir);
         const ignoreFilter = this.settings.syncInternalFilesIgnorePatterns
             .replace(/\n| /g, "")
             .split(",").filter(e => e).map(e => new RegExp(e, "i"));
+        const synchronisedInConfigSync = !this.settings.usePluginSync ? [] : Object.values(this.settings.pluginSyncExtendedSetting).filter(e => e.mode == MODE_SELECTIVE || e.mode == MODE_PAUSED).map(e => e.files).flat().map(e => `${configDir}/${e}`.toLowerCase());
         const root = this.app.vault.getRoot();
         const findRoot = root.path;
+
         const filenames = (await this.getFiles(findRoot, [], null, ignoreFilter)).filter(e => e.startsWith(".")).filter(e => !e.startsWith(".trash"));
-        const files = filenames.map(async (e) => {
+        const files = filenames.filter(path => synchronisedInConfigSync.every(filterFile => !path.toLowerCase().startsWith(filterFile))).map(async (e) => {
             return {
                 path: e as FilePath,
                 stat: await this.app.vault.adapter.stat(e)
@@ -716,7 +688,7 @@ export class HiddenFileSync extends LiveSyncCommands {
             ...w.files
                 .filter((e) => !ignoreList.some((ee) => e.endsWith(ee)))
                 .filter((e) => !filter || filter.some((ee) => e.match(ee)))
-                .filter((e) => !ignoreFilter || ignoreFilter.every((ee) => !e.match(ee))),
+                .filter((e) => !ignoreFilter || ignoreFilter.every((ee) => !e.match(ee)))
         ];
         let files = [] as string[];
         for (const file of filesSrc) {

src/CmdPluginAndTheirSettings.ts

@@ -9,7 +9,7 @@ import { isPluginMetadata, PeriodicProcessor } from "./utils";
 import { PluginDialogModal } from "./dialogs";
 import { NewNotice } from "./lib/src/wrapper";
 import { versionNumberString2Number } from "./lib/src/strbin";
-import { runWithLock } from "./lib/src/lock";
+import { serialized, skipIfDuplicated } from "./lib/src/lock";
 import { LiveSyncCommands } from "./LiveSyncCommands";
 
 export class PluginAndTheirSettings extends LiveSyncCommands {
@@ -164,7 +164,7 @@ export class PluginAndTheirSettings extends LiveSyncCommands {
         if (specificPluginPath != "") {
             specificPlugin = manifests.find(e => e.dir.endsWith("/" + specificPluginPath))?.id ?? "";
         }
-        await runWithLock("sweepplugin", true, async () => {
+        await skipIfDuplicated("sweepplugin", async () => {
             const logLevel = showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO;
             if (!this.deviceAndVaultName) {
                 Logger("You have to set your device name.", LOG_LEVEL_NOTICE);
@@ -223,7 +223,7 @@ export class PluginAndTheirSettings extends LiveSyncCommands {
                         type: "plain"
                     };
                     Logger(`check diff:${m.name}(${m.id})`, LOG_LEVEL_VERBOSE);
-                    await runWithLock("plugin-" + m.id, false, async () => {
+                    await serialized("plugin-" + m.id, async () => {
                         const old = await this.localDatabase.getDBEntry(p._id as string as FilePathWithPrefix /* This also should be explained */, null, false, false);
                         if (old !== false) {
                             const oldData = { data: old.data, deleted: old._deleted };
@@ -266,7 +266,7 @@ export class PluginAndTheirSettings extends LiveSyncCommands {
     }
 
     async applyPluginData(plugin: PluginDataEntry) {
-        await runWithLock("plugin-" + plugin.manifest.id, false, async () => {
+        await serialized("plugin-" + plugin.manifest.id, async () => {
             const pluginTargetFolderPath = normalizePath(plugin.manifest.dir) + "/";
             const adapter = this.app.vault.adapter;
             // @ts-ignore
@@ -288,7 +288,7 @@ export class PluginAndTheirSettings extends LiveSyncCommands {
     }
 
     async applyPlugin(plugin: PluginDataEntry) {
-        await runWithLock("plugin-" + plugin.manifest.id, false, async () => {
+        await serialized("plugin-" + plugin.manifest.id, async () => {
             // @ts-ignore
             const stat = this.app.plugins.enabledPlugins.has(plugin.manifest.id) == true;
             if (stat) {

src/CmdSetupLiveSync.ts

@@ -20,6 +20,11 @@ export class SetupLiveSync extends LiveSyncCommands {
             name: "Copy the setup URI",
             callback: this.command_copySetupURI.bind(this),
         });
+        this.plugin.addCommand({
+            id: "livesync-copysetupuri-short",
+            name: "Copy the setup URI (With customization sync)",
+            callback: this.command_copySetupURIWithSync.bind(this),
+        });
 
         this.plugin.addCommand({
             id: "livesync-copysetupurifull",
@@ -41,18 +46,21 @@ export class SetupLiveSync extends LiveSyncCommands {
     }
     async realizeSettingSyncMode() { }
 
-    async command_copySetupURI() {
+    async command_copySetupURI(stripExtra = true) {
         const encryptingPassphrase = await askString(this.app, "Encrypt your settings", "The passphrase to encrypt the setup URI", "", true);
         if (encryptingPassphrase === false)
             return;
         const setting = { ...this.settings, configPassphraseStore: "", encryptedCouchDBConnection: "", encryptedPassphrase: "" };
+        if (stripExtra) {
+            delete setting.pluginSyncExtendedSetting;
+        }
         const keys = Object.keys(setting) as (keyof ObsidianLiveSyncSettings)[];
         for (const k of keys) {
             if (JSON.stringify(k in setting ? setting[k] : "") == JSON.stringify(k in DEFAULT_SETTINGS ? DEFAULT_SETTINGS[k] : "*")) {
                 delete setting[k];
             }
         }
-        const encryptedSetting = encodeURIComponent(await encrypt(JSON.stringify(setting), encryptingPassphrase, false));
+        const encryptedSetting = encodeURIComponent(await encrypt(JSON.stringify(setting), encryptingPassphrase, false, false));
         const uri = `${configURIBase}${encryptedSetting}`;
         await navigator.clipboard.writeText(uri);
         Logger("Setup URI copied to clipboard", LOG_LEVEL_NOTICE);
@@ -62,11 +70,14 @@ export class SetupLiveSync extends LiveSyncCommands {
         if (encryptingPassphrase === false)
             return;
         const setting = { ...this.settings, configPassphraseStore: "", encryptedCouchDBConnection: "", encryptedPassphrase: "" };
-        const encryptedSetting = encodeURIComponent(await encrypt(JSON.stringify(setting), encryptingPassphrase, false));
+        const encryptedSetting = encodeURIComponent(await encrypt(JSON.stringify(setting), encryptingPassphrase, false, false));
         const uri = `${configURIBase}${encryptedSetting}`;
         await navigator.clipboard.writeText(uri);
         Logger("Setup URI copied to clipboard", LOG_LEVEL_NOTICE);
     }
+    async command_copySetupURIWithSync() {
+        this.command_copySetupURI(false);
+    }
     async command_openSetupURI() {
         const setupURI = await askString(this.app, "Easy setup", "Set up URI", `${configURIBase}aaaaa`);
         if (setupURI === false)
@@ -290,6 +301,7 @@ Of course, we are able to disable these features.`
         this.plugin.settings.liveSync = false;
         this.plugin.settings.periodicReplication = false;
         this.plugin.settings.syncOnSave = false;
+        this.plugin.settings.syncOnEditorSave = false;
         this.plugin.settings.syncOnStart = false;
         this.plugin.settings.syncOnFileOpen = false;
         this.plugin.settings.syncAfterMerge = false;

src/ConflictResolveModal.ts

@@ -18,10 +18,8 @@ export class ConflictResolveModal extends Modal {
 
     onOpen() {
         const { contentEl } = this;
-
+        this.titleEl.setText("Conflicting changes");
         contentEl.empty();
-
-        contentEl.createEl("h2", { text: "This document has conflicted changes." });
         contentEl.createEl("span", { text: this.filename });
         const div = contentEl.createDiv("");
         div.addClass("op-scrollable");

src/DocumentHistoryModal.ts

@@ -1,6 +1,6 @@
 import { TFile, Modal, App, DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_patch } from "./deps";
 import { getPathFromTFile, isValidPath } from "./utils";
-import { base64ToArrayBuffer, base64ToString, escapeStringToHTML } from "./lib/src/strbin";
+import { decodeBinary, escapeStringToHTML, readString } from "./lib/src/strbin";
 import ObsidianLiveSyncPlugin from "./main";
 import { type DocumentID, type FilePathWithPrefix, type LoadedEntry, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "./lib/src/types";
 import { Logger } from "./lib/src/logger";
@@ -10,29 +10,29 @@ import { stripPrefix } from "./lib/src/path";
 
 export class DocumentHistoryModal extends Modal {
     plugin: ObsidianLiveSyncPlugin;
-    range: HTMLInputElement;
-    contentView: HTMLDivElement;
-    info: HTMLDivElement;
-    fileInfo: HTMLDivElement;
+    range!: HTMLInputElement;
+    contentView!: HTMLDivElement;
+    info!: HTMLDivElement;
+    fileInfo!: HTMLDivElement;
     showDiff = false;
-    id: DocumentID;
+    id?: DocumentID;
 
     file: FilePathWithPrefix;
 
     revs_info: PouchDB.Core.RevisionInfo[] = [];
-    currentDoc: LoadedEntry;
+    currentDoc?: LoadedEntry;
     currentText = "";
     currentDeleted = false;
-    initialRev: string;
+    initialRev?: string;
 
-    constructor(app: App, plugin: ObsidianLiveSyncPlugin, file: TFile | FilePathWithPrefix, id: DocumentID, revision?: string) {
+    constructor(app: App, plugin: ObsidianLiveSyncPlugin, file: TFile | FilePathWithPrefix, id?: DocumentID, revision?: string) {
         super(app);
         this.plugin = plugin;
         this.file = (file instanceof TFile) ? getPathFromTFile(file) : file;
         this.id = id;
         this.initialRev = revision;
-        if (!file) {
-            this.file = this.plugin.id2path(id, null);
+        if (!file && id) {
+            this.file = this.plugin.id2path(id);
         }
         if (localStorage.getItem("ols-history-highlightdiff") == "1") {
             this.showDiff = true;
@@ -46,8 +46,8 @@ export class DocumentHistoryModal extends Modal {
         const db = this.plugin.localDatabase;
         try {
             const w = await db.localDatabase.get(this.id, { revs_info: true });
-            this.revs_info = w._revs_info.filter((e) => e?.status == "available");
-            this.range.max = `${this.revs_info.length - 1}`;
+            this.revs_info = w._revs_info?.filter((e) => e?.status == "available") ?? [];
+            this.range.max = `${Math.max(this.revs_info.length - 1, 0)}`;
             this.range.value = this.range.max;
             this.fileInfo.setText(`${this.file} / ${this.revs_info.length} revisions`);
             await this.loadRevs(initialRev);
@@ -89,8 +89,8 @@ export class DocumentHistoryModal extends Modal {
             this.currentDoc = w;
             this.info.innerHTML = `Modified:${new Date(w.mtime).toLocaleString()}`;
             let result = "";
-            const w1data = w.datatype == "plain" ? getDocData(w.data) : base64ToString(w.data);
-            this.currentDeleted = w.deleted;
+            const w1data = w.datatype == "plain" ? getDocData(w.data) : readString(new Uint8Array(decodeBinary(w.data)));
+            this.currentDeleted = !!w.deleted;
             this.currentText = w1data;
             if (this.showDiff) {
                 const prevRevIdx = this.revs_info.length - 1 - ((this.range.value as any) / 1 - 1);
@@ -99,7 +99,7 @@ export class DocumentHistoryModal extends Modal {
                     const w2 = await db.getDBEntry(this.file, { rev: oldRev }, false, false, true);
                     if (w2 != false) {
                         const dmp = new diff_match_patch();
-                        const w2data = w2.datatype == "plain" ? getDocData(w2.data) : base64ToString(w2.data);
+                        const w2data = w2.datatype == "plain" ? getDocData(w2.data) : readString(new Uint8Array(decodeBinary(w2.data)));
                         const diff = dmp.diff_main(w2data, w1data);
                         dmp.diff_cleanupSemantic(diff);
                         for (const v of diff) {
@@ -130,9 +130,8 @@ export class DocumentHistoryModal extends Modal {
 
     onOpen() {
         const { contentEl } = this;
-
+        this.titleEl.setText("Document History");
         contentEl.empty();
-        contentEl.createEl("h2", { text: "Document History" });
         this.fileInfo = contentEl.createDiv("");
         this.fileInfo.addClass("op-info");
         const divView = contentEl.createDiv("");
@@ -205,7 +204,7 @@ export class DocumentHistoryModal extends Modal {
                     await focusFile(pathToWrite);
                     this.close();
                 } else if (this.currentDoc?.datatype == "newnote") {
-                    await this.app.vault.adapter.writeBinary(pathToWrite, base64ToArrayBuffer(this.currentDoc.data));
+                    await this.app.vault.adapter.writeBinary(pathToWrite, decodeBinary(this.currentDoc.data));
                     await focusFile(pathToWrite);
                     this.close();
                 } else {

src/GlobalHistory.svelte

@@ -7,7 +7,7 @@
     import { DocumentHistoryModal } from "./DocumentHistoryModal";
     import { isPlainText, stripAllPrefixes } from "./lib/src/path";
     import { TFile } from "./deps";
-    import { arrayBufferToBase64 } from "./lib/src/strbin";
+    import { encodeBinary } from "./lib/src/strbin";
     export let plugin: ObsidianLiveSyncPlugin;
 
     let showDiffInfo = false;
@@ -116,7 +116,7 @@
                                         result = isDocContentSame(data, doc.data);
                                     } else {
                                         const data = await plugin.app.vault.readBinary(abs);
-                                        const dataEEncoded = await arrayBufferToBase64(data);
+                                        const dataEEncoded = await encodeBinary(data, plugin.settings.useV1);
                                         result = isDocContentSame(dataEEncoded, doc.data);
                                     }
                                     if (result) {

src/JsonResolveModal.ts

@@ -29,7 +29,7 @@ export class JsonResolveModal extends Modal {
 
     onOpen() {
         const { contentEl } = this;
-
+        this.titleEl.setText("Conflicted Setting");
         contentEl.empty();
 
         if (this.component == null) {

src/JsonResolvePane.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
     import { type Diff, DIFF_DELETE, DIFF_INSERT, diff_match_patch } from "./deps";
     import type { FilePath, LoadedEntry } from "./lib/src/types";
-    import { base64ToString } from "./lib/src/strbin";
+    import { decodeBinary, readString } from "./lib/src/strbin";
     import { getDocData } from "./lib/src/utils";
     import { mergeObject } from "./utils";
 
@@ -26,7 +26,7 @@
     let mode: SelectModes = defaultSelect as SelectModes;
 
     function docToString(doc: LoadedEntry) {
-        return doc.datatype == "plain" ? getDocData(doc.data) : base64ToString(doc.data);
+        return doc.datatype == "plain" ? getDocData(doc.data) : readString(new Uint8Array(decodeBinary(doc.data)));
     }
     function revStringToRevNumber(rev: string) {
         return rev.split("-")[0];
@@ -104,7 +104,6 @@
     ] as ["" | "A" | "B" | "AB" | "BA", string][];
 </script>
 
-<h1>Conflicted settings</h1>
 <h2>{filename}</h2>
 {#if !docA || !docB}
     <div class="message">Just for a minute, please!</div>

src/LogDisplayModal.ts

@@ -14,9 +14,9 @@ export class LogDisplayModal extends Modal {
 
     onOpen() {
         const { contentEl } = this;
+        this.titleEl.setText("Sync status");
 
         contentEl.empty();
-        contentEl.createEl("h2", { text: "Sync Status" });
         const div = contentEl.createDiv("");
         div.addClass("op-scrollable");
         div.addClass("op-pre");

src/ObsidianLiveSyncSettingTab.ts

@@ -1,5 +1,5 @@
 import { App, PluginSettingTab, Setting, sanitizeHTMLToDom, TextAreaComponent, MarkdownRenderer, stringifyYaml } from "./deps";
-import { DEFAULT_SETTINGS, type ObsidianLiveSyncSettings, type ConfigPassphraseStore, type RemoteDBSettings, type FilePathWithPrefix, type HashAlgorithm, type DocumentID, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "./lib/src/types";
+import { DEFAULT_SETTINGS, type ObsidianLiveSyncSettings, type ConfigPassphraseStore, type RemoteDBSettings, type FilePathWithPrefix, type HashAlgorithm, type DocumentID, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, LOG_LEVEL_INFO } from "./lib/src/types";
 import { delay } from "./lib/src/utils";
 import { Semaphore } from "./lib/src/semaphore";
 import { versionNumberString2Number } from "./lib/src/strbin";
@@ -120,6 +120,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             if (this.plugin.settings.periodicReplication) return true;
             if (this.plugin.settings.syncOnFileOpen) return true;
             if (this.plugin.settings.syncOnSave) return true;
+            if (this.plugin.settings.syncOnEditorSave) return true;
             if (this.plugin.settings.syncOnStart) return true;
             if (this.plugin.settings.syncAfterMerge) return true;
             if (this.plugin.replicator.syncStatus == "CONNECTED") return true;
@@ -157,6 +158,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     this.plugin.settings.liveSync = false;
                     this.plugin.settings.periodicReplication = false;
                     this.plugin.settings.syncOnSave = false;
+                    this.plugin.settings.syncOnEditorSave = false;
                     this.plugin.settings.syncOnStart = false;
                     this.plugin.settings.syncOnFileOpen = false;
                     this.plugin.settings.syncAfterMerge = false;
@@ -216,7 +218,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 syncLive.forEach((e) => {
                     e.setDisabled(false).setTooltip("");
                 });
-            } else if (this.plugin.settings.syncOnFileOpen || this.plugin.settings.syncOnSave || this.plugin.settings.syncOnStart || this.plugin.settings.periodicReplication || this.plugin.settings.syncAfterMerge) {
+            } else if (this.plugin.settings.syncOnFileOpen || this.plugin.settings.syncOnSave || this.plugin.settings.syncOnEditorSave || this.plugin.settings.syncOnStart || this.plugin.settings.periodicReplication || this.plugin.settings.syncAfterMerge) {
                 syncNonLive.forEach((e) => {
                     e.setDisabled(false).setTooltip("");
                 });
@@ -301,46 +303,44 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .setDisabled(false)
                     .onClick(async () => {
                         const checkConfig = async () => {
+                            Logger(`Checking database configuration`, LOG_LEVEL_INFO);
+
+                            const emptyDiv = createDiv();
+                            emptyDiv.innerHTML = "<span></span>";
+                            checkResultDiv.replaceChildren(...[emptyDiv]);
+                            const addResult = (msg: string, classes?: string[]) => {
+                                const tmpDiv = createDiv();
+                                tmpDiv.addClass("ob-btn-config-fix");
+                                if (classes) {
+                                    tmpDiv.addClasses(classes);
+                                }
+                                tmpDiv.innerHTML = `${msg}`;
+                                checkResultDiv.appendChild(tmpDiv);
+                            };
                             try {
+
                                 if (isCloudantURI(this.plugin.settings.couchDB_URI)) {
                                     Logger("This feature cannot be used with IBM Cloudant.", LOG_LEVEL_NOTICE);
                                     return;
                                 }
-
                                 const r = await requestToCouchDB(this.plugin.settings.couchDB_URI, this.plugin.settings.couchDB_USER, this.plugin.settings.couchDB_PASSWORD, window.origin);
-
-                                Logger(JSON.stringify(r.json, null, 2));
-
                                 const responseConfig = r.json;
 
-                                const emptyDiv = createDiv();
-                                emptyDiv.innerHTML = "<span></span>";
-                                checkResultDiv.replaceChildren(...[emptyDiv]);
-                                const addResult = (msg: string, classes?: string[]) => {
-                                    const tmpDiv = createDiv();
-                                    tmpDiv.addClass("ob-btn-config-fix");
-                                    if (classes) {
-                                        tmpDiv.addClasses(classes);
-                                    }
-                                    tmpDiv.innerHTML = `${msg}`;
-                                    checkResultDiv.appendChild(tmpDiv);
-                                };
                                 const addConfigFixButton = (title: string, key: string, value: string) => {
                                     const tmpDiv = createDiv();
                                     tmpDiv.addClass("ob-btn-config-fix");
                                     tmpDiv.innerHTML = `<label>${title}</label><button>Fix</button>`;
                                     const x = checkResultDiv.appendChild(tmpDiv);
                                     x.querySelector("button").addEventListener("click", async () => {
-                                        console.dir({ key, value });
+                                        Logger(`CouchDB Configuration: ${title} -> Set ${key} to ${value}`)
                                         const res = await requestToCouchDB(this.plugin.settings.couchDB_URI, this.plugin.settings.couchDB_USER, this.plugin.settings.couchDB_PASSWORD, undefined, key, value);
-                                        console.dir(res);
                                         if (res.status == 200) {
-                                            Logger(`${title} successfully updated`, LOG_LEVEL_NOTICE);
+                                            Logger(`CouchDB Configuration: ${title} successfully updated`, LOG_LEVEL_NOTICE);
                                             checkResultDiv.removeChild(x);
                                             checkConfig();
                                         } else {
-                                            Logger(`${title} failed`, LOG_LEVEL_NOTICE);
-                                            Logger(res.text);
+                                            Logger(`CouchDB Configuration: ${title} failed`, LOG_LEVEL_NOTICE);
+                                            Logger(res.text, LOG_LEVEL_VERBOSE);
                                         }
                                     });
                                 };
@@ -350,7 +350,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                                     ["ob-btn-config-info"]
                                 );
 
-                                addResult("Your configuration is dumped to Log", ["ob-btn-config-info"]);
                                 addResult("--Config check--", ["ob-btn-config-head"]);
 
                                 // Admin check
@@ -451,9 +450,16 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                                 }
                                 addResult("--Done--", ["ob-btn-config-head"]);
                                 addResult("If you have some trouble with Connection-check even though all Config-check has been passed, Please check your reverse proxy's configuration.", ["ob-btn-config-info"]);
+                                Logger(`Checking configuration done`, LOG_LEVEL_INFO);
                             } catch (ex) {
-                                Logger(`Checking configuration failed`, LOG_LEVEL_NOTICE);
-                                Logger(ex);
+                                if (ex?.status == 401) {
+                                    addResult(`❗ Access forbidden.`);
+                                    addResult(`We could not continue the test.`);
+                                    Logger(`Checking configuration done`, LOG_LEVEL_INFO);
+                                } else {
+                                    Logger(`Checking configuration failed`, LOG_LEVEL_NOTICE);
+                                    Logger(ex);
+                                }
                             }
                         };
                         await checkConfig();
@@ -891,6 +897,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                             liveSync: false,
                             periodicReplication: false,
                             syncOnSave: false,
+                            syncOnEditorSave: false,
                             syncOnStart: false,
                             syncOnFileOpen: false,
                             syncAfterMerge: false,
@@ -904,6 +911,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                             batchSave: true,
                             periodicReplication: true,
                             syncOnSave: false,
+                            syncOnEditorSave: false,
                             syncOnStart: true,
                             syncOnFileOpen: true,
                             syncAfterMerge: true,
@@ -1014,6 +1022,17 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                         applyDisplayEnabled();
                     })
                 )
+            new Setting(containerSyncSettingEl)
+                .setName("Sync on Editor Save")
+                .setDesc("When you save file on the editor, sync automatically")
+                .setClass("wizardHidden")
+                .addToggle((toggle) =>
+                    toggle.setValue(this.plugin.settings.syncOnEditorSave).onChange(async (value) => {
+                        this.plugin.settings.syncOnEditorSave = value;
+                        await this.plugin.saveSettings();
+                        applyDisplayEnabled();
+                    })
+                )
             new Setting(containerSyncSettingEl)
                 .setName("Sync on File Open")
                 .setDesc("When you open file, sync automatically")
@@ -1168,26 +1187,27 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 });
         }
 
-        new Setting(containerSyncSettingEl)
-            .setName("Scan for hidden files before replication")
-            .setDesc("This configuration will be ignored if monitoring changes is enabled.")
-            .setClass("wizardHidden")
-            .addToggle((toggle) =>
-                toggle.setValue(this.plugin.settings.syncInternalFilesBeforeReplication).onChange(async (value) => {
-                    this.plugin.settings.syncInternalFilesBeforeReplication = value;
-                    await this.plugin.saveSettings();
-                })
-            );
+        if (!this.plugin.settings.watchInternalFileChanges) {
+            new Setting(containerSyncSettingEl)
+                .setName("Scan for hidden files before replication")
+                .setClass("wizardHidden")
+                .addToggle((toggle) =>
+                    toggle.setValue(this.plugin.settings.syncInternalFilesBeforeReplication).onChange(async (value) => {
+                        this.plugin.settings.syncInternalFilesBeforeReplication = value;
+                        await this.plugin.saveSettings();
+                    })
+                );
+        }
         new Setting(containerSyncSettingEl)
             .setName("Scan hidden files periodically")
-            .setDesc("Seconds, 0 to disable. This configuration will be ignored if monitoring changes is enabled.")
+            .setDesc("Seconds, 0 to disable")
             .setClass("wizardHidden")
             .addText((text) => {
                 text.setPlaceholder("")
                     .setValue(this.plugin.settings.syncInternalFilesInterval + "")
                     .onChange(async (value) => {
                         let v = Number(value);
-                        if (isNaN(v) || v < 10) {
+                        if (v !== 0 && (isNaN(v) || v < 10)) {
                             v = 10;
                         }
                         this.plugin.settings.syncInternalFilesInterval = v;
@@ -1199,7 +1219,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         const defaultSkipPattern = "\\/node_modules\\/, \\/\\.git\\/, \\/obsidian-livesync\\/";
         const defaultSkipPatternXPlat = defaultSkipPattern + ",\\/workspace$ ,\\/workspace.json$";
         new Setting(containerSyncSettingEl)
-            .setName("Skip patterns")
+            .setName("Folders and files to ignore")
             .setDesc(
                 "Regular expression, If you use hidden file sync between desktop and mobile, adding `workspace$` is recommended."
             )
@@ -1250,7 +1270,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
 
         new Setting(containerSyncSettingEl)
             .setName("Enhance chunk size")
-            .setDesc("Enhance chunk size for binary files (0.1MBytes). This cannot be increased when using IBM Cloudant.")
+            .setDesc("Enhance chunk size for binary files (Ratio). This cannot be increased when using IBM Cloudant.")
             .setClass("wizardHidden")
             .addText((text) => {
                 text.setPlaceholder("")
@@ -1258,7 +1278,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .onChange(async (value) => {
                         let v = Number(value);
                         if (isNaN(v) || v < 1) {
-                            v = 1;
+                            v = 0;
                         }
                         this.plugin.settings.customChunkSize = v;
                         await this.plugin.saveSettings();
@@ -1493,10 +1513,12 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                         pluginConfig.passphrase = REDACTED;
                         pluginConfig.encryptedPassphrase = REDACTED;
                         pluginConfig.encryptedCouchDBConnection = REDACTED;
+                        pluginConfig.pluginSyncExtendedSetting = {};
 
                         const msgConfig = `----remote config----
 ${stringifyYaml(responseConfig)}
 ---- Plug-in config ---
+version:${manifestVersion}
 ${stringifyYaml(pluginConfig)}`;
                         console.log(msgConfig);
                         await navigator.clipboard.writeText(msgConfig);
@@ -1635,6 +1657,22 @@ ${stringifyYaml(pluginConfig)}`;
                         }
                         Logger(`Converting finished`, LOG_LEVEL_NOTICE);
                     }));
+
+        new Setting(containerHatchEl)
+            .setName("Delete all customization sync data")
+            .addButton((button) =>
+                button
+                    .setButtonText("Delete")
+                    .setDisabled(false)
+                    .setWarning()
+                    .onClick(async () => {
+                        Logger(`Deleting customization sync data`, LOG_LEVEL_NOTICE);
+                        const entriesToDelete = (await this.plugin.localDatabase.allDocsRaw({ startkey: "ix:", endkey: "ix:\u{10ffff}", include_docs: true }));
+                        const newData = entriesToDelete.rows.map(e => ({ ...e.doc, _deleted: true }));
+                        const r = await this.plugin.localDatabase.bulkDocsRaw(newData as any[]);
+                        // Do not care about the result.
+                        Logger(`${r.length} items have been removed, to confirm how many items are left, please perform it again.`, LOG_LEVEL_NOTICE);
+                    }))
         new Setting(containerHatchEl)
             .setName("Suspend file watching")
             .setDesc("Stop watching for file change.")
@@ -1777,8 +1815,8 @@ ${stringifyYaml(pluginConfig)}`;
                 dropdown
                     .addOptions({ "": "Old Algorithm", "xxhash32": "xxhash32 (Fast)", "xxhash64": "xxhash64 (Fastest)" } as Record<HashAlgorithm, string>)
                     .setValue(this.plugin.settings.hashAlg)
-                    .onChange(async (value: HashAlgorithm) => {
-                        this.plugin.settings.hashAlg = value;
+                    .onChange(async (value) => {
+                        this.plugin.settings.hashAlg = value as HashAlgorithm;
                         await this.plugin.saveSettings();
                     })
             )
@@ -1794,6 +1832,15 @@ ${stringifyYaml(pluginConfig)}`;
                     await this.plugin.saveSettings();
                 })
             );
+        new Setting(containerHatchEl)
+            .setName("Use binary and encryption version 1")
+            .setDesc("Use the previous data format for other products which shares the remote database.")
+            .addToggle((toggle) =>
+                toggle.setValue(this.plugin.settings.useV1).onChange(async (value) => {
+                    this.plugin.settings.useV1 = value;
+                    await this.plugin.saveSettings();
+                })
+            );
         addScreenElement("50", containerHatchEl);
 
 
@@ -1844,16 +1891,18 @@ ${stringifyYaml(pluginConfig)}`;
                     })
                 );
 
-            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();
-                    })
-                );
+            if (!this.plugin.settings.watchInternalFileChanges) {
+                new Setting(containerPluginSettings)
+                    .setName("Scan customization periodically")
+                    .setDesc("Scan customization every 1 minute.")
+                    .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")

src/PluginCombo.svelte

@@ -108,7 +108,7 @@
                     }
                 }
             })
-            .reduce((p, c) => p | c, 0);
+            .reduce((p, c) => p | (c as number), 0 as number);
         if (matchingStatus == 0b0000100) {
             equivalency = "⚖️ Same";
             canApply = false;
@@ -274,7 +274,7 @@
     {/if}
 {:else}
     <span class="spacer" />
-    <span class="message even">All devices are even</span>
+    <span class="message even">All the same or non-existent</span>
     <button disabled />
     <button disabled />
 {/if}

src/PluginPane.svelte

@@ -3,9 +3,13 @@
     import ObsidianLiveSyncPlugin from "./main";
     import { type PluginDataExDisplay, pluginIsEnumerating, pluginList } from "./CmdConfigSync";
     import PluginCombo from "./PluginCombo.svelte";
+    import { Menu } from "obsidian";
+    import { unique } from "./lib/src/utils";
+    import { MODE_SELECTIVE, MODE_AUTOMATIC, MODE_PAUSED, type SYNC_MODE, type PluginSyncSettingEntry } from "./lib/src/types";
+    import { normalizePath } from "./deps";
     export let plugin: ObsidianLiveSyncPlugin;
 
-    $: hideNotApplicable = true;
+    $: hideNotApplicable = false;
     $: thisTerm = plugin.deviceAndVaultName;
 
     const addOn = plugin.addOnConfigSync;
@@ -13,7 +17,7 @@
     let list: PluginDataExDisplay[] = [];
 
     let selectNewestPulse = 0;
-    let hideEven = true;
+    let hideEven = false;
     let loading = false;
     let applyAllPluse = 0;
     let isMaintenanceMode = false;
@@ -80,6 +84,54 @@
     async function deleteData(data: PluginDataExDisplay): Promise<boolean> {
         return await addOn.deleteData(data);
     }
+    function askMode(evt: MouseEvent, title: string, key: string) {
+        const menu = new Menu();
+        menu.addItem((item) => item.setTitle(title).setIsLabel(true));
+        menu.addSeparator();
+        const prevMode = automaticList.get(key) ?? MODE_SELECTIVE;
+        for (const mode of [MODE_SELECTIVE, MODE_AUTOMATIC, MODE_PAUSED]) {
+            menu.addItem((item) => {
+                item.setTitle(`${getIcon(mode as SYNC_MODE)}:${TITLES[mode]}`)
+                    .onClick((e) => {
+                        if (mode === MODE_AUTOMATIC) {
+                            askOverwriteModeForAutomatic(evt, key);
+                        } else {
+                            setMode(key, mode as SYNC_MODE);
+                        }
+                    })
+                    .setChecked(prevMode == mode)
+                    .setDisabled(prevMode == mode);
+            });
+        }
+        menu.showAtMouseEvent(evt);
+    }
+    function applyAutomaticSync(key: string, direction: "pushForce" | "pullForce" | "safe") {
+        setMode(key, MODE_AUTOMATIC);
+        const configDir = normalizePath(plugin.app.vault.configDir);
+        const files = (plugin.settings.pluginSyncExtendedSetting[key]?.files ?? []).map((e) => `${configDir}/${e}`);
+        plugin.addOnHiddenFileSync.syncInternalFilesAndDatabase(direction, true, false, files);
+    }
+    function askOverwriteModeForAutomatic(evt: MouseEvent, key: string) {
+        const menu = new Menu();
+        menu.addItem((item) => item.setTitle("Initial Action").setIsLabel(true));
+        menu.addSeparator();
+        menu.addItem((item) => {
+            item.setTitle(`↑: Overwrite Remote`).onClick((e) => {
+                applyAutomaticSync(key, "pushForce");
+            });
+        })
+            .addItem((item) => {
+                item.setTitle(`↓: Overwrite Local`).onClick((e) => {
+                    applyAutomaticSync(key, "pullForce");
+                });
+            })
+            .addItem((item) => {
+                item.setTitle(`⇅: Use newer`).onClick((e) => {
+                    applyAutomaticSync(key, "safe");
+                });
+            });
+        menu.showAtMouseEvent(evt);
+    }
 
     $: options = {
         thisTerm,
@@ -92,11 +144,84 @@
         plugin,
         isMaintenanceMode,
     };
+
+    const ICON_EMOJI_PAUSED = `⛔`;
+    const ICON_EMOJI_AUTOMATIC = `✨`;
+    const ICON_EMOJI_SELECTIVE = `🔀`;
+
+    const ICONS: { [key: number]: string } = {
+        [MODE_SELECTIVE]: ICON_EMOJI_SELECTIVE,
+        [MODE_PAUSED]: ICON_EMOJI_PAUSED,
+        [MODE_AUTOMATIC]: ICON_EMOJI_AUTOMATIC,
+    };
+    const TITLES: { [key: number]: string } = {
+        [MODE_SELECTIVE]: "Selective",
+        [MODE_PAUSED]: "Ignore",
+        [MODE_AUTOMATIC]: "Automatic",
+    };
+    const PREFIX_PLUGIN_ALL = "PLUGIN_ALL";
+    const PREFIX_PLUGIN_DATA = "PLUGIN_DATA";
+    const PREFIX_PLUGIN_MAIN = "PLUGIN_MAIN";
+    function setMode(key: string, mode: SYNC_MODE) {
+        if (key.startsWith(PREFIX_PLUGIN_ALL + "/")) {
+            setMode(PREFIX_PLUGIN_DATA + key.substring(PREFIX_PLUGIN_ALL.length), mode);
+            setMode(PREFIX_PLUGIN_MAIN + key.substring(PREFIX_PLUGIN_ALL.length), mode);
+        }
+        const files = unique(
+            list
+                .filter((e) => `${e.category}/${e.name}` == key)
+                .map((e) => e.files)
+                .flat()
+                .map((e) => e.filename)
+        );
+        automaticList.set(key, mode);
+        automaticListDisp = automaticList;
+        if (!(key in plugin.settings.pluginSyncExtendedSetting)) {
+            plugin.settings.pluginSyncExtendedSetting[key] = {
+                key,
+                mode,
+                files: [],
+            };
+        }
+        plugin.settings.pluginSyncExtendedSetting[key].files = files;
+        plugin.settings.pluginSyncExtendedSetting[key].mode = mode;
+        plugin.saveSettingData();
+    }
+    function getIcon(mode: SYNC_MODE) {
+        if (mode in ICONS) {
+            return ICONS[mode];
+        } else {
+            ("");
+        }
+    }
+    let automaticList = new Map<string, SYNC_MODE>();
+    let automaticListDisp = new Map<string, SYNC_MODE>();
+
+    // apply current configuration to the dialogue
+    for (const { key, mode } of Object.values(plugin.settings.pluginSyncExtendedSetting)) {
+        automaticList.set(key, mode);
+    }
+
+    automaticListDisp = automaticList;
+
+    let displayKeys: Record<string, string[]> = {};
+
+    $: {
+        const extraKeys = Object.keys(plugin.settings.pluginSyncExtendedSetting);
+        displayKeys = [
+            ...list,
+            ...extraKeys
+                .map((e) => `${e}///`.split("/"))
+                .filter((e) => e[0] && e[1])
+                .map((e) => ({ category: e[0], name: e[1], displayName: e[1] })),
+        ]
+            .sort((a, b) => (a.displayName ?? a.name).localeCompare(b.displayName ?? b.name))
+            .reduce((p, c) => ({ ...p, [c.category]: unique(c.category in p ? [...p[c.category], c.displayName ?? c.name] : [c.displayName ?? c.name]) }), {} as Record<string, string[]>);
+    }
 </script>
 
 <div>
     <div>
-        <h1>Customization sync</h1>
         <div class="buttons">
             <button on:click={() => scanAgain()}>Scan changes</button>
             <button on:click={() => replicate()}>Sync once</button>
@@ -119,15 +244,24 @@
         {#if list.length == 0}
             <div class="center">No Items.</div>
         {:else}
-            {#each Object.entries(displays) as [key, label]}
+            {#each Object.entries(displays).filter(([key, _]) => key in displayKeys) as [key, label]}
                 <div>
                     <h3>{label}</h3>
-                    {#each groupBy(filterList(list, [key]), "name") as [name, listX]}
+                    {#each displayKeys[key] as name}
+                        {@const bindKey = `${key}/${name}`}
+                        {@const mode = automaticListDisp.get(bindKey) ?? MODE_SELECTIVE}
                         <div class="labelrow {hideEven ? 'hideeven' : ''}">
                             <div class="title">
-                                {name}
+                                <button class="status" on:click={(evt) => askMode(evt, `${key}/${name}`, bindKey)}>
+                                    {getIcon(mode)}
+                                </button>
+                                <span class="name">{name}</span>
                             </div>
-                            <PluginCombo {...options} list={listX} hidden={false} />
+                            {#if mode == MODE_SELECTIVE}
+                                <PluginCombo {...options} list={list.filter((e) => e.category == key && e.name == name)} hidden={false} />
+                            {:else}
+                                <div class="statusnote">{TITLES[mode]}</div>
+                            {/if}
                         </div>
                     {/each}
                 </div>
@@ -135,20 +269,55 @@
             <div>
                 <h3>Plugins</h3>
                 {#each groupBy(filterList(list, ["PLUGIN_MAIN", "PLUGIN_DATA", "PLUGIN_ETC"]), "name") as [name, listX]}
+                    {@const bindKeyAll = `${PREFIX_PLUGIN_ALL}/${name}`}
+                    {@const modeAll = automaticListDisp.get(bindKeyAll) ?? MODE_SELECTIVE}
+                    {@const bindKeyMain = `${PREFIX_PLUGIN_MAIN}/${name}`}
+                    {@const modeMain = automaticListDisp.get(bindKeyMain) ?? MODE_SELECTIVE}
+                    {@const bindKeyData = `${PREFIX_PLUGIN_DATA}/${name}`}
+                    {@const modeData = automaticListDisp.get(bindKeyData) ?? MODE_SELECTIVE}
                     <div class="labelrow {hideEven ? 'hideeven' : ''}">
                         <div class="title">
-                            {name}
+                            <button class="status" on:click={(evt) => askMode(evt, `${PREFIX_PLUGIN_ALL}/${name}`, bindKeyAll)}>
+                                {getIcon(modeAll)}
+                            </button>
+                            <span class="name">{name}</span>
                         </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} />
+                        {#if modeAll == MODE_SELECTIVE}
+                            <PluginCombo {...options} list={listX} hidden={true} />
+                        {/if}
                     </div>
+                    {#if modeAll == MODE_SELECTIVE}
+                        <div class="filerow {hideEven ? 'hideeven' : ''}">
+                            <div class="filetitle">
+                                <button class="status" on:click={(evt) => askMode(evt, `${PREFIX_PLUGIN_MAIN}/${name}/MAIN`, bindKeyMain)}>
+                                    {getIcon(modeMain)}
+                                </button>
+                                <span class="name">MAIN</span>
+                            </div>
+                            {#if modeMain == MODE_SELECTIVE}
+                                <PluginCombo {...options} list={filterList(listX, ["PLUGIN_MAIN"])} hidden={false} />
+                            {:else}
+                                <div class="statusnote">{TITLES[modeMain]}</div>
+                            {/if}
+                        </div>
+                        <div class="filerow {hideEven ? 'hideeven' : ''}">
+                            <div class="filetitle">
+                                <button class="status" on:click={(evt) => askMode(evt, `${PREFIX_PLUGIN_DATA}/${name}`, bindKeyData)}>
+                                    {getIcon(modeData)}
+                                </button>
+                                <span class="name">DATA</span>
+                            </div>
+                            {#if modeData == MODE_SELECTIVE}
+                                <PluginCombo {...options} list={filterList(listX, ["PLUGIN_DATA"])} hidden={false} />
+                            {:else}
+                                <div class="statusnote">{TITLES[modeData]}</div>
+                            {/if}
+                        </div>
+                    {:else}
+                        <div class="noterow">
+                            <div class="statusnote">{TITLES[modeAll]}</div>
+                        </div>
+                    {/if}
                 {/each}
             </div>
         {/if}
@@ -162,6 +331,15 @@
 </div>
 
 <style>
+    span.spacer {
+        min-width: 1px;
+        flex-grow: 1;
+    }
+    h3 {
+        position: sticky;
+        top: 0;
+        background-color: var(--modal-background);
+    }
     .labelrow {
         margin-left: 0.4em;
         display: flex;
@@ -183,6 +361,24 @@
     .labelrow.hideeven:has(.even) {
         display: none;
     }
+    .noterow {
+        min-height: 2em;
+        display: flex;
+    }
+    button.status {
+        flex-grow: 0;
+        margin: 2px 4px;
+        min-width: 3em;
+        max-width: 4em;
+    }
+    .statusnote {
+        display: flex;
+        justify-content: flex-end;
+        padding-right: var(--size-4-12);
+        align-items: center;
+        min-width: 10em;
+        flex-grow: 1;
+    }
 
     .title {
         color: var(--text-normal);

src/StorageEventManager.ts

@@ -18,7 +18,7 @@ type LiveSyncForStorageEventManager = Plugin &
     ignoreFiles: string[],
 } & {
     isTargetFile: (file: string | TAbstractFile) => Promise<boolean>,
-    procFileEvent: (applyBatch?: boolean) => Promise<boolean>,
+    procFileEvent: (applyBatch?: boolean) => Promise<any>,
 };
 
 

src/deps.ts

@@ -4,7 +4,7 @@ export {
     addIcon, App, debounce, Editor, FuzzySuggestModal, MarkdownRenderer, MarkdownView, Modal, Notice, Platform, Plugin, PluginSettingTab, requestUrl, sanitizeHTMLToDom, Setting, stringifyYaml, TAbstractFile, TextAreaComponent, TFile, TFolder,
     parseYaml, ItemView, WorkspaceLeaf
 } from "obsidian";
-export type { DataWriteOptions, PluginManifest, RequestUrlParam, RequestUrlResponse } from "obsidian";
+export type { DataWriteOptions, PluginManifest, RequestUrlParam, RequestUrlResponse, MarkdownFileInfo } from "obsidian";
 import {
     normalizePath as normalizePath_
 } from "obsidian";

src/dialogs.ts

@@ -20,6 +20,7 @@ export class PluginDialogModal extends Modal {
 
     onOpen() {
         const { contentEl } = this;
+        this.titleEl.setText("Customization Sync (Beta2)")
         if (this.component == null) {
             this.component = new PluginPane({
                 target: contentEl,
@@ -38,7 +39,7 @@ export class PluginDialogModal extends Modal {
 
 export class InputStringDialog extends Modal {
     result: string | false = false;
-    onSubmit: (result: string | boolean) => void;
+    onSubmit: (result: string | false) => void;
     title: string;
     key: string;
     placeholder: string;
@@ -56,8 +57,7 @@ export class InputStringDialog extends Modal {
 
     onOpen() {
         const { contentEl } = this;
-
-        contentEl.createEl("h1", { text: this.title });
+        this.titleEl.setText(this.title);
         // For enter to submit
         const formEl = contentEl.createEl("form");
         new Setting(formEl).setName(this.key).setClass(this.isPassword ? "password-input" : "normal-input").addText((text) =>
@@ -144,7 +144,7 @@ export class MessageBox extends Modal {
     timer: ReturnType<typeof setInterval> = undefined;
     defaultButtonComponent: ButtonComponent | undefined;
 
-    onSubmit: (result: string | boolean) => void;
+    onSubmit: (result: string | false) => 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);
@@ -175,13 +175,13 @@ export class MessageBox extends Modal {
 
     onOpen() {
         const { contentEl } = this;
+        this.titleEl.setText(this.title);
         contentEl.addEventListener("click", () => {
             if (this.timer) {
                 clearInterval(this.timer);
                 this.timer = undefined;
             }
         })
-        contentEl.createEl("h1", { text: this.title });
         const div = contentEl.createDiv();
         MarkdownRenderer.render(this.plugin.app, this.contentMd, div, "/", this.plugin);
         const buttonSetting = new Setting(contentEl);

src/main.ts

@@ -1,8 +1,8 @@
 const isDebug = false;
 
 import { type Diff, DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_patch } from "./deps";
-import { debounce, Notice, Plugin, TFile, addIcon, TFolder, normalizePath, TAbstractFile, Editor, MarkdownView, type RequestUrlParam, type RequestUrlResponse, requestUrl } from "./deps";
-import { type EntryDoc, type LoadedEntry, type ObsidianLiveSyncSettings, type diff_check_result, type diff_result_leaf, type EntryBody, LOG_LEVEL, VER, DEFAULT_SETTINGS, type diff_result, FLAGMD_REDFLAG, SYNCINFO_ID, SALT_OF_PASSPHRASE, type ConfigPassphraseStore, type CouchDBConnection, FLAGMD_REDFLAG2, FLAGMD_REDFLAG3, PREFIXMD_LOGFILE, type DatabaseConnectingStatus, type EntryHasPath, type DocumentID, type FilePathWithPrefix, type FilePath, type AnyEntry, LOG_LEVEL_DEBUG, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_URGENT, LOG_LEVEL_VERBOSE } from "./lib/src/types";
+import { debounce, Notice, Plugin, TFile, addIcon, TFolder, normalizePath, TAbstractFile, Editor, MarkdownView, type RequestUrlParam, type RequestUrlResponse, requestUrl, type MarkdownFileInfo } from "./deps";
+import { type EntryDoc, type LoadedEntry, type ObsidianLiveSyncSettings, type diff_check_result, type diff_result_leaf, type EntryBody, LOG_LEVEL, VER, DEFAULT_SETTINGS, type diff_result, FLAGMD_REDFLAG, SYNCINFO_ID, SALT_OF_PASSPHRASE, type ConfigPassphraseStore, type CouchDBConnection, FLAGMD_REDFLAG2, FLAGMD_REDFLAG3, PREFIXMD_LOGFILE, type DatabaseConnectingStatus, type EntryHasPath, type DocumentID, type FilePathWithPrefix, type FilePath, type AnyEntry, LOG_LEVEL_DEBUG, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_URGENT, LOG_LEVEL_VERBOSE, } from "./lib/src/types";
 import { type InternalFileInfo, type queueItem, type CacheData, type FileEventItem, FileWatchEventQueueMax } from "./types";
 import { arrayToChunkedArray, getDocData, isDocContentSame } from "./lib/src/utils";
 import { Logger, setGlobalLogFunction } from "./lib/src/logger";
@@ -10,15 +10,15 @@ import { PouchDB } from "./lib/src/pouchdb-browser.js";
 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, isInternalMetadata, isPluginMetadata, stripInternalMetadataPrefix, isChunk, askSelectString, askYesNo, askString, PeriodicProcessor, clearTouched, getPath, getPathWithoutPrefix, getPathFromTFile, performRebuildDB } 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, performRebuildDB, memoIfNotExist, memoObject, retrieveMemoObject, disposeMemoObject, isCustomisationSyncMetadata } from "./utils";
 import { encrypt, tryDecrypt } from "./lib/src/e2ee_v2";
 import { balanceChunkPurgedDBs, enableEncryption, isCloudantURI, isErrorOfMissingDoc, isValidRemoteCouchDBURI, purgeUnreferencedChunks } from "./lib/src/utils_couchdb";
 import { getGlobalStore, ObservableStore, observeStores } from "./lib/src/store";
 import { lockStore, logMessageStore, logStore, type LogEntry } from "./lib/src/stores";
 import { setNoticeClass } from "./lib/src/wrapper";
-import { base64ToString, versionNumberString2Number, base64ToArrayBuffer, arrayBufferToBase64 } from "./lib/src/strbin";
+import { versionNumberString2Number, writeString, decodeBinary, encodeBinary, readString } from "./lib/src/strbin";
 import { addPrefix, isAcceptedAll, isPlainText, shouldBeIgnored, stripAllPrefixes } from "./lib/src/path";
-import { isLockAcquired, runWithLock } from "./lib/src/lock";
+import { isLockAcquired, serialized, skipIfDuplicated } from "./lib/src/lock";
 import { Semaphore } from "./lib/src/semaphore";
 import { StorageEventManager, StorageEventManagerObsidian } from "./StorageEventManager";
 import { LiveSyncLocalDB, type LiveSyncLocalDBEnv } from "./lib/src/LiveSyncLocalDB";
@@ -43,16 +43,29 @@ setGlobalLogFunction((message: any, level?: LOG_LEVEL, key?: string) => {
 });
 logStore.intercept(e => e.slice(Math.min(e.length - 200, 0)));
 
+async function fetchByAPI(request: RequestUrlParam): Promise<RequestUrlResponse> {
+    const ret = await requestUrl(request);
+    if (ret.status - (ret.status % 100) !== 200) {
+        const er: Error & { status?: number } = new Error(`Request Error:${ret.status}`);
+        if (ret.json) {
+            er.message = ret.json.reason;
+            er.name = `${ret.json.error ?? ""}:${ret.json.message ?? ""}`;
+        }
+        er.status = ret.status;
+        throw er;
+    }
+    return ret;
+}
 export default class ObsidianLiveSyncPlugin extends Plugin
     implements LiveSyncLocalDBEnv, LiveSyncReplicatorEnv {
 
-    settings: ObsidianLiveSyncSettings;
-    localDatabase: LiveSyncLocalDB;
-    replicator: LiveSyncDBReplicator;
+    settings!: ObsidianLiveSyncSettings;
+    localDatabase!: LiveSyncLocalDB;
+    replicator!: LiveSyncDBReplicator;
 
-    statusBar: HTMLElement;
-    suspended: boolean;
-    deviceAndVaultName: string;
+    statusBar?: HTMLElement;
+    suspended = false;
+    deviceAndVaultName = "";
     isMobile = false;
     isReady = false;
     packageVersion = "";
@@ -67,25 +80,15 @@ export default class ObsidianLiveSyncPlugin extends Plugin
     periodicSyncProcessor = new PeriodicProcessor(this, async () => await this.replicate());
 
     // implementing interfaces
-    kvDB: KeyValueDatabase;
+    kvDB!: KeyValueDatabase;
     last_successful_post = false;
     getLastPostFailedBySize() {
         return !this.last_successful_post;
     }
 
-    async fetchByAPI(request: RequestUrlParam): Promise<RequestUrlResponse> {
-        const ret = await requestUrl(request);
-        if (ret.status - (ret.status % 100) !== 200) {
-            const er: Error & { status?: number } = new Error(`Request Error:${ret.status}`);
-            if (ret.json) {
-                er.message = ret.json.reason;
-                er.name = `${ret.json.error ?? ""}:${ret.json.message ?? ""}`;
-            }
-            er.status = ret.status;
-            throw er;
-        }
-        return ret;
-    }
+
+    _unloaded = false;
+
     getDatabase(): PouchDB.Database<EntryDoc> {
         return this.localDatabase.localDatabase;
     }
@@ -103,7 +106,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         if (uri.indexOf(" ") !== -1) return "Remote URI and database name could not contain spaces.";
         let authHeader = "";
         if (auth.username && auth.password) {
-            const utf8str = String.fromCharCode.apply(null, new TextEncoder().encode(`${auth.username}:${auth.password}`));
+            const utf8str = String.fromCharCode.apply(null, [...writeString(`${auth.username}:${auth.password}`)]);
             const encoded = window.btoa(utf8str);
             authHeader = "Basic " + encoded;
         } else {
@@ -115,11 +118,11 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             adapter: "http",
             auth,
             skip_setup: !performSetup,
-            fetch: async (url: string | Request, opts: RequestInit) => {
+            fetch: async (url: string | Request, opts?: RequestInit) => {
                 let size = "";
                 const localURL = url.toString().substring(uri.length);
-                const method = opts.method ?? "GET";
-                if (opts.body) {
+                const method = opts?.method ?? "GET";
+                if (opts?.body) {
                     const opts_length = opts.body.toString().length;
                     if (opts_length > 1000 * 1000 * 10) {
                         // over 10MB
@@ -132,10 +135,10 @@ export default class ObsidianLiveSyncPlugin extends Plugin
                     size = ` (${opts_length})`;
                 }
 
-                if (!disableRequestURI && typeof url == "string" && typeof (opts.body ?? "") == "string") {
-                    const body = opts.body as string;
+                if (!disableRequestURI && typeof url == "string" && typeof (opts?.body ?? "") == "string") {
+                    const body = opts?.body as string;
 
-                    const transformedHeaders = { ...(opts.headers as Record<string, string>) };
+                    const transformedHeaders = { ...(opts?.headers as Record<string, string>) };
                     if (authHeader != "") transformedHeaders["authorization"] = authHeader;
                     delete transformedHeaders["host"];
                     delete transformedHeaders["Host"];
@@ -143,7 +146,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
                     delete transformedHeaders["Content-Length"];
                     const requestParam: RequestUrlParam = {
                         url,
-                        method: opts.method,
+                        method: opts?.method,
                         body: body,
                         headers: transformedHeaders,
                         contentType: "application/json",
@@ -151,7 +154,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
                     };
 
                     try {
-                        const r = await this.fetchByAPI(requestParam);
+                        const r = await fetchByAPI(requestParam);
                         if (method == "POST" || method == "PUT") {
                             this.last_successful_post = r.status - (r.status % 100) == 200;
                         } else {
@@ -201,7 +204,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
 
         const db: PouchDB.Database<EntryDoc> = new PouchDB<EntryDoc>(uri, conf);
         if (passphrase !== "false" && typeof passphrase === "string") {
-            enableEncryption(db, passphrase, useDynamicIterationCount);
+            enableEncryption(db, passphrase, useDynamicIterationCount, false, this.settings.useV1);
         }
         if (skipInfo) {
             return { db: db, info: { db_name: "", doc_count: 0, update_seq: "" } };
@@ -209,9 +212,9 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         try {
             const info = await db.info();
             return { db: db, info: info };
-        } catch (ex) {
-            let msg = `${ex.name}:${ex.message}`;
-            if (ex.name == "TypeError" && ex.message == "Failed to fetch") {
+        } catch (ex: any) {
+            let msg = `${ex?.name}:${ex?.message}`;
+            if (ex?.name == "TypeError" && ex?.message == "Failed to fetch") {
                 msg += "\n**Note** This error caused by many reasons. The only sure thing is you didn't touch the server.\nTo check details, open inspector.";
             }
             Logger(ex, LOG_LEVEL_VERBOSE);
@@ -219,7 +222,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         }
     }
 
-    id2path(id: DocumentID, entry: EntryHasPath, stripPrefix?: boolean): FilePathWithPrefix {
+    id2path(id: DocumentID, entry?: EntryHasPath, stripPrefix?: boolean): FilePathWithPrefix {
         const tempId = id2path(id, entry);
         if (stripPrefix && isInternalMetadata(tempId)) {
             const out = stripInternalMetadataPrefix(tempId);
@@ -234,18 +237,19 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         return getPathWithoutPrefix(entry);
     }
     async path2id(filename: FilePathWithPrefix | FilePath, prefix?: string): Promise<DocumentID> {
-        const destPath = addPrefix(filename, prefix);
+        const destPath = addPrefix(filename, prefix ?? "");
         return await path2id(destPath, this.settings.usePathObfuscation ? this.settings.passphrase : "");
     }
 
-    createPouchDBInstance<T>(name?: string, options?: PouchDB.Configuration.DatabaseConfiguration): PouchDB.Database<T> {
+    createPouchDBInstance<T extends object>(name?: string, options?: PouchDB.Configuration.DatabaseConfiguration): PouchDB.Database<T> {
+        const optionPass = options ?? {};
         if (this.settings.useIndexedDBAdapter) {
-            options.adapter = "indexeddb";
+            optionPass.adapter = "indexeddb";
             //@ts-ignore :missing def
-            options.purged_infos_limit = 1;
-            return new PouchDB(name + "-indexeddb", options);
+            optionPass.purged_infos_limit = 1;
+            return new PouchDB(name + "-indexeddb", optionPass);
         }
-        return new PouchDB(name, options);
+        return new PouchDB(name, optionPass);
     }
     beforeOnUnload(db: LiveSyncLocalDB): void {
         this.kvDB.close();
@@ -258,6 +262,8 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         this.replicator = new LiveSyncDBReplicator(this);
     }
     async onResetDatabase(db: LiveSyncLocalDB): Promise<void> {
+        const lsKey = "obsidian-livesync-queuefiles-" + this.getVaultName();
+        localStorage.removeItem(lsKey);
         await this.kvDB.destroy();
         this.kvDB = await OpenKeyValueDatabase(db.dbname + "-livesync-kv");
         this.replicator = new LiveSyncDBReplicator(this);
@@ -320,7 +326,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         }
     }
 
-    showHistory(file: TFile | FilePathWithPrefix, id: DocumentID) {
+    showHistory(file: TFile | FilePathWithPrefix, id?: DocumentID) {
         new DocumentHistoryModal(this.app, this, file, id).open();
     }
 
@@ -334,7 +340,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         const target = await askSelectString(this.app, "File to view History", notesList);
         if (target) {
             const targetId = notes.find(e => e.dispPath == target);
-            this.showHistory(targetId.path, undefined);
+            this.showHistory(targetId.path, targetId.id);
         }
     }
     async pickFileForResolve() {
@@ -349,7 +355,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             Logger("There are no conflicted documents", LOG_LEVEL_NOTICE);
             return false;
         }
-        const target = await askSelectString(this.app, "File to view History", notesList);
+        const target = await askSelectString(this.app, "File to resolve conflict", notesList);
         if (target) {
             const targetItem = notes.find(e => e.dispPath == target);
             await this.resolveConflicted(targetItem.path);
@@ -363,6 +369,8 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             await this.addOnHiddenFileSync.resolveConflictOnInternalFile(target);
         } else if (isPluginMetadata(target)) {
             await this.resolveConflictByNewerEntry(target);
+        } else if (isCustomisationSyncMetadata(target)) {
+            await this.resolveConflictByNewerEntry(target);
         } else {
             await this.showIfConflicted(target);
         }
@@ -396,6 +404,10 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         Logger(`Checking expired file history done`);
     }
     async onLayoutReady() {
+        if (this.settings.useV1 === undefined) {
+            this.settings.useV1 = await this.askEnableV2();
+            await this.saveSettingData();
+        }
         this.registerFileWatchEvents();
         if (!this.localDatabase.isReady) {
             Logger(`Something went wrong! The local database is not ready`, LOG_LEVEL_NOTICE);
@@ -451,8 +463,9 @@ export default class ObsidianLiveSyncPlugin extends Plugin
                     return false;
                 }
             }
-            await this.realizeSettingSyncMode();
             this.registerWatchEvents();
+            await this.realizeSettingSyncMode();
+            this.swapSaveCommand();
             if (this.settings.syncOnStart) {
                 this.replicator.openReplication(this.settings, false, false);
             }
@@ -474,7 +487,15 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             notes.push({ path: this.getPath(doc), mtime: doc.mtime });
         }
         if (notes.length > 0) {
-            Logger(`Some files have been left conflicted! Please resolve them by "Pick a file to resolve conflict". The list is written in the log.`, LOG_LEVEL_NOTICE);
+            this.askInPopup(`conflicting-detected-on-safety`, `Some files have been left conflicted! Press {HERE} to resolve them, or you can do it later by "Pick a file to resolve conflict`, (anchor) => {
+                anchor.text = "HERE";
+                anchor.addEventListener("click", () => {
+                    // @ts-ignore
+                    this.app.commands.executeCommandById("obsidian-livesync:livesync-all-conflictcheck");
+                });
+            }
+            );
+            Logger(`Some files have been left conflicted! Please resolve them by "Pick a file to resolve conflict". The list is written in the log.`, LOG_LEVEL_VERBOSE);
             for (const note of notes) {
                 Logger(`Conflicted: ${note.path}`);
             }
@@ -483,6 +504,16 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         }
         Logger(`Additional safety scan done`, LOG_LEVEL_VERBOSE);
     }
+    async askEnableV2() {
+        const message = `Since v0.20.0, Self-hosted LiveSync uses a new format for binary files and encrypted things. In the new format, files are split at meaningful delimitations, increasing the effectiveness of deduplication.
+However, the new format lacks compatibility with LiveSync before v0.20.0 and related projects. Basically enabling V2 is recommended. but If you are using some related products, stay in a while, please!
+Note: We can always able to read V1 format. It will be progressively converted. And, we can change this toggle later.`
+        const CHOICE_V2 = "Enable v2";
+        const CHOICE_V1 = "Keep v1";
+
+        const ret = await confirmWithMessage(this, "binary and encryption", message, [CHOICE_V2, CHOICE_V1], CHOICE_V1, 40);
+        return ret == CHOICE_V1;
+    }
 
     async onload() {
         logStore.subscribe(e => this.addLog(e.message, e.level, e.key));
@@ -504,6 +535,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         if (lastVersion > this.settings.lastReadUpdates) {
             Logger("Self-hosted LiveSync has undergone a major upgrade. Please open the setting dialog, and check the information pane.", LOG_LEVEL_NOTICE);
         }
+
         //@ts-ignore
         if (this.app.isMobile) {
             this.isMobile = true;
@@ -512,6 +544,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         if (last_version && Number(last_version) < VER) {
             this.settings.liveSync = false;
             this.settings.syncOnSave = false;
+            this.settings.syncOnEditorSave = false;
             this.settings.syncOnStart = false;
             this.settings.syncOnFileOpen = false;
             this.settings.syncAfterMerge = false;
@@ -558,7 +591,13 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         this.addRibbonIcon("view-log", "Show log", () => {
             this.showView(VIEW_TYPE_LOG);
         });
-
+        this.addCommand({
+            id: "view-log",
+            name: "Show log",
+            callback: () => {
+                this.showView(VIEW_TYPE_LOG);
+            }
+        });
         this.addSettingTab(new ObsidianLiveSyncSettingTab(this.app, this));
         this.app.workspace.onLayoutReady(this.onLayoutReady.bind(this));
 
@@ -572,15 +611,19 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         this.addCommand({
             id: "livesync-dump",
             name: "Dump information of this doc ",
-            editorCallback: (editor: Editor, view: MarkdownView) => {
-                this.localDatabase.getDBEntry(getPathFromTFile(view.file), {}, true, false);
+            editorCallback: (editor: Editor, view: MarkdownView | MarkdownFileInfo) => {
+                const file = view.file;
+                if (!file) return;
+                this.localDatabase.getDBEntry(getPathFromTFile(file), {}, true, false);
             },
         });
         this.addCommand({
             id: "livesync-checkdoc-conflicted",
             name: "Resolve if conflicted.",
-            editorCallback: async (editor: Editor, view: MarkdownView) => {
-                await this.showIfConflicted(getPathFromTFile(view.file));
+            editorCallback: async (editor: Editor, view: MarkdownView | MarkdownFileInfo) => {
+                const file = view.file;
+                if (!file) return;
+                await this.showIfConflicted(getPathFromTFile(file));
             },
         });
 
@@ -617,8 +660,8 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         this.addCommand({
             id: "livesync-history",
             name: "Show history",
-            editorCallback: (editor: Editor, view: MarkdownView) => {
-                this.showHistory(view.file, null);
+            editorCallback: (editor: Editor, view: MarkdownView | MarkdownFileInfo) => {
+                if (view.file) this.showHistory(view.file, null);
             },
         });
         this.addCommand({
@@ -720,6 +763,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         }
         cancelAllPeriodicTask();
         cancelAllTasks();
+        this._unloaded = true;
         Logger("unloading plugin");
     }
 
@@ -768,7 +812,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
 
     async encryptConfigurationItem(src: string, settings: ObsidianLiveSyncSettings) {
         if (this.usedPassphrase != "") {
-            return await encrypt(src, this.usedPassphrase + SALT_OF_PASSPHRASE, false);
+            return await encrypt(src, this.usedPassphrase + SALT_OF_PASSPHRASE, false, true);
         }
 
         const passphrase = await this.getPassphrase(settings);
@@ -776,7 +820,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             Logger("Could not determine passphrase to save data.json! You probably make the configuration sure again!", LOG_LEVEL_URGENT);
             return "";
         }
-        const dec = await encrypt(src, passphrase + SALT_OF_PASSPHRASE, false);
+        const dec = await encrypt(src, passphrase + SALT_OF_PASSPHRASE, false, true);
         if (dec) {
             this.usedPassphrase = passphrase;
             return dec;
@@ -852,7 +896,8 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         (async () => await this.realizeSettingSyncMode())();
     }
 
-    async saveSettings() {
+
+    async saveSettingData() {
         const lsKey = "obsidian-live-sync-vaultanddevicename-" + this.getVaultName();
 
         localStorage.setItem(lsKey, this.deviceAndVaultName || "");
@@ -882,6 +927,10 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         await this.saveData(settings);
         this.localDatabase.settings = this.settings;
         this.ignoreFiles = this.settings.ignoreFiles.split(",").map(e => e.trim());
+    }
+
+    async saveSettings() {
+        await this.saveSettingData();
         this.triggerRealizeSettingSyncMode();
     }
 
@@ -889,7 +938,38 @@ export default class ObsidianLiveSyncPlugin extends Plugin
     registerFileWatchEvents() {
         this.vaultManager = new StorageEventManagerObsidian(this)
     }
-
+    _initialCallback: any;
+    swapSaveCommand() {
+        Logger("Modifying callback of the save command", LOG_LEVEL_VERBOSE);
+        const saveCommandDefinition = (this.app as any).commands?.commands?.[
+            "editor:save-file"
+        ];
+        const save = saveCommandDefinition?.callback;
+        if (typeof save === "function") {
+            this._initialCallback = save;
+            saveCommandDefinition.callback = () => {
+                scheduleTask("syncOnEditorSave", 250, () => {
+                    if (this._unloaded) {
+                        Logger("Unload and remove the handler.", LOG_LEVEL_VERBOSE);
+                        saveCommandDefinition.callback = this._initialCallback;
+                    } else {
+                        Logger("Sync on Editor Save.", LOG_LEVEL_VERBOSE);
+                        if (this.settings.syncOnEditorSave) {
+                            this.replicate();
+                        }
+                    }
+                });
+                save();
+            };
+        }
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const _this = this;
+        //@ts-ignore
+        window.CodeMirrorAdapter.commands.save = () => {
+            //@ts-ignore
+            _this.app.commands.executeCommandById('editor:save-file');
+        };
+    }
     registerWatchEvents() {
         this.registerEvent(this.app.workspace.on("file-open", this.watchWorkspaceOpen));
         this.registerDomEvent(document, "visibilitychange", this.watchWindowVisibility);
@@ -949,7 +1029,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             }
         }
         cancelTask("applyBatchAuto");
-        const ret = await runWithLock("procFiles", true, async () => {
+        const ret = await skipIfDuplicated("procFiles", async () => {
             do {
                 const queue = this.vaultManager.fetchEvent();
                 if (queue === false) break;
@@ -1004,9 +1084,10 @@ export default class ObsidianLiveSyncPlugin extends Plugin
     }
 
 
-    watchWorkspaceOpen(file: TFile) {
+    watchWorkspaceOpen(file: TFile | null) {
         if (this.settings.suspendFileWatching) return;
         if (!this.isReady) return;
+        if (!file) return;
         this.watchWorkspaceOpenAsync(file);
     }
 
@@ -1204,7 +1285,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             Logger(msg + "ERROR, invalid path: " + path, LOG_LEVEL_NOTICE);
             return;
         }
-        const writeData = doc.datatype == "newnote" ? base64ToArrayBuffer(doc.data) : getDocData(doc.data);
+        const writeData = doc.datatype == "newnote" ? decodeBinary(doc.data) : getDocData(doc.data);
         await this.ensureDirectoryEx(path);
         try {
             let outFile;
@@ -1269,7 +1350,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
                 const path = getPath(entry);
                 try {
                     const releaser = await semaphore.acquire(1);
-                    runWithLock(`dbchanged-${path}`, false, async () => {
+                    serialized(`dbchanged-${path}`, async () => {
                         Logger(`Applying ${path} (${entry._id}: ${entry._rev}) change...`, LOG_LEVEL_VERBOSE);
                         await this.handleDBChangedAsync(entry);
                         Logger(`Applied ${path} (${entry._id}:${entry._rev}) change...`);
@@ -1355,10 +1436,10 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             const now = new Date().getTime();
             if (queue.missingChildren.length == 0) {
                 queue.done = true;
-                if (isInternalMetadata(queue.entry._id)) {
+                if (isInternalMetadata(queue.entry._id) && this.settings.syncInternalFiles) {
                     //system file
                     const filename = this.getPathWithoutPrefix(queue.entry);
-                    this.addOnHiddenFileSync.procInternalFile(filename);
+                    this.isTargetFile(filename).then((ret) => ret ? this.addOnHiddenFileSync.procInternalFile(filename) : Logger(`Skipped (Not target:${filename})`, LOG_LEVEL_VERBOSE));
                 } else if (isValidPath(this.getPath(queue.entry))) {
                     this.handleDBChanged(queue.entry);
                 } else {
@@ -1400,7 +1481,14 @@ export default class ObsidianLiveSyncPlugin extends Plugin
         if (!await 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 (isInternalMetadata(doc._id) && !this.settings.syncInternalFiles) return;
+        if (isInternalMetadata(doc._id) && !this.settings.syncInternalFiles) {
+            Logger(`Skipped: ${path} (${doc._id}, ${doc._rev}) Hidden file sync is disabled.`, LOG_LEVEL_VERBOSE);
+            return;
+        }
+        if (isCustomisationSyncMetadata(doc._id) && !this.settings.usePluginSync) {
+            Logger(`Skipped: ${path} (${doc._id}, ${doc._rev}) Customization sync is disabled.`, LOG_LEVEL_VERBOSE);
+            return;
+        }
         // It is better for your own safety, not to handle the following files
         const ignoreFiles = [
             "_design/replicate",
@@ -1474,12 +1562,22 @@ export default class ObsidianLiveSyncPlugin extends Plugin
 
             if (change.type != "leaf" && change.type != "versioninfo" && change.type != "milestoneinfo" && change.type != "nodeinfo") {
                 if (this.settings.suspendParseReplicationResult) {
+                    if (isInternalMetadata(change._id) && !this.settings.syncInternalFiles) {
+                        continue;
+                    }
+                    if (isCustomisationSyncMetadata(change._id) && !this.settings.usePluginSync) {
+                        continue;
+                    }
+                    if (!change.path) {
+                        continue;
+                    }
                     const newQueue = {
                         entry: change,
                         missingChildren: [] as string[],
                         timeout: 0,
                     };
                     Logger(`Processing scheduled: ${change.path}`, LOG_LEVEL_INFO);
+                    this.queuedFiles = this.queuedFiles.filter(e => e.entry.path != change.path);
                     this.queuedFiles.push(newQueue);
                     this.saveQueuedFiles();
                     continue;
@@ -1646,7 +1744,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin
             if (this.replicator.remoteLockedAndDeviceNotAccepted) {
                 if (this.replicator.remoteCleaned && this.settings.useIndexedDBAdapter) {
                     Logger(`The remote database has been cleaned.`, showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO);
-                    await runWithLock("cleanup", true, async () => {
+                    await skipIfDuplicated("cleanup", async () => {
                         const count = await purgeUnreferencedChunks(this.localDatabase.localDatabase, true);
                         const message = `The remote database has been cleaned up.
 To synchronize, this device must be also cleaned up. ${count} chunk(s) will be erased from this device.
@@ -1870,7 +1968,7 @@ Or if you are sure know what had been happened, we can unlock the database from
             if (doc === false) return false;
             let data = getDocData(doc.data)
             if (doc.datatype == "newnote") {
-                data = base64ToString(data);
+                data = readString(new Uint8Array(decodeBinary(doc.data)));
             } else if (doc.datatype == "plain") {
                 // NO OP.
             }
@@ -2172,18 +2270,11 @@ Or if you are sure know what had been happened, we can unlock the database from
             Logger(`could not get old revisions, automatically used newer one:${path}`, LOG_LEVEL_NOTICE);
             return true;
         }
-        // first, check for same contents and deletion status.
-        if (leftLeaf.data == rightLeaf.data && leftLeaf.deleted == rightLeaf.deleted) {
-            let leaf = leftLeaf;
-            if (leftLeaf.mtime > rightLeaf.mtime) {
-                leaf = rightLeaf;
-            }
-            await this.localDatabase.deleteDBEntry(path, { rev: leaf.rev });
-            await this.pullFile(path, null, true);
-            Logger(`automatically merged:${path}`);
-            return true;
-        }
-        if (this.settings.resolveConflictsByNewerFile) {
+
+        const isSame = leftLeaf.data == rightLeaf.data && leftLeaf.deleted == rightLeaf.deleted;
+        const isBinary = !isPlainText(path);
+        const alwaysNewer = this.settings.resolveConflictsByNewerFile;
+        if (isSame || isBinary || alwaysNewer) {
             const lMtime = ~~(leftLeaf.mtime / 1000);
             const rMtime = ~~(rightLeaf.mtime / 1000);
             let loser = leftLeaf;
@@ -2192,7 +2283,7 @@ Or if you are sure know what had been happened, we can unlock the database from
             }
             await this.localDatabase.deleteDBEntry(path, { rev: loser.rev });
             await this.pullFile(path, null, true);
-            Logger(`Automatically merged (newerFileResolve) :${path}`, LOG_LEVEL_NOTICE);
+            Logger(`Automatically merged (${isSame ? "same," : ""}${isBinary ? "binary," : ""}${alwaysNewer ? "alwaysNewer" : ""}) :${path}`, LOG_LEVEL_NOTICE);
             return true;
         }
         // make diff.
@@ -2208,7 +2299,7 @@ Or if you are sure know what had been happened, we can unlock the database from
     }
 
     showMergeDialog(filename: FilePathWithPrefix, conflictCheckResult: diff_result): Promise<boolean> {
-        return runWithLock("resolve-conflict:" + filename, false, () =>
+        return serialized("resolve-conflict:" + filename, () =>
             new Promise((res, rej) => {
                 Logger("open conflict dialog", LOG_LEVEL_VERBOSE);
                 new ConflictResolveModal(this.app, filename, conflictCheckResult, async (selected) => {
@@ -2287,7 +2378,7 @@ Or if you are sure know what had been happened, we can unlock the database from
     }
 
     async showIfConflicted(filename: FilePathWithPrefix) {
-        await runWithLock("conflicted", false, async () => {
+        await serialized("conflicted", async () => {
             const conflictCheckResult = await this.getConflictedStatus(filename);
             if (conflictCheckResult === false) {
                 //nothing to do.
@@ -2397,7 +2488,7 @@ Or if you are sure know what had been happened, we can unlock the database from
                 const contentBin = await this.app.vault.readBinary(file);
                 Logger(`Processing: ${file.path}`, LOG_LEVEL_VERBOSE);
                 try {
-                    content = await arrayBufferToBase64(contentBin);
+                    content = await encodeBinary(contentBin, this.settings.useV1);
                 } catch (ex) {
                     Logger(`The file ${file.path} could not be encoded`);
                     Logger(ex, LOG_LEVEL_VERBOSE);
@@ -2412,7 +2503,7 @@ Or if you are sure know what had been happened, we can unlock the database from
             if (cache instanceof ArrayBuffer) {
                 Logger(`Processing: ${file.path}`, LOG_LEVEL_VERBOSE);
                 try {
-                    content = await arrayBufferToBase64(cache);
+                    content = await encodeBinary(cache, this.settings.useV1);
                 } catch (ex) {
                     Logger(`The file ${file.path} could not be encoded`);
                     Logger(ex, LOG_LEVEL_VERBOSE);
@@ -2439,7 +2530,7 @@ Or if you are sure know what had been happened, we can unlock the database from
         };
         //upsert should locked
         const msg = `DB <- STORAGE (${datatype}) `;
-        const isNotChanged = await runWithLock("file-" + fullPath, false, async () => {
+        const isNotChanged = await serialized("file-" + fullPath, async () => {
             if (recentlyTouched(file)) {
                 return true;
             }
@@ -2608,7 +2699,7 @@ Or if you are sure know what had been happened, we can unlock the database from
         return this.localDatabase.isTargetFile(filepath);
     }
     async dryRunGC() {
-        await runWithLock("cleanup", true, async () => {
+        await skipIfDuplicated("cleanup", async () => {
             const remoteDBConn = await this.getReplicator().connectRemoteCouchDBWithSetting(this.settings, this.isMobile)
             if (typeof (remoteDBConn) == "string") {
                 Logger(remoteDBConn);
@@ -2622,7 +2713,7 @@ Or if you are sure know what had been happened, we can unlock the database from
 
     async dbGC() {
         // Lock the remote completely once.
-        await runWithLock("cleanup", true, async () => {
+        await skipIfDuplicated("cleanup", async () => {
             this.getReplicator().markRemoteLocked(this.settings, true, true);
             const remoteDBConn = await this.getReplicator().connectRemoteCouchDBWithSetting(this.settings, this.isMobile)
             if (typeof (remoteDBConn) == "string") {
@@ -2637,5 +2728,41 @@ Or if you are sure know what had been happened, we can unlock the database from
             Logger("The remote database has been cleaned up! Other devices will be cleaned up on the next synchronisation.")
         });
     }
+
+
+    askInPopup(key: string, dialogText: string, anchorCallback: (anchor: HTMLAnchorElement) => void) {
+
+        const fragment = createFragment((doc) => {
+
+            const [beforeText, afterText] = dialogText.split("{HERE}", 2);
+            doc.createEl("span", null, (a) => {
+                a.appendText(beforeText);
+                a.appendChild(a.createEl("a", null, (anchor) => {
+                    anchorCallback(anchor);
+                }));
+
+                a.appendText(afterText);
+            });
+        });
+        const popupKey = "popup-" + key;
+        scheduleTask(popupKey, 1000, async () => {
+            const popup = await memoIfNotExist(popupKey, () => new Notice(fragment, 0));
+            //@ts-ignore
+            const isShown = popup?.noticeEl?.isShown();
+            if (!isShown) {
+                memoObject(popupKey, new Notice(fragment, 0));
+            }
+            scheduleTask(popupKey + "-close", 20000, () => {
+                const popup = retrieveMemoObject<Notice>(popupKey);
+                if (!popup)
+                    return;
+                //@ts-ignore
+                if (popup?.noticeEl?.isShown()) {
+                    popup.hide();
+                }
+                disposeMemoObject(popupKey);
+            });
+        });
+    }
 }
 

src/utils.ts

@@ -3,9 +3,10 @@ import { path2id_base, id2path_base, isValidFilenameInLinux, isValidFilenameInDa
 
 import { Logger } from "./lib/src/logger";
 import { LOG_LEVEL_VERBOSE, type AnyEntry, type DocumentID, type EntryHasPath, type FilePath, type FilePathWithPrefix } from "./lib/src/types";
-import { CHeader, ICHeader, ICHeaderLength, PSCHeader } from "./types";
+import { CHeader, ICHeader, ICHeaderLength, ICXHeader, PSCHeader } from "./types";
 import { InputStringDialog, PopoverSelectString } from "./dialogs";
 import ObsidianLiveSyncPlugin from "./main";
+import { writeString } from "./lib/src/strbin";
 
 // For backward compatibility, using the path for determining id.
 // Only CouchDB unacceptable ID (that starts with an underscore) has been prefixed with "/".
@@ -387,6 +388,9 @@ export function isChunk(str: string): boolean {
 export function isPluginMetadata(str: string): boolean {
     return str.startsWith(PSCHeader);
 }
+export function isCustomisationSyncMetadata(str: string): boolean {
+    return str.startsWith(ICXHeader);
+}
 
 export const askYesNo = (app: App, message: string): Promise<"yes" | "no"> => {
     return new Promise((res) => {
@@ -440,7 +444,7 @@ export class PeriodicProcessor {
 }
 
 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 utf8str = String.fromCharCode.apply(null, [...writeString(`${username}:${password}`)]);
     const encoded = window.btoa(utf8str);
     const authHeader = "Basic " + encoded;
     const transformedHeaders: Record<string, string> = { authorization: authHeader, "content-type": "application/json" };
@@ -456,7 +460,7 @@ export const _requestToCouchDBFetch = async (baseUri: string, username: string,
 }
 
 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 utf8str = String.fromCharCode.apply(null, [...writeString(`${username}:${password}`)]);
     const encoded = window.btoa(utf8str);
     const authHeader = "Basic " + encoded;
     const transformedHeaders: Record<string, string> = { authorization: authHeader, origin: origin };

updates.md

@@ -1,56 +1,43 @@
-### 0.19.0
+### 0.20.0
 
-#### Customization sync
+At 0.20.0, Self-hosted LiveSync has changed the binary file format and encrypting format, for efficient synchronisation.  
+The dialogue will be shown and asks us to decide whether to keep v1 or use v2. Once we have enabled v2, all subsequent edits will be saved in v2. Therefore, devices running 0.19 or below cannot understand this and they might say that decryption error. Please update all devices.  
+Then we will have an impressive performance.
 
-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.
+Of course, these are very impactful changes. If you have any questions or troubled things, please feel free to open an issue and mention me.
 
-Now, we have `Customization sync`.
+Note: if you want to roll it back to v1, please enable `Use binary and encryption version 1` on the `Hatch` pane and perform the `rebuild everything` once.
 
-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`.
+Extra but notable information:
 
-I hope you will give it a try.
+This format change gives us the ability to detect some `marks` in the binary files as same as text files. Therefore, we can split binary files and some specific sort of them (i.e., PDF files) at the specific character. It means that editing the middle of files could be detected with marks.
 
+Now only a few chunks are transferred, even if we add a comment to the PDF or put new files into the ZIP archives.
 
-#### Minors
-
-- 0.19.1 to 0.19.14 has been moved into the updates_old.md
-- 0.19.15
-  - Fixed:
-    - Now storing files after cleaning up is correct works.
-  - Improved:
-    - Cleaning the local database up got incredibly fastened.
-      Now we can clean instead of fetching again when synchronising with the remote which has been cleaned up.
-- 0.19.16
-  - Many upgrades on this release. I have tried not to let that happen, if something got corrupted, please feel free to notify me.
+#### Version history
+- 0.20.2
   - New feature:
-    - (Beta) ignore files handling
-      We can use `.gitignore`, `.dockerignore`, and anything you like to filter the synchronising files.
+    - We can delete all data of customization sync from the `Delete all customization sync data` on the `Hatch` pane.
   - Fixed:
-    - Buttons on lock-detected-dialogue now can be shown in narrow-width devices.
+    - Prevent keep restarting on iOS by yielding microtasks.
+- 0.20.1 
+  - Fixed:
+    - No more UI freezing and keep restarting on iOS.
+    - Diff of Non-markdown documents are now shown correctly.
   - Improved:
-    - Some constant has been flattened to be evaluated.
-    - The usage of the deprecated API of obsidian has been reduced.
-    - Now the indexedDB adapter will be enabled while the importing configuration.
-  - Misc:
-  - Compiler, framework, and dependencies have been upgraded.
-  - Due to standing for these impacts (especially in esbuild and svelte,) terser has been introduced. 
-    Feel free to notify your opinion to me! I do not like to obfuscate the code too.
-- 0.19.17
+    - Performance has been a bit improved.
+    - Customization sync has gotten faster.
+      - However, We lost forward compatibility again (only for this feature). Please update all devices.
+  - Misc
+    - Terser configuration has been more aggressive.
+- 0.20.0
+  - Improved:
+    - A New binary file handling implemented
+    - A new encrypted format has been implemented
+    - Now the chunk sizes will be adjusted for efficient sync
   - Fixed:
-    - Now nested ignore files could be parsed correctly.
-    - The unexpected deletion of hidden files in some cases has been corrected.
-    - Hidden file change is no longer reflected on the device which has made the change itself.
-  - Behaviour changed:
-    - From this version, the file which has `:` in its name should be ignored even if on Linux devices.
-- 0.19.18
-  - Fixed:
-    - Now the empty (or deleted) file could be conflict-resolved.
-- 0.19.19
-  - Fixed:
-    - Resolving conflicted revision has become more robust.
-    - LiveSync now try to keep local changes when fetching from the rebuilt remote database.
-      Local changes now have been kept as a revision and fetched things will be new revisions.
-    - Now, all files will be restored after performing `fetch` immediately.
+    - levels of exception in some logs have been fixed
+  - Tidied:
+    - Some Lint warnings have been suppressed.
 
 ... To continue on to `updates_old.md`.

updates_old.md

@@ -113,6 +113,83 @@ I hope you will give it a try.
   - Improved:
     - Now progress is reported while the cleaning up and fetch process.
     - Cancelled replication is now detected.
+- 0.19.15
+  - Fixed:
+    - Now storing files after cleaning up is correct works.
+  - Improved:
+    - Cleaning the local database up got incredibly fastened.
+      Now we can clean instead of fetching again when synchronising with the remote which has been cleaned up.
+- 0.19.16
+  - Many upgrades on this release. I have tried not to let that happen, if something got corrupted, please feel free to notify me.
+  - New feature:
+    - (Beta) ignore files handling
+      We can use `.gitignore`, `.dockerignore`, and anything you like to filter the synchronising files.
+  - Fixed:
+    - Buttons on lock-detected-dialogue now can be shown in narrow-width devices.
+  - Improved:
+    - Some constant has been flattened to be evaluated.
+    - The usage of the deprecated API of obsidian has been reduced.
+    - Now the indexedDB adapter will be enabled while the importing configuration.
+  - Misc:
+  - Compiler, framework, and dependencies have been upgraded.
+  - Due to standing for these impacts (especially in esbuild and svelte,) terser has been introduced. 
+    Feel free to notify your opinion to me! I do not like to obfuscate the code too.
+- 0.19.17
+  - Fixed:
+    - Now nested ignore files could be parsed correctly.
+    - The unexpected deletion of hidden files in some cases has been corrected.
+    - Hidden file change is no longer reflected on the device which has made the change itself.
+  - Behaviour changed:
+    - From this version, the file which has `:` in its name should be ignored even if on Linux devices.
+- 0.19.18
+  - Fixed:
+    - Now the empty (or deleted) file could be conflict-resolved.
+- 0.19.19
+  - Fixed:
+    - Resolving conflicted revision has become more robust.
+    - LiveSync now try to keep local changes when fetching from the rebuilt remote database.
+      Local changes now have been kept as a revision and fetched things will be new revisions.
+    - Now, all files will be restored after performing `fetch` immediately.
+- 0.19.20
+  - New feature:
+    - `Sync on Editor save` has been implemented
+      - We can start synchronisation when we save from the Obsidian explicitly.
+    - Now we can use the `Hidden file sync` and the `Customization sync` cooperatively.
+      - We can exclude files from `Hidden file sync` which is already handled in Customization sync.
+    - We can ignore specific plugins in Customization sync.
+    - Now the message of leftover conflicted files accepts our click.
+      - We can open `Resolve all conflicted files` in an instant.
+  - Refactored:
+    - Parallelism functions made more explicit.
+    - Type errors have been reduced.
+  - Fixed:
+    - Now documents would not be overwritten if they are conflicted.
+      It will be saved as a new conflicted revision.
+    - Some error messages have been fixed.
+    - Missing dialogue titles have been shown now.
+      - We can click close buttons on mobile now.
+    - Conflicted Customisation sync files will be resolved automatically by their modified time.
+- 0.19.21
+  - Fixed:
+    - Hidden files are no longer handled in the initial replication.
+    - Report from `Making report` fixed
+      - No longer contains customisation sync information.
+      - Version of LiveSync has been added.
+- 0.19.22
+  - Fixed:
+    - Now the synchronisation will begin without our interaction.
+    - No longer puts the configuration of the remote database into the log while checking configuration.
+    - Some outdated description notes have been removed.
+    - Options that are meaningless depending on other settings configured are now hidden.
+      - Scan for hidden files before replication
+      - Scan customization periodically
+- 0.19.23
+  -Improved:
+    - We can open the log pane also from the command palette now.
+    - Now, the hidden file scanning interval could be configured to 0.
+    - `Check database configuration` now points out that we do not have administrator permission.
+
+
 ### 0.18.0
 
 #### Now, paths of files in the database can now be obfuscated. (Experimental Feature)