Remove notice.

- Illegible coloring of the Diff dialog.

# Implemented
- On-the-fly encryption and decryption in replication.
- Text splitting algorithms updated
(use a bit more memory (which is saved by On-the-fly enc-dec), but faster than old algorithms.)
- Garbage collector is now decent and memory saving.

# Internal things
- Refactored so much.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/lib"]
+	path = src/lib
+	url = https://github.com/vrtmrz/livesync-commonlib

docs/settings.md

@@ -1,3 +1,5 @@
+NOTE: This document surely became outdated. I'll improve this doc in a while. but your contributions are always welcome.
+
 # Settings of this plugin
 
 ## Remote Database Configurations
@@ -19,14 +21,51 @@ The Database name to synchronize.
 ⚠️If not exist, created automatically.
 
 
+
 ### Use the old connecting method
-Since v0.8.0, Self-hosted LiveSync uses Obsidian's API to connect to the CouchDB instead of the browser API.
-This method will increase the performance and avoid troubles with the CORS.
-But it doesn't been well tested yet. If you are troubled, please disable this option once.
+This option has been removed at v0.10.0
+
+
+
+### End to End Encryption
+Encrypt your database. It affects only the database, your files are left as plain.
+
+The encryption algorithm is AES-GCM.
+
+Note: If you want to use "Plugins and their settings", you have to enable this.
+
+### Passphrase
+The passphrase to used as the key of encryption. Please use the long text.
+
+### Apply
+To enable End-to-End encryption, there must be no items of the same content encrypted with different passphrases to avoid attackers guessing passphrases. Self-hosted LiveSync uses crc32 of the chunks, It is really a must.
+
+So, this plugin completely deletes everything from both local and remote databases before enabling it and then synchronizing again.
+
+To enable, "Apply and send" from the most powerful device.
+If you want to synchronize an existing database, set passphrase and press "Just apply".
+
+- Apply and send
+1. Initialize the Local Database and set (or clear) passphrase, put all files into the database again.
+2. Initialize the Remote Database.
+3. Lock the Remote Database.
+4. Send it all.
+
+This process is simply heavy. Using a PC or Mac is preferred.
+- Apply and receive
+1. Initialize the Local Database and set (or clear) the passphrase.
+2. Unlock the Remote Database.
+3. Retrieve all and decrypt to file.
+
+When running these operations, every synchronization settings is disabled.
 
 ### Test Database connection
 You can check the connection by clicking this button.
 
+### Check database configuration
+You can check and modify your CouchDB's configuration from here directly.
+
+
 ## Local Database Configurations
 "Local Database" is created inside your obsidian.
 
@@ -56,39 +95,6 @@ Note: If you want to use "Use history", this vault must be set to 0.
 ### Manual Garbage Collect
 Run "Garbage Collection" manually.
 
-### End to End Encryption
-Encrypt your database. It affects only the database, your files are left as plain.
-
-The encryption algorithm is AES-GCM.
-
-Note: If you want to use "Plugins and their settings", you have to enable this.
-
-### Passphrase
-The passphrase to used as the key of encryption. Please use the long text.
-
-### Apply
-To enable End-to-End encryption, there must be no items of the same content encrypted with different passphrases to avoid attackers guessing passphrases. Self-hosted LiveSync uses crc32 of the chunks, It is really a must.
-
-So, this plugin completely deletes everything from both local and remote databases before enabling it and then synchronizing again.
-
-To enable, "Apply and send" from the most powerful device, and "Apply and receive" from every other device.
-
-- Apply and send
-1. Initialize the Local Database and set (or clear) passphrase, put all files into the database again.
-2. Initialize the Remote Database.
-3. Lock the Remote Database.
-4. Send it all.
-
-This process is simply heavy. Using a PC or Mac is preferred.
-- Apply and receive
-1. Initialize the Local Database and set (or clear) the passphrase.
-2. Unlock the Remote Database.
-3. Retrieve all and decrypt to file.
-
-When running these operations, every synchronization settings is disabled.
-
-**And even your passphrase is wrong, It doesn't be checked before the plugin really decrypts. So If you set the wrong passphrase and run "Apply and Receive", you will get an amount of decryption error. But, this is the specification.**
-
 ### minimum chunk size and LongLine threshold
 The configuration of chunk splitting.
 

docs/settings_ja.md

@@ -1,3 +1,5 @@
+注意：少し内容が古くなっています。
+
 # このプラグインの設定項目
 
 ## Remote Database Configurations
@@ -19,9 +21,44 @@ CouchDBのURIを入力します。Cloudantの場合は「External Endpoint(prefe
 ⚠️存在しない場合は、テストや接続を行った際、自動的に作成されます[^1]。
 [^1]:権限がない場合は自動作成には失敗します。 
 
+
+
+### End to End Encryption
+データベースを暗号化します。この効果はデータベースに格納されるデータに限られ、ディスク上のファイルは平文のままです。  
+暗号化はAES-GCMを使用して行っています。
+
+### Passphrase
+暗号化を行う際に使用するパスフレーズです。充分に長いものを使用してください。
+
+### Apply
+End to End 暗号化を行うに当たって、異なるパスフレーズで暗号化された同一の内容を入手されることは避けるべきです。また、Self-hosted LiveSyncはコンテンツのcrc32を重複回避に使用しているため、その点でも攻撃が有効になってしまいます。
+
+そのため、End to End 暗号化を有効にする際には、ローカル、リモートすべてのデータベースをいったん破棄し、新しいパスフレーズで暗号化された内容のみを、改めて同期し直します。
+
+有効化するには、一番体力のある端末からApply and sendを行います。
+既に存在するリモートと同期する場合は、設定してJust applyを行ってください。
+
+- Apply and send   
+1. ローカルのデータベースを初期化しパスフレーズを設定（またはクリア）します。その後、すべてのファイルをもう一度データベースに登録します。
+2. リモートのデータベースを初期化します。
+3. リモートのデータベースをロックし、他の端末を締め出します。
+4. すべて再送信します。
+
+負荷と時間がかかるため、デスクトップから行う方が好ましいです。
+- Apply and receive
+1. ローカルのデータベースを初期化し、パスフレーズを設定（またはクリア）します。
+2. リモートのデータベースにかかっているロックを解除します。
+3. すべて受信して、復号します。
+
+どちらのオペレーションも、実行するとすべての同期設定が無効化されます。  
+
+
 ### Test Database connection
 上記の設定でデータベースに接続できるか確認します。
 
+### Check database configuration
+ここから直接CouchDBの設定を確認・変更できます。
+
 ## Local Database Configurations
 端末内に作成されるデータベースの設定です。
 
@@ -49,35 +86,6 @@ Obsidianでのファイル操作が終わってから指定秒数が経過した
 ### Manual Garbage Collect
 上記のGarbage Collectionを手動で行います。
 
-### End to End Encryption
-データベースを暗号化します。この効果はデータベースに格納されるデータに限られ、ディスク上のファイルは平文のままです。  
-暗号化はAES-GCMを使用して行っています。
-
-### Passphrase
-暗号化を行う際に使用するパスフレーズです。充分に長いものを使用してください。
-
-### Apply
-End to End 暗号化を行うに当たって、異なるパスフレーズで暗号化された同一の内容を入手されることは避けるべきです。また、Self-hosted LiveSyncはコンテンツのcrc32を重複回避に使用しているため、その点でも攻撃が有効になってしまいます。
-
-そのため、End to End 暗号化を有効にする際には、ローカル、リモートすべてのデータベースをいったん破棄し、新しいパスフレーズで暗号化された内容のみを、改めて同期し直します。
-
-有効化するには、一番体力のある端末からApply and sendを行い、他の端末でApply and receiveを行います。
-
-- Apply and send   
-1. ローカルのデータベースを初期化しパスフレーズを設定（またはクリア）します。その後、すべてのファイルをもう一度データベースに登録します。
-2. リモートのデータベースを初期化します。
-3. リモートのデータベースをロックし、他の端末を締め出します。
-4. すべて再送信します。
-
-負荷と時間がかかるため、デスクトップから行う方が好ましいです。
-- Apply and receive
-1. ローカルのデータベースを初期化し、パスフレーズを設定（またはクリア）します。
-2. リモートのデータベースにかかっているロックを解除します。
-3. すべて受信して、復号します。
-
-どちらのオペレーションも、実行するとすべての同期設定が無効化されます。  
-**また、パスフレーズのチェックは、実際に復号するまで行いません。そのため、パスフレーズを間違えて設定し、Apply and receiveで同期を行うと、大量のエラーが発生します。これは仕様です。**
-
 ### minimum chunk size と LongLine threshold
 チャンクの分割についての設定です。  
 Self-hosted LiveSyncは一つのチャンクのサイズを最低minimum chunk size文字確保した上で、できるだけ効率的に同期できるよう、ノートを分割してチャンクを作成します。  

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.8.3",
+    "version": "0.10.1",
     "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,15 +1,19 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.8.3",
+    "version": "0.10.1",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "obsidian-livesync",
-            "version": "0.8.3",
+            "version": "0.10.1",
             "license": "MIT",
             "dependencies": {
                 "diff-match-patch": "^1.0.5",
+                "esbuild": "0.13.12",
+                "esbuild-svelte": "^0.6.0",
+                "idb": "^7.0.1",
+                "svelte-preprocess": "^4.10.2",
                 "xxhash-wasm": "^0.4.2"
             },
             "devDependencies": {
@@ -2122,6 +2126,11 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/idb": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.1.tgz",
+            "integrity": "sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg=="
+        },
         "node_modules/ignore": {
             "version": "5.1.9",
             "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
@@ -5074,6 +5083,11 @@
                 "has-symbols": "^1.0.2"
             }
         },
+        "idb": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.1.tgz",
+            "integrity": "sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg=="
+        },
         "ignore": {
             "version": "5.1.9",
             "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.8.3",
+    "version": "0.10.1",
     "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",
@@ -35,6 +35,10 @@
     },
     "dependencies": {
         "diff-match-patch": "^1.0.5",
+        "esbuild": "0.13.12",
+        "esbuild-svelte": "^0.6.0",
+		"idb": "^7.0.1",
+        "svelte-preprocess": "^4.10.2",
         "xxhash-wasm": "^0.4.2"
     }
 }

pouchdb-browser-webpack/README.md

@@ -1,2 +1,4 @@
 # PouchDB-browser
-just webpacked.
+
+Just webpacked.  
+(Rollup couldn't pack pouchdb-browser into browser bundle)

pouchdb-browser-webpack/package.json

@@ -1,23 +1,25 @@
 {
-  "name": "pouchdb-browser-webpack",
-  "version": "1.0.0",
-  "description": "pouchdb-browser webpack",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "webpack --mode=production --node-env=production",
-    "build:dev": "webpack --mode=development",
-    "build:prod": "webpack --mode=production --node-env=production",
-    "watch": "webpack --watch"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "pouchdb-browser": "^7.2.2"
-  },
-  "devDependencies": {
-    "webpack": "^5.58.1",
-    "webpack-cli": "^4.9.0"
-  }
+    "name": "pouchdb-browser-webpack",
+    "version": "1.0.0",
+    "description": "pouchdb-browser webpack",
+    "main": "index.js",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "build": "webpack --mode=production --node-env=production",
+        "build:dev": "webpack --mode=development",
+        "build:prod": "webpack --mode=production --node-env=production",
+        "watch": "webpack --watch"
+    },
+    "keywords": [],
+    "author": "",
+    "license": "ISC",
+    "dependencies": {
+        "pouchdb-browser": "^7.3.0",
+        "transform-pouch": "^2.0.0",
+        "pouchdb-find": "^7.3.0"
+    },
+    "devDependencies": {
+        "webpack": "^5.58.1",
+        "webpack-cli": "^4.9.0"
+    }
 }

pouchdb-browser-webpack/src/index.js

@@ -1,4 +1,10 @@
+/* eslint-disable no-undef */
+/* eslint-disable @typescript-eslint/no-var-requires */
 // This module just webpacks pouchdb-browser
-import * as PouchDB_src from "pouchdb-browser";
-const PouchDB = PouchDB_src.default;
+// import * as PouchDB_src from "pouchdb-browser";
+const pouch = require("pouchdb-browser").default;
+const find = require("pouchdb-find").default;
+const transform = require("transform-pouch");
+const PouchDB = pouch.plugin(find).plugin(transform);
+
 export { PouchDB };

src/ConflictResolveModal.ts

@@ -1,7 +1,7 @@
 import { App, Modal } from "obsidian";
 import { DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT } from "diff-match-patch";
-import { diff_result } from "./types";
-import { escapeStringToHTML } from "./utils";
+import { diff_result } from "./lib/src/types";
+import { escapeStringToHTML } from "./lib/src/utils";
 
 export class ConflictResolveModal extends Modal {
     // result: Array<[number, string]>;

src/DocumentHistoryModal.ts

@@ -1,9 +1,10 @@
 import { TFile, Modal, App } from "obsidian";
-import { path2id, escapeStringToHTML } from "./utils";
+import { path2id } from "./utils";
+import { escapeStringToHTML } from "./lib/src/utils";
 import ObsidianLiveSyncPlugin from "./main";
 import { DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_patch } from "diff-match-patch";
-import { LOG_LEVEL } from "./types";
-import { Logger } from "./logger";
+import { LOG_LEVEL } from "./lib/src/types";
+import { Logger } from "./lib/src/logger";
 
 export class DocumentHistoryModal extends Modal {
     plugin: ObsidianLiveSyncPlugin;

src/LogDisplayModal.ts

@@ -1,5 +1,5 @@
 import { App, Modal } from "obsidian";
-import { escapeStringToHTML } from "./utils";
+import { escapeStringToHTML } from "./lib/src/utils";
 import ObsidianLiveSyncPlugin from "./main";
 
 export class LogDisplayModal extends Modal {

src/ObsidianLiveSyncSettingTab.ts

@@ -1,9 +1,10 @@
-import { App, Notice, PluginSettingTab, Setting, sanitizeHTMLToDom } from "obsidian";
-import { EntryDoc, LOG_LEVEL } from "./types";
-import { path2id, id2path, runWithLock } from "./utils";
-import { Logger } from "./logger";
-import { connectRemoteCouchDB } from "./utils_couchdb";
-import { testCrypt } from "./e2ee";
+import { App, PluginSettingTab, Setting, sanitizeHTMLToDom, RequestUrlParam, requestUrl } from "obsidian";
+import { EntryDoc, LOG_LEVEL, RemoteDBSettings } from "./lib/src/types";
+import { path2id, id2path } from "./utils";
+import { NewNotice, runWithLock } from "./lib/src/utils";
+import { Logger } from "./lib/src/logger";
+import { checkSyncInfo, connectRemoteCouchDBWithSetting } from "./utils_couchdb";
+import { testCrypt } from "./lib/src/e2ee";
 import ObsidianLiveSyncPlugin from "./main";
 
 export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
@@ -14,14 +15,16 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         this.plugin = plugin;
     }
     async testConnection(): Promise<void> {
-        const db = await connectRemoteCouchDB(
-            this.plugin.settings.couchDB_URI + (this.plugin.settings.couchDB_DBNAME == "" ? "" : "/" + this.plugin.settings.couchDB_DBNAME),
-            {
-                username: this.plugin.settings.couchDB_USER,
-                password: this.plugin.settings.couchDB_PASSWORD,
-            },
-            this.plugin.settings.disableRequestURI
-        );
+        // const db = await connectRemoteCouchDB(
+        //     this.plugin.settings.couchDB_URI + (this.plugin.settings.couchDB_DBNAME == "" ? "" : "/" + this.plugin.settings.couchDB_DBNAME),
+        //     {
+        //         username: this.plugin.settings.couchDB_USER,
+        //         password: this.plugin.settings.couchDB_PASSWORD,
+        //     },
+        //     this.plugin.settings.disableRequestURI,
+        //     this.plugin.settings.encrypt ? this.plugin.settings.passphrase : this.plugin.settings.encrypt
+        // );
+        const db = await connectRemoteCouchDBWithSetting(this.plugin.settings, this.plugin.localDatabase.isMobile);
         if (typeof db === "string") {
             this.plugin.addLog(`could not connect to ${this.plugin.settings.couchDB_URI} : ${this.plugin.settings.couchDB_DBNAME} \n(${db})`, LOG_LEVEL.NOTICE);
             return;
@@ -77,7 +80,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         const containerRemoteDatabaseEl = containerEl.createDiv();
         containerRemoteDatabaseEl.createEl("h3", { text: "Remote Database configuration" });
         const syncWarn = containerRemoteDatabaseEl.createEl("div", { text: `These settings are kept locked while automatic synchronization options are enabled. Disable these options in the "Sync Settings" tab to unlock.` });
-        syncWarn.addClass("op-warn");
+        syncWarn.addClass("op-warn-info");
         syncWarn.addClass("sls-hidden");
 
         const isAnySyncEnabled = (): boolean => {
@@ -169,14 +172,126 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                         this.plugin.settings.couchDB_DBNAME = value;
                         await this.plugin.saveSettings();
                     })
-            ),
-            new Setting(containerRemoteDatabaseEl).setName("Use the old connecting method").addToggle((toggle) =>
-                toggle.setValue(this.plugin.settings.disableRequestURI).onChange(async (value) => {
-                    this.plugin.settings.disableRequestURI = value;
+            )
+
+            // new Setting(containerRemoteDatabaseEl)
+            //     .setDesc("This feature is locked in mobile")
+            //     .setName("Use the old connecting method")
+            //     .addToggle((toggle) => {
+            //         toggle.setValue(this.plugin.settings.disableRequestURI).onChange(async (value) => {
+            //             this.plugin.settings.disableRequestURI = value;
+            //             await this.plugin.saveSettings();
+            //         });
+            //         toggle.setDisabled(this.plugin.isMobile);
+            //         return toggle;
+            //     })
+        );
+        new Setting(containerRemoteDatabaseEl)
+            .setName("End to End Encryption")
+            .setDesc("Encrypting contents on the database.")
+            .addToggle((toggle) =>
+                toggle.setValue(this.plugin.settings.workingEncrypt).onChange(async (value) => {
+                    this.plugin.settings.workingEncrypt = value;
+                    phasspharase.setDisabled(!value);
                     await this.plugin.saveSettings();
                 })
+            );
+        const phasspharase = new Setting(containerRemoteDatabaseEl)
+            .setName("Passphrase")
+            .setDesc("Encrypting passphrase")
+            .addText((text) => {
+                text.setPlaceholder("")
+                    .setValue(this.plugin.settings.workingPassphrase)
+                    .onChange(async (value) => {
+                        this.plugin.settings.workingPassphrase = value;
+                        await this.plugin.saveSettings();
+                    });
+                text.inputEl.setAttribute("type", "password");
+            });
+        phasspharase.setDisabled(!this.plugin.settings.workingEncrypt);
+        containerRemoteDatabaseEl.createEl("div", {
+            text: "If you change the passphrase, rebuilding the remote database is required. Please press 'Apply and send'. Or, If you have configured it to connect to an existing database, click 'Just apply'.",
+        });
+        const checkWorkingPassphrase = async (): Promise<boolean> => {
+            const settingForCheck: RemoteDBSettings = {
+                ...this.plugin.settings,
+                encrypt: this.plugin.settings.workingEncrypt,
+                passphrase: this.plugin.settings.workingPassphrase,
+            };
+            console.dir(settingForCheck);
+            const db = await connectRemoteCouchDBWithSetting(settingForCheck, this.plugin.localDatabase.isMobile);
+            if (typeof db === "string") {
+                Logger("Could not connect to the database.", LOG_LEVEL.NOTICE);
+                return false;
+            } else {
+                if (await checkSyncInfo(db.db)) {
+                    // Logger("Database connected", LOG_LEVEL.NOTICE);
+                    return true;
+                } else {
+                    Logger("Failed to read remote database", LOG_LEVEL.NOTICE);
+                    return false;
+                }
+            }
+        };
+        const applyEncryption = async (sendToServer: boolean) => {
+            if (this.plugin.settings.workingEncrypt && this.plugin.settings.workingPassphrase == "") {
+                Logger("If you enable encryption, you have to set the passphrase", LOG_LEVEL.NOTICE);
+                return;
+            }
+            if (this.plugin.settings.workingEncrypt && !(await testCrypt())) {
+                Logger("WARNING! Your device would not support encryption.", LOG_LEVEL.NOTICE);
+                return;
+            }
+            if (!(await checkWorkingPassphrase())) {
+                return;
+            }
+            if (!this.plugin.settings.workingEncrypt) {
+                this.plugin.settings.workingPassphrase = "";
+            }
+            this.plugin.settings.liveSync = false;
+            this.plugin.settings.periodicReplication = false;
+            this.plugin.settings.syncOnSave = false;
+            this.plugin.settings.syncOnStart = false;
+            this.plugin.settings.syncOnFileOpen = false;
+            this.plugin.settings.encrypt = this.plugin.settings.workingEncrypt;
+            this.plugin.settings.passphrase = this.plugin.settings.workingPassphrase;
+
+            await this.plugin.saveSettings();
+            // await this.plugin.resetLocalDatabase();
+            if (sendToServer) {
+                await this.plugin.initializeDatabase(true);
+                await this.plugin.markRemoteLocked();
+                await this.plugin.tryResetRemoteDatabase();
+                await this.plugin.markRemoteLocked();
+                await this.plugin.replicateAllToServer(true);
+            } else {
+                await this.plugin.markRemoteResolved();
+                await this.plugin.replicate(true);
+            }
+        };
+        new Setting(containerRemoteDatabaseEl)
+            .setName("Apply")
+            .setDesc("apply encryption settinngs, and re-initialize remote database")
+            .addButton((button) =>
+                button
+                    .setButtonText("Apply and send")
+                    .setWarning()
+                    .setDisabled(false)
+                    .setClass("sls-btn-left")
+                    .onClick(async () => {
+                        await applyEncryption(true);
+                    })
             )
-        );
+            .addButton((button) =>
+                button
+                    .setButtonText("Just apply")
+                    .setWarning()
+                    .setDisabled(false)
+                    .setClass("sls-btn-right")
+                    .onClick(async () => {
+                        await applyEncryption(false);
+                    })
+            );
 
         new Setting(containerRemoteDatabaseEl)
             .setName("Test Database Connection")
@@ -190,6 +305,174 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     })
             );
 
+        new Setting(containerRemoteDatabaseEl)
+            .setName("Check database configuration")
+            // .setDesc("Open database connection. If the remote database is not found and you have the privilege to create a database, the database will be created.")
+            .addButton((button) =>
+                button
+                    .setButtonText("Check")
+                    .setDisabled(false)
+                    .onClick(async () => {
+                        const checkConfig = async () => {
+                            try {
+                                const requestToCouchDB = async (baseUri: string, username: string, password: string, origin: string, key?: string, body?: string) => {
+                                    const utf8str = String.fromCharCode.apply(null, new TextEncoder().encode(`${username}:${password}`));
+                                    const encoded = window.btoa(utf8str);
+                                    const authHeader = "Basic " + encoded;
+                                    // const origin = "capacitor://localhost";
+                                    const transformedHeaders: Record<string, string> = { authorization: authHeader, origin: origin };
+                                    const uri = `${baseUri}/_node/_local/_config${key ? "/" + key : ""}`;
+
+                                    const requestParam: RequestUrlParam = {
+                                        url: uri,
+                                        method: body ? "PUT" : "GET",
+                                        headers: transformedHeaders,
+                                        contentType: "application/json",
+                                        body: body ? JSON.stringify(body) : undefined,
+                                    };
+                                    return await requestUrl(requestParam);
+                                };
+
+                                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 });
+                                        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} successfly updated`, LOG_LEVEL.NOTICE);
+                                            checkResultDiv.removeChild(x);
+                                            checkConfig();
+                                        } else {
+                                            Logger(`${title} failed`, LOG_LEVEL.NOTICE);
+                                            Logger(res.text);
+                                        }
+                                    });
+                                };
+                                addResult("---Notice---", ["ob-btn-config-head"]);
+                                addResult(
+                                    "If the server configuration is not persistent (e.g., running on docker), the values set from here will also be volatile. Once you are able to connect, please reflect the settings in the server's local.ini.",
+                                    ["ob-btn-config-info"]
+                                );
+
+                                addResult("Your configuration is dumped to Log", ["ob-btn-config-info"]);
+                                addResult("--Config check--", ["ob-btn-config-head"]);
+
+                                // Admin check
+                                //  for database creation and deletion
+                                if (!(this.plugin.settings.couchDB_USER in responseConfig.admins)) {
+                                    addResult(`⚠ You do not have administrative privileges.`);
+                                } else {
+                                    addResult("✔ You have administrative privileges.");
+                                }
+                                // HTTP user-authorization check
+                                if (responseConfig?.chttpd?.require_valid_user != "true") {
+                                    addResult("❗ chttpd.require_valid_user looks like wrong.");
+                                    addConfigFixButton("Set chttpd.require_valid_user = true", "chttpd/require_valid_user", "true");
+                                } else {
+                                    addResult("✔ chttpd.require_valid_user is ok.");
+                                }
+                                if (responseConfig?.chttpd_auth?.require_valid_user != "true") {
+                                    addResult("❗ chttpd_auth.require_valid_user looks like wrong.");
+                                    addConfigFixButton("Set chttpd_auth.require_valid_user = true", "chttpd_auth/require_valid_user", "true");
+                                } else {
+                                    addResult("✔ chttpd_auth.require_valid_user is ok.");
+                                }
+                                // HTTPD check
+                                //  Check Authentication header
+                                if (!responseConfig?.httpd["WWW-Authenticate"]) {
+                                    addResult("❗ httpd.WWW-Authenticate is missing");
+                                    addConfigFixButton("Set httpd.WWW-Authenticate", "httpd/WWW-Authenticate", 'Basic realm="couchdb"');
+                                } else {
+                                    addResult("✔ httpd.WWW-Authenticate is ok.");
+                                }
+                                if (responseConfig?.httpd?.enable_cors != "true") {
+                                    addResult("❗ httpd.enable_cors is wrong");
+                                    addConfigFixButton("Set httpd.enable_cors", "httpd/enable_cors", "true");
+                                } else {
+                                    addResult("✔ httpd.enable_cors is ok.");
+                                }
+                                // CORS check
+                                //  checking connectivity for mobile
+                                if (responseConfig?.cors?.credentials != "true") {
+                                    addResult("❗ cors.credentials is wrong");
+                                    addConfigFixButton("Set cors.credentials", "cors/credentials", "true");
+                                } else {
+                                    addResult("✔ cors.credentials is ok.");
+                                }
+                                const ConfiguredOrigins = ((responseConfig?.cors?.origins ?? "") + "").split(",");
+                                if (
+                                    responseConfig?.cors?.origins == "*" ||
+                                    (ConfiguredOrigins.indexOf("app://obsidian.md") !== -1 && ConfiguredOrigins.indexOf("capacitor://localhost") !== -1 && ConfiguredOrigins.indexOf("http://localhost") !== -1)
+                                ) {
+                                    addResult("✔ cors.origins is ok.");
+                                } else {
+                                    addResult("❗ cors.origins is wrong");
+                                    addConfigFixButton("Set cors.origins", "cors/origins", "app://obsidian.md,capacitor://localhost,http://localhost");
+                                }
+                                addResult("--Connection check--", ["ob-btn-config-head"]);
+                                addResult(`Current origin:${window.location.origin}`);
+
+                                // Request header check
+                                const origins = ["app://obsidian.md", "capacitor://localhost", "http://localhost"];
+                                for (const org of origins) {
+                                    const rr = await requestToCouchDB(this.plugin.settings.couchDB_URI, this.plugin.settings.couchDB_USER, this.plugin.settings.couchDB_PASSWORD, org);
+                                    const responseHeaders = Object.entries(rr.headers)
+                                        .map((e) => {
+                                            e[0] = (e[0] + "").toLowerCase();
+                                            return e;
+                                        })
+                                        .reduce((obj, [key, val]) => {
+                                            obj[key] = val;
+                                            return obj;
+                                        }, {});
+                                    addResult(`Origin check:${org}`);
+                                    if (responseHeaders["access-control-allow-credentials"] != "true") {
+                                        addResult("❗ CORS is not allowing credential");
+                                    } else {
+                                        addResult("✔ CORS credential OK");
+                                    }
+                                    if (responseHeaders["access-control-allow-origin"] != org) {
+                                        addResult(`❗ CORS Origin is unmatched:${origin}->${responseHeaders["access-control-allow-origin"]}`);
+                                    } else {
+                                        addResult("✔ CORS origin OK");
+                                    }
+                                }
+                                addResult("--Done--", ["ob-btn-config-haed"]);
+                                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"]);
+                            } catch (ex) {
+                                Logger(`Checking configration failed`);
+                                Logger(ex);
+                            }
+                        };
+                        await checkConfig();
+                    })
+            );
+        const checkResultDiv = containerRemoteDatabaseEl.createEl("div", {
+            text: "",
+        });
+
         addScreenElement("0", containerRemoteDatabaseEl);
         const containerLocalDatabaseEl = containerEl.createDiv();
         containerLocalDatabaseEl.createEl("h3", { text: "Local Database configuration" });
@@ -233,88 +516,6 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     await this.plugin.garbageCollect();
                 })
         );
-        new Setting(containerLocalDatabaseEl)
-            .setName("End to End Encryption")
-            .setDesc("Encrypting contents on the database.")
-            .addToggle((toggle) =>
-                toggle.setValue(this.plugin.settings.workingEncrypt).onChange(async (value) => {
-                    this.plugin.settings.workingEncrypt = value;
-                    phasspharase.setDisabled(!value);
-                    await this.plugin.saveSettings();
-                })
-            );
-        const phasspharase = new Setting(containerLocalDatabaseEl)
-            .setName("Passphrase")
-            .setDesc("Encrypting passphrase")
-            .addText((text) => {
-                text.setPlaceholder("")
-                    .setValue(this.plugin.settings.workingPassphrase)
-                    .onChange(async (value) => {
-                        this.plugin.settings.workingPassphrase = value;
-                        await this.plugin.saveSettings();
-                    });
-                text.inputEl.setAttribute("type", "password");
-            });
-        phasspharase.setDisabled(!this.plugin.settings.workingEncrypt);
-        containerLocalDatabaseEl.createEl("div", {
-            text: "When you change any encryption enabled or passphrase, you have to reset all databases to make sure that the last password is unused and erase encrypted data from anywhere. This operation will not lost your vault if you are fully synced.",
-        });
-        const applyEncryption = async (sendToServer: boolean) => {
-            if (this.plugin.settings.workingEncrypt && this.plugin.settings.workingPassphrase == "") {
-                Logger("If you enable encryption, you have to set the passphrase", LOG_LEVEL.NOTICE);
-                return;
-            }
-            if (this.plugin.settings.workingEncrypt && !(await testCrypt())) {
-                Logger("WARNING! Your device would not support encryption.", LOG_LEVEL.NOTICE);
-                return;
-            }
-            if (!this.plugin.settings.workingEncrypt) {
-                this.plugin.settings.workingPassphrase = "";
-            }
-            this.plugin.settings.liveSync = false;
-            this.plugin.settings.periodicReplication = false;
-            this.plugin.settings.syncOnSave = false;
-            this.plugin.settings.syncOnStart = false;
-            this.plugin.settings.syncOnFileOpen = false;
-            this.plugin.settings.encrypt = this.plugin.settings.workingEncrypt;
-            this.plugin.settings.passphrase = this.plugin.settings.workingPassphrase;
-
-            await this.plugin.saveSettings();
-            await this.plugin.resetLocalDatabase();
-            if (sendToServer) {
-                await this.plugin.initializeDatabase(true);
-                await this.plugin.markRemoteLocked();
-                await this.plugin.tryResetRemoteDatabase();
-                await this.plugin.markRemoteLocked();
-                await this.plugin.replicateAllToServer(true);
-            } else {
-                await this.plugin.markRemoteResolved();
-                await this.plugin.replicate(true);
-            }
-        };
-        new Setting(containerLocalDatabaseEl)
-            .setName("Apply")
-            .setDesc("apply encryption settinngs, and re-initialize database")
-            .addButton((button) =>
-                button
-                    .setButtonText("Apply and send")
-                    .setWarning()
-                    .setDisabled(false)
-                    .setClass("sls-btn-left")
-                    .onClick(async () => {
-                        await applyEncryption(true);
-                    })
-            )
-            .addButton((button) =>
-                button
-                    .setButtonText("Apply and receive")
-                    .setWarning()
-                    .setDisabled(false)
-                    .setClass("sls-btn-right")
-                    .onClick(async () => {
-                        await applyEncryption(false);
-                    })
-            );
 
         containerLocalDatabaseEl.createEl("div", {
             text: sanitizeHTMLToDom(`Advanced settings<br>
@@ -655,7 +856,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             }
         }
         const hatchWarn = containerHatchEl.createEl("div", { text: `To stop the bootup sequence for fixing problems on databases, you can put redflag.md on top of your vault (Rebooting obsidian is required).` });
-        hatchWarn.addClass("op-warn");
+        hatchWarn.addClass("op-warn-info");
         const dropHistory = async (sendToServer: boolean) => {
             this.plugin.settings.liveSync = false;
             this.plugin.settings.periodicReplication = false;
@@ -688,7 +889,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .onClick(async () => {
                         const files = this.app.vault.getFiles();
                         Logger("Verify and repair all files started", LOG_LEVEL.NOTICE);
-                        const notice = new Notice("", 0);
+                        const notice = NewNotice("", 0);
                         let i = 0;
                         for (const file of files) {
                             i++;
@@ -714,7 +915,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     .setDisabled(false)
                     .setWarning()
                     .onClick(async () => {
-                        const notice = new Notice("", 0);
+                        const notice = NewNotice("", 0);
                         Logger(`Begin sanity check`, LOG_LEVEL.INFO);
                         notice.setMessage(`Begin sanity check`);
                         await runWithLock("sancheck", true, async () => {
@@ -826,6 +1027,20 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     })
             );
 
+        new Setting(containerHatchEl)
+            .setName("Drop old encrypted database")
+            .setDesc("WARNING: Please use this button only when you have failed on converting old-style localdatabase at v0.10.0.")
+            .addButton((button) =>
+                button
+                    .setButtonText("Drop")
+                    .setWarning()
+                    .setDisabled(false)
+                    .onClick(async () => {
+                        await this.plugin.resetLocalOldDatabase();
+                        await this.plugin.initializeDatabase();
+                    })
+            );
+
         addScreenElement("50", containerHatchEl);
         // With great respect, thank you TfTHacker!
         // refered: https://github.com/TfTHacker/obsidian42-brat/blob/main/src/features/BetaPlugins.ts
@@ -834,7 +1049,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
 
         const updateDisabledOfDeviceAndVaultName = () => {
             vaultName.setDisabled(this.plugin.settings.autoSweepPlugins || this.plugin.settings.autoSweepPluginsPeriodic);
-            vaultName.setTooltip(this.plugin.settings.autoSweepPlugins || this.plugin.settings.autoSweepPluginsPeriodic ? "You could not change when you enabling auto sweep." : "");
+            vaultName.setTooltip(this.plugin.settings.autoSweepPlugins || this.plugin.settings.autoSweepPluginsPeriodic ? "You could not change when you enabling auto scan." : "");
         };
         new Setting(containerPluginSettings).setName("Enable plugin synchronization").addToggle((toggle) =>
             toggle.setValue(this.plugin.settings.usePluginSync).onChange(async (value) => {
@@ -844,8 +1059,8 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         );
 
         new Setting(containerPluginSettings)
-            .setName("Sweep plugins automatically")
-            .setDesc("Sweep plugins before replicating.")
+            .setName("Scan plugins automatically")
+            .setDesc("Scan plugins before replicating.")
             .addToggle((toggle) =>
                 toggle.setValue(this.plugin.settings.autoSweepPlugins).onChange(async (value) => {
                     this.plugin.settings.autoSweepPlugins = value;
@@ -855,8 +1070,8 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             );
 
         new Setting(containerPluginSettings)
-            .setName("Sweep plugins periodically")
-            .setDesc("Sweep plugins each 1 minutes.")
+            .setName("Scan plugins periodically")
+            .setDesc("Scan plugins each 1 minutes.")
             .addToggle((toggle) =>
                 toggle.setValue(this.plugin.settings.autoSweepPluginsPeriodic).onChange(async (value) => {
                     this.plugin.settings.autoSweepPluginsPeriodic = value;

src/PluginPane.svelte

@@ -2,7 +2,7 @@
     import ObsidianLiveSyncPlugin from "./main";
     import { onMount } from "svelte";
     import { DevicePluginList, PluginDataEntry } from "./types";
-    import { versionNumberString2Number } from "./utils";
+    import { versionNumberString2Number } from "./lib/src/utils";
 
     type JudgeResult = "" | "NEWER" | "EVEN" | "EVEN_BUT_DIFFERENT" | "OLDER" | "REMOTE_ONLY";
 
@@ -266,7 +266,7 @@
 
     <div class="ols-plugins-div-buttons">
         <button class="mod-cta" on:click={checkUpdates}>Check Updates</button>
-        <button class="mod-cta" on:click={sweepPlugins}>Sweep installed</button>
+        <button class="mod-cta" on:click={sweepPlugins}>Scan installed</button>
         <button class="mod-cta" on:click={applyPlugins}>Apply all</button>
     </div>
     <!--    <div class="ols-plugins-div-buttons">-->

src/e2ee.ts

@@ -1,168 +0,0 @@
-import { Logger } from "./logger";
-import { LOG_LEVEL } from "./types";
-
-export type encodedData = [encryptedData: string, iv: string, salt: string];
-export type KeyBuffer = {
-    index: string;
-    key: CryptoKey;
-    salt: Uint8Array;
-};
-
-const KeyBuffs: KeyBuffer[] = [];
-const decKeyBuffs: KeyBuffer[] = [];
-
-const KEY_RECYCLE_COUNT = 100;
-let recycleCount = KEY_RECYCLE_COUNT;
-
-let semiStaticFieldBuffer: Uint8Array = null;
-const nonceBuffer: Uint32Array = new Uint32Array(1);
-
-export async function getKeyForEncrypt(passphrase: string): Promise<[CryptoKey, Uint8Array]> {
-    // For performance, the plugin reuses the key KEY_RECYCLE_COUNT times.
-    const f = KeyBuffs.find((e) => e.index == passphrase);
-    if (f) {
-        recycleCount--;
-        if (recycleCount > 0) {
-            return [f.key, f.salt];
-        }
-        KeyBuffs.remove(f);
-        recycleCount = KEY_RECYCLE_COUNT;
-    }
-    const xpassphrase = new TextEncoder().encode(passphrase);
-    const digest = await crypto.subtle.digest({ name: "SHA-256" }, xpassphrase);
-    const keyMaterial = await crypto.subtle.importKey("raw", digest, { name: "PBKDF2" }, false, ["deriveKey"]);
-    const salt = crypto.getRandomValues(new Uint8Array(16));
-    const key = await crypto.subtle.deriveKey(
-        {
-            name: "PBKDF2",
-            salt,
-            iterations: 100000,
-            hash: "SHA-256",
-        },
-        keyMaterial,
-        { name: "AES-GCM", length: 256 },
-        false,
-        ["encrypt"]
-    );
-    KeyBuffs.push({
-        index: passphrase,
-        key,
-        salt,
-    });
-    while (KeyBuffs.length > 50) {
-        KeyBuffs.shift();
-    }
-    return [key, salt];
-}
-
-export async function getKeyForDecryption(passphrase: string, salt: Uint8Array): Promise<[CryptoKey, Uint8Array]> {
-    const bufKey = passphrase + uint8ArrayToHexString(salt);
-    const f = decKeyBuffs.find((e) => e.index == bufKey);
-    if (f) {
-        return [f.key, f.salt];
-    }
-    const xpassphrase = new TextEncoder().encode(passphrase);
-    const digest = await crypto.subtle.digest({ name: "SHA-256" }, xpassphrase);
-    const keyMaterial = await crypto.subtle.importKey("raw", digest, { name: "PBKDF2" }, false, ["deriveKey"]);
-    const key = await crypto.subtle.deriveKey(
-        {
-            name: "PBKDF2",
-            salt,
-            iterations: 100000,
-            hash: "SHA-256",
-        },
-        keyMaterial,
-        { name: "AES-GCM", length: 256 },
-        false,
-        ["decrypt"]
-    );
-    decKeyBuffs.push({
-        index: bufKey,
-        key,
-        salt,
-    });
-    while (decKeyBuffs.length > 50) {
-        decKeyBuffs.shift();
-    }
-    return [key, salt];
-}
-
-function getSemiStaticField(reset?: boolean) {
-    // return fixed field of iv.
-    if (semiStaticFieldBuffer != null && !reset) {
-        return semiStaticFieldBuffer;
-    }
-    semiStaticFieldBuffer = crypto.getRandomValues(new Uint8Array(12));
-    return semiStaticFieldBuffer;
-}
-
-function getNonce() {
-    // This is nonce, so do not send same thing.
-    nonceBuffer[0]++;
-    if (nonceBuffer[0] > 10000) {
-        // reset semi-static field.
-        getSemiStaticField(true);
-    }
-    return nonceBuffer;
-}
-
-function uint8ArrayToHexString(src: Uint8Array): string {
-    return Array.from(src)
-        .map((e: number): string => `00${e.toString(16)}`.slice(-2))
-        .join("");
-}
-function hexStringToUint8Array(src: string): Uint8Array {
-    const srcArr = [...src];
-    const arr = srcArr.reduce((acc, _, i) => (i % 2 ? acc : [...acc, srcArr.slice(i, i + 2).join("")]), []).map((e) => parseInt(e, 16));
-    return Uint8Array.from(arr);
-}
-export async function encrypt(input: string, passphrase: string) {
-    const [key, salt] = await getKeyForEncrypt(passphrase);
-    // Create initial vector with semifixed part and incremental part
-    // I think it's not good against related-key attacks.
-    const fixedPart = getSemiStaticField();
-    const invocationPart = getNonce();
-    const iv = Uint8Array.from([...fixedPart, ...new Uint8Array(invocationPart.buffer)]);
-    const plainStringified: string = JSON.stringify(input);
-    const plainStringBuffer: Uint8Array = new TextEncoder().encode(plainStringified);
-    const encryptedDataArrayBuffer = await crypto.subtle.encrypt({ name: "AES-GCM", iv }, key, plainStringBuffer);
-
-    const encryptedData = window.btoa(Array.from(new Uint8Array(encryptedDataArrayBuffer), (char) => String.fromCharCode(char)).join(""));
-
-    //return data with iv and salt.
-    const response: encodedData = [encryptedData, uint8ArrayToHexString(iv), uint8ArrayToHexString(salt)];
-    const ret = JSON.stringify(response);
-    return ret;
-}
-
-export async function decrypt(encryptedResult: string, passphrase: string): Promise<string> {
-    try {
-        const [encryptedData, ivString, salt]: encodedData = JSON.parse(encryptedResult);
-        const [key] = await getKeyForDecryption(passphrase, hexStringToUint8Array(salt));
-        const iv = hexStringToUint8Array(ivString);
-        // decode base 64, it should increase speed and i should with in MAX_DOC_SIZE_BIN, so it won't OOM.
-        const encryptedDataBin = window.atob(encryptedData);
-        const encryptedDataArrayBuffer = Uint8Array.from(encryptedDataBin.split(""), (char) => char.charCodeAt(0));
-        const plainStringBuffer: ArrayBuffer = await crypto.subtle.decrypt({ name: "AES-GCM", iv }, key, encryptedDataArrayBuffer);
-        const plainStringified = new TextDecoder().decode(plainStringBuffer);
-        const plain = JSON.parse(plainStringified);
-        return plain;
-    } catch (ex) {
-        Logger("Couldn't decode! You should wrong the passphrases", LOG_LEVEL.VERBOSE);
-        Logger(ex, LOG_LEVEL.VERBOSE);
-        throw ex;
-    }
-}
-
-export async function testCrypt() {
-    const src = "supercalifragilisticexpialidocious";
-    const encoded = await encrypt(src, "passwordTest");
-    const decrypted = await decrypt(encoded, "passwordTest");
-    if (src != decrypted) {
-        Logger("WARNING! Your device would not support encryption.", LOG_LEVEL.VERBOSE);
-        return false;
-    } else {
-        Logger("CRYPT LOGIC OK", LOG_LEVEL.VERBOSE);
-        return true;
-    }
-}

src/logger.ts

@@ -1,13 +0,0 @@
-import { LOG_LEVEL } from "./types";
-
-// eslint-disable-next-line require-await
-export let Logger: (message: any, levlel?: LOG_LEVEL) => Promise<void> = async (message, _) => {
-    const timestamp = new Date().toLocaleString();
-    const messagecontent = typeof message == "string" ? message : message instanceof Error ? `${message.name}:${message.message}` : JSON.stringify(message, null, 2);
-    const newmessage = timestamp + "->" + messagecontent;
-    console.log(newmessage);
-};
-
-export function setLogger(loggerFun: (message: any, levlel?: LOG_LEVEL) => Promise<void>) {
-    Logger = loggerFun;
-}

src/main.ts

@@ -1,25 +1,25 @@
 import { debounce, Notice, Plugin, TFile, addIcon, TFolder, normalizePath, TAbstractFile, Editor, MarkdownView, PluginManifest, Modal, App } from "obsidian";
 import { diff_match_patch } from "diff-match-patch";
 
+import { EntryDoc, LoadedEntry, ObsidianLiveSyncSettings, diff_check_result, diff_result_leaf, EntryBody, LOG_LEVEL, VER, DEFAULT_SETTINGS, diff_result, FLAGMD_REDFLAG, SYNCINFO_ID } from "./lib/src/types";
+import { PluginDataEntry, PERIODIC_PLUGIN_SWEEP, PluginList, DevicePluginList } from "./types";
 import {
-    EntryDoc,
-    LoadedEntry,
-    ObsidianLiveSyncSettings,
-    diff_check_result,
-    diff_result_leaf,
-    EntryBody,
-    PluginDataEntry,
-    LOG_LEVEL,
-    VER,
-    PERIODIC_PLUGIN_SWEEP,
-    DEFAULT_SETTINGS,
-    PluginList,
-    DevicePluginList,
-    diff_result,
-    FLAGMD_REDFLAG,
-} from "./types";
-import { base64ToString, arrayBufferToBase64, base64ToArrayBuffer, isValidPath, versionNumberString2Number, id2path, path2id, runWithLock, shouldBeIgnored, getProcessingCounts, setLockNotifier, isPlainText } from "./utils";
-import { Logger, setLogger } from "./logger";
+    base64ToString,
+    arrayBufferToBase64,
+    base64ToArrayBuffer,
+    isValidPath,
+    versionNumberString2Number,
+    runWithLock,
+    shouldBeIgnored,
+    getProcessingCounts,
+    setLockNotifier,
+    isPlainText,
+    setNoticeClass,
+    NewNotice,
+    allSettledWithConcurrencyLimit,
+    getLocks,
+} from "./lib/src/utils";
+import { Logger, setLogger } from "./lib/src/logger";
 import { LocalPouchDB } from "./LocalPouchDB";
 import { LogDisplayModal } from "./LogDisplayModal";
 import { ConflictResolveModal } from "./ConflictResolveModal";
@@ -27,7 +27,9 @@ import { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab";
 import { DocumentHistoryModal } from "./DocumentHistoryModal";
 
 import PluginPane from "./PluginPane.svelte";
-
+import { id2path, path2id } from "./utils";
+const isDebug = false;
+setNoticeClass(Notice);
 class PluginDialogModal extends Modal {
     plugin: ObsidianLiveSyncPlugin;
     logEl: HTMLDivElement;
@@ -64,6 +66,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
     statusBar2: HTMLElement;
     suspended: boolean;
     deviceAndVaultName: string;
+    isMobile = false;
 
     setInterval(handler: () => any, timeout?: number): number {
         const timer = window.setInterval(handler, timeout);
@@ -93,6 +96,11 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         const lsname = "obsidian-live-sync-ver" + this.app.vault.getName();
         const last_version = localStorage.getItem(lsname);
         await this.loadSettings();
+        //@ts-ignore
+        if (this.app.isMobile) {
+            this.isMobile = true;
+            this.settings.disableRequestURI = true;
+        }
         if (last_version && Number(last_version) < VER) {
             this.settings.liveSync = false;
             this.settings.syncOnSave = false;
@@ -155,50 +163,54 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         this.addSettingTab(new ObsidianLiveSyncSettingTab(this.app, this));
 
         this.app.workspace.onLayoutReady(async () => {
-            try {
-                if (this.isRedFlagRaised()) {
-                    this.settings.batchSave = false;
-                    this.settings.liveSync = false;
-                    this.settings.periodicReplication = false;
-                    this.settings.syncOnSave = false;
-                    this.settings.syncOnStart = false;
-                    this.settings.syncOnFileOpen = false;
-                    this.settings.autoSweepPlugins = false;
-                    this.settings.usePluginSync = false;
-                    this.settings.suspendFileWatching = true;
-                    await this.saveSettings();
-                    await this.openDatabase();
-                    const warningMessage = "The red flag is raised! The whole initialize steps are skipped, and any file changes are not captured.";
-                    Logger(warningMessage, LOG_LEVEL.NOTICE);
-                    this.setStatusBarText(warningMessage);
-                } else {
-                    if (this.settings.suspendFileWatching) {
-                        Logger("'Suspend file watching' turned on. Are you sure this is what you intended? Every modification on the vault will be ignored.", LOG_LEVEL.NOTICE);
+            if (this.localDatabase.isReady)
+                try {
+                    if (this.isRedFlagRaised()) {
+                        this.settings.batchSave = false;
+                        this.settings.liveSync = false;
+                        this.settings.periodicReplication = false;
+                        this.settings.syncOnSave = false;
+                        this.settings.syncOnStart = false;
+                        this.settings.syncOnFileOpen = false;
+                        this.settings.autoSweepPlugins = false;
+                        this.settings.usePluginSync = false;
+                        this.settings.suspendFileWatching = true;
+                        await this.saveSettings();
+                        await this.openDatabase();
+                        const warningMessage = "The red flag is raised! The whole initialize steps are skipped, and any file changes are not captured.";
+                        Logger(warningMessage, LOG_LEVEL.NOTICE);
+                        this.setStatusBarText(warningMessage);
+                    } else {
+                        if (this.settings.suspendFileWatching) {
+                            Logger("'Suspend file watching' turned on. Are you sure this is what you intended? Every modification on the vault will be ignored.", LOG_LEVEL.NOTICE);
+                        }
+                        const isInitalized = await this.initializeDatabase();
+                        if (!isInitalized) {
+                            //TODO:stop all sync.
+                            return false;
+                        }
                     }
-                    await this.initializeDatabase();
+                    await this.realizeSettingSyncMode();
+                    this.registerWatchEvents();
+                    if (this.settings.syncOnStart) {
+                        this.localDatabase.openReplication(this.settings, false, false, this.parseReplicationResult);
+                    }
+                } catch (ex) {
+                    Logger("Error while loading Self-hosted LiveSync", LOG_LEVEL.NOTICE);
+                    Logger(ex, LOG_LEVEL.VERBOSE);
                 }
-                await this.realizeSettingSyncMode();
-                this.registerWatchEvents();
-                if (this.settings.syncOnStart) {
-                    await this.localDatabase.openReplication(this.settings, false, false, this.parseReplicationResult);
-                }
-            } catch (ex) {
-                Logger("Error while loading Self-hosted LiveSync", LOG_LEVEL.NOTICE);
-                Logger(ex, LOG_LEVEL.VERBOSE);
-            }
         });
         this.addCommand({
             id: "livesync-replicate",
             name: "Replicate now",
-            callback: () => {
-                this.replicate();
+            callback: async () => {
+                await this.replicate();
             },
         });
         this.addCommand({
             id: "livesync-dump",
             name: "Dump informations of this doc ",
             editorCallback: (editor: Editor, view: MarkdownView) => {
-                this.localDatabase.disposeHashCache();
                 this.localDatabase.getDBEntry(view.file.path, {}, true, false);
             },
         });
@@ -306,11 +318,13 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         }
         const vaultName = this.app.vault.getName();
         Logger("Open Database...");
-        this.localDatabase = new LocalPouchDB(this.settings, vaultName);
+        //@ts-ignore
+        const isMobile = this.app.isMobile;
+        this.localDatabase = new LocalPouchDB(this.settings, vaultName, isMobile);
         this.localDatabase.updateInfo = () => {
             this.refreshStatusText();
         };
-        await this.localDatabase.initializeDatabase();
+        return await this.localDatabase.initializeDatabase();
     }
 
     async garbageCollect() {
@@ -321,6 +335,8 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         this.settings = Object.assign({}, DEFAULT_SETTINGS, await this.loadData());
         this.settings.workingEncrypt = this.settings.encrypt;
         this.settings.workingPassphrase = this.settings.passphrase;
+        // Delete this feature to avoid problems on mobile.
+        this.settings.disableRequestURI = true;
         const lsname = "obsidian-live-sync-vaultanddevicename-" + this.app.vault.getName();
         if (this.settings.deviceAndVaultName != "") {
             if (!localStorage.getItem(lsname)) {
@@ -365,7 +381,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         this.registerEvent(this.app.vault.on("modify", this.watchVaultChange));
         this.registerEvent(this.app.vault.on("delete", this.watchVaultDelete));
         this.registerEvent(this.app.vault.on("rename", this.watchVaultRename));
-        this.registerEvent(this.app.vault.on("create", this.watchVaultChange));
+        this.registerEvent(this.app.vault.on("create", this.watchVaultCreate));
         this.registerEvent(this.app.workspace.on("file-open", this.watchWorkspaceOpen));
         window.addEventListener("visibilitychange", this.watchWindowVisiblity);
     }
@@ -389,10 +405,10 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                 await this.sweepPlugin(false);
             }
             if (this.settings.liveSync) {
-                await this.localDatabase.openReplication(this.settings, true, false, this.parseReplicationResult);
+                this.localDatabase.openReplication(this.settings, true, false, this.parseReplicationResult);
             }
             if (this.settings.syncOnStart) {
-                await this.localDatabase.openReplication(this.settings, false, false, this.parseReplicationResult);
+                this.localDatabase.openReplication(this.settings, false, false, this.parseReplicationResult);
             }
             if (this.settings.periodicReplication) {
                 this.setPeriodicSync();
@@ -408,11 +424,12 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
 
     async watchWorkspaceOpenAsync(file: TFile) {
         await this.applyBatchChange();
-        if (file == null) return;
+        if (file == null) {
+            return;
+        }
         if (this.settings.syncOnFileOpen && !this.suspended) {
             await this.replicate();
         }
-        this.localDatabase.disposeHashCache();
         await this.showIfConflicted(file);
         this.gcHook();
     }
@@ -449,7 +466,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
 
     async applyBatchChange() {
         if (!this.settings.batchSave || this.batchFileChange.length == 0) {
-            return [];
+            return;
         }
         return await runWithLock("batchSave", false, async () => {
             const batchItems = JSON.parse(JSON.stringify(this.batchFileChange)) as string[];
@@ -467,7 +484,8 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                 }
             });
             this.refreshStatusText();
-            return await Promise.all(promises);
+            await allSettledWithConcurrencyLimit(promises, 3);
+            return;
         });
     }
 
@@ -570,7 +588,11 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
     notifies: { [key: string]: { notice: Notice; timer: NodeJS.Timeout; count: number } } = {};
 
     // eslint-disable-next-line require-await
+    lastLog = "";
     async addLog(message: any, level: LOG_LEVEL = LOG_LEVEL.INFO) {
+        if (level == LOG_LEVEL.DEBUG && !isDebug) {
+            return;
+        }
         if (level < LOG_LEVEL.INFO && this.settings && this.settings.lessInformationInLog) {
             return;
         }
@@ -584,6 +606,10 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
 
         this.logMessage = [].concat(this.logMessage).concat([newmessage]).slice(-100);
         console.log(valutName + ":" + newmessage);
+        this.setStatusBarText(null, messagecontent.substring(0, 30));
+        // if (message instanceof Error) {
+        //     console.trace(message);
+        // }
 
         if (level >= LOG_LEVEL.NOTICE) {
             if (messagecontent in this.notifies) {
@@ -702,7 +728,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         }
     }
 
-    async doc2storate_modify(docEntry: EntryBody, file: TFile, force?: boolean) {
+    async doc2storage_modify(docEntry: EntryBody, file: TFile, force?: boolean) {
         const pathSrc = id2path(docEntry._id);
         if (shouldBeIgnored(pathSrc)) {
             return;
@@ -781,7 +807,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         } else if (targetFile instanceof TFile) {
             const doc = change;
             const file = targetFile;
-            await this.doc2storate_modify(doc, file);
+            await this.doc2storage_modify(doc, file);
             this.queueConflictedCheck(file);
         } else {
             Logger(`${id2path(change._id)} is already exist as the folder`);
@@ -803,6 +829,9 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
             if (change._id.startsWith("h:")) {
                 continue;
             }
+            if (change._id == SYNCINFO_ID) {
+                continue;
+            }
             if (change.type != "leaf" && change.type != "versioninfo" && change.type != "milestoneinfo" && change.type != "nodeinfo") {
                 Logger("replication change arrived", LOG_LEVEL.VERBOSE);
                 await this.handleDBChanged(change);
@@ -847,7 +876,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                     a.addEventListener("click", () => this.showPluginSyncModal());
                 });
             });
-            new Notice(fragment, 10000);
+            NewNotice(fragment, 10000);
         } else {
             Logger("Everything is up to date.", LOG_LEVEL.NOTICE);
         }
@@ -902,7 +931,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
             await this.sweepPlugin(false);
         }
         if (this.settings.liveSync) {
-            await this.localDatabase.openReplication(this.settings, true, false, this.parseReplicationResult);
+            this.localDatabase.openReplication(this.settings, true, false, this.parseReplicationResult);
             this.refreshStatusText();
         }
         this.setPeriodicSync();
@@ -945,38 +974,58 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         const procs = getProcessingCounts();
         const procsDisp = procs == 0 ? "" : ` ⏳${procs}`;
         const message = `Sync:${w} ↑${sent} ↓${arrived}${waiting}${procsDisp}`;
-        this.setStatusBarText(message);
+        const locks = getLocks();
+        const pendingTask = locks.pending.length ? `\nPending:${locks.pending.join(", ")}` : "";
+        const runningTask = locks.running.length ? `\nRunning:${locks.running.join(", ")}` : "";
+        this.setStatusBarText(message + pendingTask + runningTask);
     }
 
-    setStatusBarText(message: string) {
-        if (this.lastMessage != message) {
-            this.statusBar.setText(message);
+    logHideTimer: NodeJS.Timeout = null;
+    setStatusBarText(message: string = null, log: string = null) {
+        if (!this.statusBar) return;
+        const newMsg = typeof message == "string" ? message : this.lastMessage;
+        const newLog = typeof log == "string" ? log : this.lastLog;
+        if (`${this.lastMessage}-${this.lastLog}` != `${newMsg}-${newLog}`) {
+            this.statusBar.setText(newMsg.split("\n")[0]);
+
             if (this.settings.showStatusOnEditor) {
                 const root = document.documentElement;
-                root.style.setProperty("--slsmessage", '"' + message + '"');
+                root.style.setProperty("--slsmessage", '"' + (newMsg + "\n" + newLog).split("\n").join("\\a ") + '"');
             } else {
                 const root = document.documentElement;
                 root.style.setProperty("--slsmessage", '""');
             }
-            this.lastMessage = message;
+            if (this.logHideTimer != null) {
+                clearTimeout(this.logHideTimer);
+            }
+            this.logHideTimer = setTimeout(() => this.setStatusBarText(null, ""), 3000);
+            this.lastMessage = newMsg;
+            this.lastLog = newLog;
         }
     }
+    updateStatusBarText() {}
 
     async replicate(showMessage?: boolean) {
         if (this.settings.versionUpFlash != "") {
-            new Notice("Open settings and check message, please.");
+            NewNotice("Open settings and check message, please.");
             return;
         }
         await this.applyBatchChange();
         if (this.settings.autoSweepPlugins) {
             await this.sweepPlugin(false);
         }
-        await this.localDatabase.openReplication(this.settings, false, showMessage, this.parseReplicationResult);
+        this.localDatabase.openReplication(this.settings, false, showMessage, this.parseReplicationResult);
     }
 
     async initializeDatabase(showingNotice?: boolean) {
-        await this.openDatabase();
-        await this.syncAllFiles(showingNotice);
+        if (await this.openDatabase()) {
+            if (this.localDatabase.isReady) {
+                await this.syncAllFiles(showingNotice);
+            }
+            return true;
+        } else {
+            return false;
+        }
     }
 
     async replicateAllToServer(showingNotice?: boolean) {
@@ -1002,7 +1051,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         // synchronize all files between database and storage.
         let notice: Notice = null;
         if (showingNotice) {
-            notice = new Notice("Initializing", 0);
+            notice = NewNotice("Initializing", 0);
         }
         const filesStorage = this.app.vault.getFiles();
         const filesStorageName = filesStorage.map((e) => e.path);
@@ -1024,12 +1073,14 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
             Logger(procedurename);
             let i = 0;
             // let lastTicks = performance.now() + 2000;
+            let workProcs = 0;
             const procs = objects.map(async (e) => {
                 try {
+                    workProcs++;
                     await callback(e);
                     i++;
                     if (i % 25 == 0) {
-                        const notify = `${procedurename} : ${i}/${count}`;
+                        const notify = `${procedurename} : ${workProcs}/${count} (Pending:${workProcs})`;
                         if (notice != null) notice.setMessage(notify);
                         Logger(notify);
                         this.setStatusBarText(notify);
@@ -1037,27 +1088,12 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                 } catch (ex) {
                     Logger(`Error while ${procedurename}`, LOG_LEVEL.NOTICE);
                     Logger(ex);
+                } finally {
+                    workProcs--;
                 }
             });
-            // @ts-ignore
-            if (!Promise.allSettled) {
-                await Promise.all(
-                    procs.map((p) =>
-                        p
-                            .then((value) => ({
-                                status: "fulfilled",
-                                value,
-                            }))
-                            .catch((reason) => ({
-                                status: "rejected",
-                                reason,
-                            }))
-                    )
-                );
-            } else {
-                // @ts-ignore
-                await Promise.allSettled(procs);
-            }
+
+            await allSettledWithConcurrencyLimit(procs, 10);
         };
         await runAll("UPDATE DATABASE", onlyInStorage, async (e) => {
             Logger(`Update into ${e.path}`);
@@ -1329,7 +1365,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
             const file = targetFile;
             const doc = await this.localDatabase.getDBEntry(filename, rev ? { rev: rev } : null, false, waitForReady);
             if (doc === false) return;
-            await this.doc2storate_modify(doc, file, force);
+            await this.doc2storage_modify(doc, file, force);
         } else {
             Logger(`target files:${filename} is exists as the folder`);
             //something went wrong..
@@ -1354,7 +1390,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
             Logger(`${storageMtime} < ${docMtime}`);
             const docx = await this.localDatabase.getDBEntry(file.path, null, false, false);
             if (docx != false) {
-                await this.doc2storate_modify(docx, file);
+                await this.doc2storage_modify(docx, file);
             }
         } else {
             // Logger("EVEN :" + file.path, LOG_LEVEL.VERBOSE);
@@ -1430,6 +1466,9 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
     async resetLocalDatabase() {
         await this.localDatabase.resetDatabase();
     }
+    async resetLocalOldDatabase() {
+        await this.localDatabase.resetLocalOldDatabase();
+    }
 
     async tryResetRemoteDatabase() {
         await this.localDatabase.tryResetRemoteDatabase(this.settings);
@@ -1471,7 +1510,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                 Logger("You have to set your device and vault name.", LOG_LEVEL.NOTICE);
                 return;
             }
-            Logger("Sweeping plugins", logLevel);
+            Logger("Scanning plugins", logLevel);
             const db = this.localDatabase.localDatabase;
             const oldDocs = await db.allDocs({
                 startkey: `ps:${this.deviceAndVaultName}-`,
@@ -1543,7 +1582,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                 return e.doc;
             });
             await db.bulkDocs(delDocs);
-            Logger(`Sweep plugin done.`, logLevel);
+            Logger(`Scan plugin done.`, logLevel);
         });
     }
 

src/pouchdb-browser.ts

@@ -0,0 +1,4 @@
+import { PouchDB as PouchDB_ } from "../pouchdb-browser-webpack/dist/pouchdb-browser.js";
+
+const Pouch: PouchDB.Static = PouchDB_;
+export { Pouch as PouchDB };

src/types.ts

@@ -1,154 +1,7 @@
-// docs should be encoded as base64, so 1 char -> 1 bytes
-// and cloudant limitation is 1MB , we use 900kb;
-
 import { PluginManifest } from "obsidian";
-import * as PouchDB from "pouchdb";
+import { DatabaseEntry } from "./lib/src/types";
 
-export const MAX_DOC_SIZE = 1000; // for .md file, but if delimiters exists. use that before.
-export const MAX_DOC_SIZE_BIN = 102400; // 100kb
-export const VER = 10;
-
-export const RECENT_MOFIDIED_DOCS_QTY = 30;
-export const LEAF_WAIT_TIMEOUT = 90000; // in synchronization, waiting missing leaf time out.
-export const LOG_LEVEL = {
-    VERBOSE: 1,
-    INFO: 10,
-    NOTICE: 100,
-    URGENT: 1000,
-} as const;
-export type LOG_LEVEL = typeof LOG_LEVEL[keyof typeof LOG_LEVEL];
-export const VERSIONINFO_DOCID = "obsydian_livesync_version";
-export const MILSTONE_DOCID = "_local/obsydian_livesync_milestone";
-export const NODEINFO_DOCID = "_local/obsydian_livesync_nodeinfo";
-
-export interface ObsidianLiveSyncSettings {
-    couchDB_URI: string;
-    couchDB_USER: string;
-    couchDB_PASSWORD: string;
-    couchDB_DBNAME: string;
-    liveSync: boolean;
-    syncOnSave: boolean;
-    syncOnStart: boolean;
-    syncOnFileOpen: boolean;
-    savingDelay: number;
-    lessInformationInLog: boolean;
-    gcDelay: number;
-    versionUpFlash: string;
-    minimumChunkSize: number;
-    longLineThreshold: number;
-    showVerboseLog: boolean;
-    suspendFileWatching: boolean;
-    trashInsteadDelete: boolean;
-    periodicReplication: boolean;
-    periodicReplicationInterval: number;
-    encrypt: boolean;
-    passphrase: string;
-    workingEncrypt: boolean;
-    workingPassphrase: string;
-    doNotDeleteFolder: boolean;
-    resolveConflictsByNewerFile: boolean;
-    batchSave: boolean;
-    deviceAndVaultName: string;
-    usePluginSettings: boolean;
-    showOwnPlugins: boolean;
-    showStatusOnEditor: boolean;
-    usePluginSync: boolean;
-    autoSweepPlugins: boolean;
-    autoSweepPluginsPeriodic: boolean;
-    notifyPluginOrSettingUpdated: boolean;
-    checkIntegrityOnSave: boolean;
-    batch_size: number;
-    batches_limit: number;
-    useHistory: boolean;
-    disableRequestURI: boolean;
-}
-
-export const DEFAULT_SETTINGS: ObsidianLiveSyncSettings = {
-    couchDB_URI: "",
-    couchDB_USER: "",
-    couchDB_PASSWORD: "",
-    couchDB_DBNAME: "",
-    liveSync: false,
-    syncOnSave: false,
-    syncOnStart: false,
-    savingDelay: 200,
-    lessInformationInLog: false,
-    gcDelay: 300,
-    versionUpFlash: "",
-    minimumChunkSize: 20,
-    longLineThreshold: 250,
-    showVerboseLog: false,
-    suspendFileWatching: false,
-    trashInsteadDelete: true,
-    periodicReplication: false,
-    periodicReplicationInterval: 60,
-    syncOnFileOpen: false,
-    encrypt: false,
-    passphrase: "",
-    workingEncrypt: false,
-    workingPassphrase: "",
-    doNotDeleteFolder: false,
-    resolveConflictsByNewerFile: false,
-    batchSave: false,
-    deviceAndVaultName: "",
-    usePluginSettings: false,
-    showOwnPlugins: false,
-    showStatusOnEditor: false,
-    usePluginSync: false,
-    autoSweepPlugins: false,
-    autoSweepPluginsPeriodic: false,
-    notifyPluginOrSettingUpdated: false,
-    checkIntegrityOnSave: false,
-    batch_size: 250,
-    batches_limit: 40,
-    useHistory: false,
-    disableRequestURI: false,
-};
-
-export const PERIODIC_PLUGIN_SWEEP = 60;
-
-export interface Entry {
-    _id: string;
-    data: string;
-    _rev?: string;
-    ctime: number;
-    mtime: number;
-    size: number;
-    _deleted?: boolean;
-    _conflicts?: string[];
-    type?: "notes";
-}
-export interface NewEntry {
-    _id: string;
-    children: string[];
-    _rev?: string;
-    ctime: number;
-    mtime: number;
-    size: number;
-    _deleted?: boolean;
-    _conflicts?: string[];
-    NewNote: true;
-    type: "newnote";
-}
-export interface PlainEntry {
-    _id: string;
-    children: string[];
-    _rev?: string;
-    ctime: number;
-    mtime: number;
-    size: number;
-    _deleted?: boolean;
-    NewNote: true;
-    _conflicts?: string[];
-    type: "plain";
-}
-export type LoadedEntry = Entry & {
-    children: string[];
-    datatype: "plain" | "newnote";
-};
-
-export interface PluginDataEntry {
-    _id: string;
+export interface PluginDataEntry extends DatabaseEntry {
     deviceVaultName: string;
     mtime: number;
     manifest: PluginManifest;
@@ -157,73 +10,10 @@ export interface PluginDataEntry {
     styleCss?: string;
     // it must be encrypted.
     dataJson?: string;
-    _rev?: string;
-    _deleted?: boolean;
     _conflicts?: string[];
     type: "plugin";
 }
 
-export interface EntryLeaf {
-    _id: string;
-    data: string;
-    _deleted?: boolean;
-    type: "leaf";
-    _rev?: string;
-}
-
-export interface EntryVersionInfo {
-    _id: typeof VERSIONINFO_DOCID;
-    _rev?: string;
-    type: "versioninfo";
-    version: number;
-    _deleted?: boolean;
-}
-
-export interface EntryMilestoneInfo {
-    _id: typeof MILSTONE_DOCID;
-    _rev?: string;
-    type: "milestoneinfo";
-    _deleted?: boolean;
-    created: number;
-    accepted_nodes: string[];
-    locked: boolean;
-}
-
-export interface EntryNodeInfo {
-    _id: typeof NODEINFO_DOCID;
-    _rev?: string;
-    _deleted?: boolean;
-    type: "nodeinfo";
-    nodeid: string;
-}
-
-export type EntryBody = Entry | NewEntry | PlainEntry;
-export type EntryDoc = EntryBody | LoadedEntry | EntryLeaf | EntryVersionInfo | EntryMilestoneInfo | EntryNodeInfo;
-
-export type diff_result_leaf = {
-    rev: string;
-    data: string;
-    ctime: number;
-    mtime: number;
-};
-export type dmp_result = Array<[number, string]>;
-
-export type diff_result = {
-    left: diff_result_leaf;
-    right: diff_result_leaf;
-    diff: dmp_result;
-};
-export type diff_check_result = boolean | diff_result;
-
-export type Credential = {
-    username: string;
-    password: string;
-};
-
-export type EntryDocResponse = EntryDoc & PouchDB.Core.IdMeta & PouchDB.Core.GetMeta;
-
-export type DatabaseConnectingStatus = "STARTED" | "NOT_CONNECTED" | "PAUSED" | "CONNECTED" | "COMPLETED" | "CLOSED" | "ERRORED";
-
 export interface PluginList {
     [key: string]: PluginDataEntry[];
 }
@@ -231,5 +21,4 @@ export interface PluginList {
 export interface DevicePluginList {
     [key: string]: PluginDataEntry;
 }
-
-export const FLAGMD_REDFLAG = "redflag.md";
+export const PERIODIC_PLUGIN_SWEEP = 60;

src/utils.ts

@@ -1,249 +1,14 @@
 import { normalizePath } from "obsidian";
-import { Logger } from "./logger";
-import { FLAGMD_REDFLAG, LOG_LEVEL } from "./types";
 
-export function arrayBufferToBase64(buffer: ArrayBuffer): Promise<string> {
-    return new Promise((res) => {
-        const blob = new Blob([buffer], { type: "application/octet-binary" });
-        const reader = new FileReader();
-        reader.onload = function (evt) {
-            const dataurl = evt.target.result.toString();
-            res(dataurl.substr(dataurl.indexOf(",") + 1));
-        };
-        reader.readAsDataURL(blob);
-    });
-}
-
-export function base64ToString(base64: string): string {
-    try {
-        const binary_string = window.atob(base64);
-        const len = binary_string.length;
-        const bytes = new Uint8Array(len);
-        for (let i = 0; i < len; i++) {
-            bytes[i] = binary_string.charCodeAt(i);
-        }
-        return new TextDecoder().decode(bytes);
-    } catch (ex) {
-        return base64;
-    }
-}
-export function base64ToArrayBuffer(base64: string): ArrayBuffer {
-    try {
-        const binary_string = window.atob(base64);
-        const len = binary_string.length;
-        const bytes = new Uint8Array(len);
-        for (let i = 0; i < len; i++) {
-            bytes[i] = binary_string.charCodeAt(i);
-        }
-        return bytes.buffer;
-    } catch (ex) {
-        try {
-            return new Uint16Array(
-                [].map.call(base64, function (c: string) {
-                    return c.charCodeAt(0);
-                })
-            ).buffer;
-        } catch (ex2) {
-            return null;
-        }
-    }
-}
-
-export const escapeStringToHTML = (str: string) => {
-    if (!str) return "";
-    return str.replace(/[<>&"'`]/g, (match) => {
-        const escape: any = {
-            "<": "&lt;",
-            ">": "&gt;",
-            "&": "&amp;",
-            '"': "&quot;",
-            "'": "&#39;",
-            "`": "&#x60;",
-        };
-        return escape[match];
-    });
-};
-
-export function resolveWithIgnoreKnownError<T>(p: Promise<T>, def: T): Promise<T> {
-    return new Promise((res, rej) => {
-        p.then(res).catch((ex) => (ex.status && ex.status == 404 ? res(def) : rej(ex)));
-    });
-}
-
-export function isValidPath(filename: string): boolean {
-    // eslint-disable-next-line no-control-regex
-    const regex = /[\u0000-\u001f]|[\\":?<>|*#]/g;
-    let x = filename.replace(regex, "_");
-    const win = /(\\|\/)(COM\d|LPT\d|CON|PRN|AUX|NUL|CLOCK$)($|\.)/gi;
-    const sx = (x = x.replace(win, "/_"));
-    return sx == filename;
-}
-
-export function shouldBeIgnored(filename: string): boolean {
-    if (filename == FLAGMD_REDFLAG) {
-        return true;
-    }
-    return false;
-}
-
-export function versionNumberString2Number(version: string): number {
-    return version // "1.23.45"
-        .split(".") // 1  23  45
-        .reverse() // 45  23  1
-        .map((e, i) => ((e as any) / 1) * 1000 ** i) // 45 23000 1000000
-        .reduce((prev, current) => prev + current, 0); // 1023045
-}
-
-export const delay = (ms: number): Promise<void> => {
-    return new Promise((res) => {
-        setTimeout(() => {
-            res();
-        }, ms);
-    });
-};
+import { path2id_base, id2path_base } from "./lib/src/utils";
 
 // For backward compatibility, using the path for determining id.
 // Only CouchDB nonacceptable ID (that starts with an underscore) has been prefixed with "/".
 // The first slash will be deleted when the path is normalized.
 export function path2id(filename: string): string {
-    let x = normalizePath(filename);
-    if (x.startsWith("_")) x = "/" + x;
-    return x;
+    const x = normalizePath(filename);
+    return path2id_base(x);
 }
 export function id2path(filename: string): string {
-    return normalizePath(filename);
-}
-
-const runningProcs: string[] = [];
-const pendingProcs: { [key: string]: (() => Promise<void>)[] } = {};
-function objectToKey(key: any): string {
-    if (typeof key === "string") return key;
-    const keys = Object.keys(key).sort((a, b) => a.localeCompare(b));
-    return keys.map((e) => e + objectToKey(key[e])).join(":");
-}
-export function getProcessingCounts() {
-    let count = 0;
-    for (const v in pendingProcs) {
-        count += pendingProcs[v].length;
-    }
-    count += runningProcs.length;
-    return count;
-}
-
-let externalNotifier: () => void = () => {};
-let notifyTimer: number = null;
-export function setLockNotifier(fn: () => void) {
-    externalNotifier = fn;
-}
-function notifyLock() {
-    if (notifyTimer != null) {
-        window.clearTimeout(notifyTimer);
-    }
-    notifyTimer = window.setTimeout(() => {
-        externalNotifier();
-    }, 100);
-}
-// Just run async/await as like transacion ISOLATION SERIALIZABLE
-export function runWithLock<T>(key: unknown, ignoreWhenRunning: boolean, proc: () => Promise<T>): Promise<T> {
-    // Logger(`Lock:${key}:enter`, LOG_LEVEL.VERBOSE);
-    const lockKey = typeof key === "string" ? key : objectToKey(key);
-    const handleNextProcs = () => {
-        if (typeof pendingProcs[lockKey] === "undefined") {
-            //simply unlock
-            runningProcs.remove(lockKey);
-            notifyLock();
-            // Logger(`Lock:${lockKey}:released`, LOG_LEVEL.VERBOSE);
-        } else {
-            Logger(`Lock:${lockKey}:left ${pendingProcs[lockKey].length}`, LOG_LEVEL.VERBOSE);
-            let nextProc = null;
-            nextProc = pendingProcs[lockKey].shift();
-            notifyLock();
-            if (nextProc) {
-                // left some
-                nextProc()
-                    .then()
-                    .catch((err) => {
-                        Logger(err);
-                    })
-                    .finally(() => {
-                        if (pendingProcs && lockKey in pendingProcs && pendingProcs[lockKey].length == 0) {
-                            delete pendingProcs[lockKey];
-                            notifyLock();
-                        }
-                        queueMicrotask(() => {
-                            handleNextProcs();
-                        });
-                    });
-            } else {
-                if (pendingProcs && lockKey in pendingProcs && pendingProcs[lockKey].length == 0) {
-                    delete pendingProcs[lockKey];
-                    notifyLock();
-                }
-            }
-        }
-    };
-    if (runningProcs.contains(lockKey)) {
-        if (ignoreWhenRunning) {
-            return null;
-        }
-        if (typeof pendingProcs[lockKey] === "undefined") {
-            pendingProcs[lockKey] = [];
-        }
-        let responderRes: (value: T | PromiseLike<T>) => void;
-        let responderRej: (reason?: unknown) => void;
-        const responder = new Promise<T>((res, rej) => {
-            responderRes = res;
-            responderRej = rej;
-            //wait for subproc resolved
-        });
-        const subproc = () =>
-            new Promise<void>((res, rej) => {
-                proc()
-                    .then((v) => {
-                        // Logger(`Lock:${key}:processed`, LOG_LEVEL.VERBOSE);
-                        handleNextProcs();
-                        responderRes(v);
-                        res();
-                    })
-                    .catch((reason) => {
-                        Logger(`Lock:${key}:rejected`, LOG_LEVEL.VERBOSE);
-                        handleNextProcs();
-                        rej(reason);
-                        responderRej(reason);
-                    });
-            });
-
-        pendingProcs[lockKey].push(subproc);
-        notifyLock();
-        // Logger(`Lock:${lockKey}:queud:left${pendingProcs[lockKey].length}`, LOG_LEVEL.VERBOSE);
-        return responder;
-    } else {
-        runningProcs.push(lockKey);
-        notifyLock();
-        // Logger(`Lock:${lockKey}:aqquired`, LOG_LEVEL.VERBOSE);
-        return new Promise((res, rej) => {
-            proc()
-                .then((v) => {
-                    handleNextProcs();
-                    res(v);
-                })
-                .catch((reason) => {
-                    handleNextProcs();
-                    rej(reason);
-                });
-        });
-    }
-}
-
-export function isPlainText(filename: string): boolean {
-    if (filename.endsWith(".md")) return true;
-    if (filename.endsWith(".txt")) return true;
-    if (filename.endsWith(".svg")) return true;
-    if (filename.endsWith(".html")) return true;
-    if (filename.endsWith(".csv")) return true;
-    if (filename.endsWith(".css")) return true;
-    if (filename.endsWith(".js")) return true;
-    if (filename.endsWith(".xml")) return true;
-
-    return false;
+    return id2path_base(normalizePath(filename));
 }

src/utils_couchdb.ts

@@ -1,7 +1,7 @@
-import { Logger } from "./logger";
-import { LOG_LEVEL, VER, VERSIONINFO_DOCID, EntryVersionInfo, EntryDoc } from "./types";
-import { resolveWithIgnoreKnownError } from "./utils";
-import { PouchDB } from "../pouchdb-browser-webpack/dist/pouchdb-browser.js";
+import { Logger } from "./lib/src/logger";
+import { LOG_LEVEL, VER, VERSIONINFO_DOCID, EntryVersionInfo, EntryDoc, RemoteDBSettings, SYNCINFO_ID, SyncInfo } from "./lib/src/types";
+import { enableEncryption, resolveWithIgnoreKnownError } from "./lib/src/utils";
+import { PouchDB } from "./pouchdb-browser";
 import { requestUrl, RequestUrlParam, RequestUrlResponse } from "obsidian";
 
 export const isValidRemoteCouchDBURI = (uri: string): boolean => {
@@ -27,7 +27,18 @@ const fetchByAPI = async (request: RequestUrlParam): Promise<RequestUrlResponse>
     return ret;
 };
 
-export const connectRemoteCouchDB = async (uri: string, auth: { username: string; password: string }, disableRequestURI: boolean): Promise<string | { db: PouchDB.Database<EntryDoc>; info: PouchDB.Core.DatabaseInfo }> => {
+export const connectRemoteCouchDBWithSetting = (settings: RemoteDBSettings, isMobile: boolean) =>
+    connectRemoteCouchDB(
+        settings.couchDB_URI + (settings.couchDB_DBNAME == "" ? "" : "/" + settings.couchDB_DBNAME),
+        {
+            username: settings.couchDB_USER,
+            password: settings.couchDB_PASSWORD,
+        },
+        settings.disableRequestURI || isMobile,
+        settings.encrypt ? settings.passphrase : settings.encrypt
+    );
+
+const connectRemoteCouchDB = async (uri: string, auth: { username: string; password: string }, disableRequestURI: boolean, passphrase: string | boolean): Promise<string | { db: PouchDB.Database<EntryDoc>; info: PouchDB.Core.DatabaseInfo }> => {
     if (!isValidRemoteCouchDBURI(uri)) return "Remote URI is not valid";
     let authHeader = "";
     if (auth.username && auth.password) {
@@ -41,7 +52,6 @@ export const connectRemoteCouchDB = async (uri: string, auth: { username: string
         adapter: "http",
         auth,
         fetch: async function (url: string | Request, opts: RequestInit) {
-            let size_ok = true;
             let size = "";
             const localURL = url.toString().substring(uri.length);
             const method = opts.method ?? "GET";
@@ -49,7 +59,6 @@ export const connectRemoteCouchDB = async (uri: string, auth: { username: string
                 const opts_length = opts.body.toString().length;
                 if (opts_length > 1024 * 1024 * 10) {
                     // over 10MB
-                    size_ok = false;
                     if (uri.contains(".cloudantnosqldb.")) {
                         last_post_successed = false;
                         Logger("This request should fail on IBM Cloudant.", LOG_LEVEL.VERBOSE);
@@ -84,7 +93,7 @@ export const connectRemoteCouchDB = async (uri: string, auth: { username: string
                     } else {
                         last_post_successed = true;
                     }
-                    Logger(`HTTP:${method}${size} to:${localURL} -> ${r.status}`, LOG_LEVEL.VERBOSE);
+                    Logger(`HTTP:${method}${size} to:${localURL} -> ${r.status}`, LOG_LEVEL.DEBUG);
 
                     return new Response(r.arrayBuffer, {
                         headers: r.headers,
@@ -93,7 +102,8 @@ export const connectRemoteCouchDB = async (uri: string, auth: { username: string
                     });
                 } catch (ex) {
                     Logger(`HTTP:${method}${size} to:${localURL} -> failed`, LOG_LEVEL.VERBOSE);
-                    if (!size_ok && (method == "POST" || method == "PUT")) {
+                    // limit only in bulk_docs.
+                    if (url.toString().indexOf("_bulk_docs") !== -1) {
                         last_post_successed = false;
                     }
                     Logger(ex);
@@ -110,11 +120,12 @@ export const connectRemoteCouchDB = async (uri: string, auth: { username: string
                 } else {
                     last_post_successed = true;
                 }
-                Logger(`HTTP:${method}${size} to:${localURL} -> ${responce.status}`, LOG_LEVEL.VERBOSE);
+                Logger(`HTTP:${method}${size} to:${localURL} -> ${responce.status}`, LOG_LEVEL.DEBUG);
                 return responce;
             } catch (ex) {
                 Logger(`HTTP:${method}${size} to:${localURL} -> failed`, LOG_LEVEL.VERBOSE);
-                if (!size_ok && (method == "POST" || method == "PUT")) {
+                // limit only in bulk_docs.
+                if (url.toString().indexOf("_bulk_docs") !== -1) {
                     last_post_successed = false;
                 }
                 Logger(ex);
@@ -124,6 +135,9 @@ export const connectRemoteCouchDB = async (uri: string, auth: { username: string
         },
     };
     const db: PouchDB.Database<EntryDoc> = new PouchDB<EntryDoc>(uri, conf);
+    if (passphrase && typeof passphrase === "string") {
+        enableEncryption(db, passphrase);
+    }
     try {
         const info = await db.info();
         return { db: db, info: info };
@@ -179,3 +193,32 @@ export const bumpRemoteVersion = async (db: PouchDB.Database, barrier: number =
     await db.put(vi);
     return true;
 };
+
+export const checkSyncInfo = async (db: PouchDB.Database): Promise<boolean> => {
+    try {
+        const syncinfo = (await db.get(SYNCINFO_ID)) as SyncInfo;
+        console.log(syncinfo);
+        // if we could decrypt the doc, it must be ok.
+        return true;
+    } catch (ex) {
+        if (ex.status && ex.status == 404) {
+            const randomStrSrc = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+            const temp = [...Array(30)]
+                .map((e) => Math.floor(Math.random() * randomStrSrc.length))
+                .map((e) => randomStrSrc[e])
+                .join("");
+            const newSyncInfo: SyncInfo = {
+                _id: SYNCINFO_ID,
+                type: "syncinfo",
+                data: temp,
+            };
+            if (await db.put(newSyncInfo)) {
+                return true;
+            }
+            return false;
+        } else {
+            console.dir(ex);
+            return false;
+        }
+    }
+};

styles.css

@@ -1,14 +1,14 @@
 .added {
-    color: black;
-    background-color: white;
+    color: var(--text-on-accent);
+    background-color: var(--text-accent);
 }
 .normal {
-    color: lightgray;
+    color: var(--text-normal);
 }
 .deleted {
-    color: white;
-    background-color: black;
-    /* text-decoration: line-through; */
+    color: var(--text-on-accent);
+    background-color: var(--text-muted);
+    text-decoration: line-through;
 }
 .op-scrollable {
     overflow-y: scroll;
@@ -24,6 +24,25 @@
     padding: 2px;
     border-radius: 4px;
 }
+.op-warn::before {
+    content: "Warning";
+    font-weight: bold;
+    color: salmon;
+    position: relative;
+    display: block;
+}
+.op-warn-info {
+    border: 1px solid rgb(255, 209, 81);
+    padding: 2px;
+    border-radius: 4px;
+}
+.op-warn-info::before {
+    content: "Notice";
+    font-weight: bold;
+    color: rgb(255, 209, 81);
+    position: relative;
+    display: block;
+}
 .syncstatusbar {
     -webkit-filter: grayscale(100%);
     filter: grayscale(100%);
@@ -69,6 +88,8 @@
 .CodeMirror-wrap::before,
 .cm-s-obsidian > .cm-editor::before {
     content: var(--slsmessage);
+    text-align: right;
+    white-space: pre-wrap;
     position: absolute;
     border-radius: 4px;
     /* border:1px solid --background-modifier-border; */
@@ -172,3 +193,19 @@ div.sls-setting-menu-btn {
     background-color: var(--text-muted);
     text-decoration: line-through;
 }
+
+.ob-btn-config-fix label {
+    margin-right: 40px;
+}
+.ob-btn-config-info {
+    border: 1px solid salmon;
+    padding: 2px;
+    margin: 1px;
+    border-radius: 4px;
+}
+
+.ob-btn-config-head {
+    padding: 2px;
+    margin: 1px;
+    border-radius: 4px;
+}

tsconfig.json

@@ -6,7 +6,6 @@
         "allowJs": true,
         "noImplicitAny": true,
         "moduleResolution": "node",
-        "types": ["svelte", "node"],
         // "importsNotUsedAsValues": "error",
         "importHelpers": true,
         "alwaysStrict": true,