Implemented:

- Encrypting setup URI by passphrse.
(Note: You have to make the setup URI again)

Fixed:
- Setup procedure fixed.
- Status text fixed.
- Documentation fixed.

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: vrtmrz

.gitmodules

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

README.md

@@ -36,23 +36,64 @@ Especially, in some companies, people have to store all data to their fully cont
 -   When the device's storage has been run out, Database corruption may happen.
 -   When editing hidden files or any other invisible files from obsidian, the file wouldn't be kept in the database. (**Or be deleted.**)
 
-## Supplements
-
--   When the file has been deleted, the deletion of the file is replicated to other devices.
--   When the folder became empty by replication, The folder will be deleted in the default setting. But you can change this behaivour. Check the [Settings](docs/settings.md).
--   LiveSync drains many batteries in mobile devices.
--   Mobile Obsidian can not connect to the non-secure(HTTP) or local CA-signed servers, even though the certificate is stored in the device store.
--   There are no 'exclude_folders' like configurations.
-
 ## How to use
 
-1. Install from Obsidian, or download from this repo's releases, copy `main.js`, `styles.css` and `manifest.json` into `[your-vault]/.obsidian/plugins/`
-2. Get your database. IBM Cloudant is preferred for testing. Or you can use your own server with CouchDB.
-   For more information, refer below:
-    1. [Setup IBM Cloudant](docs/setup_cloudant.md)
-    2. [Setup your CouchDB](docs/setup_own_server.md)
-3. Enter connection information to Plugin's setting dialog. In details, refer [Settings of Self-hosted LiveSync](docs/settings.md)
-4. Enable LiveSync or other Synchronize method as you like.
+
+### Get your database ready.
+
+First, get your database ready. IBM Cloudant is preferred for testing. Or you can use your own server with CouchDB. For more information, refer below:
+1. [Setup IBM Cloudant](docs/setup_cloudant.md)
+2. [Setup your CouchDB](docs/setup_own_server.md)
+
+### First device
+
+1. Install the plugin on your device.
+2. Configure with the remote database.
+	1. Fill your server's information into the `Remote Database configuration` pane.
+	2. Enabling `End to End Encryption` is recommended. After inputting the passphrase, you have to press `Just apply`.
+	3. Hit `Test Database Connection` and make sure that the plugin says `Connected`.
+	4. Hit `Check database configuration` and make sure all tests have been passed.
+3. Configure how to synchronize on `Sync setting`. (You can leave these  configures later)
+	1. If you want to synchronize in real-time, enable `LiveSync`.
+	2. Or, set up the synchronization as you like.
+	3. Additional configuration is also here. I recommend enabling `Use Trash for deleted files, but you can leave all configurations disabled.
+4. Configure miscellaneous features.
+	1. Enabling `Show staus inside editor` bring you information. While edit mode, you can see the status on the top-right of the editor. (Recommended)
+	2. Enabling `Use history` let you see the diffs between your edit and synchronization. (Recommended)
+5. Back to the editor. I hope that initial scan is in the progress or done.
+6. When status became stabilized (All ⏳ and 🧩 disappeared), you are ready to synchronize with the server.
+7. Press the replicate icon on the Ribbon or run `Replicate now` from the Command pallet. You'll send all your data to the server.
+8. Open the command palette, `Copy setup URI`, and set the passphrase to encrypt the information. Then your configuration will be copied to the clipboard. Please share copied URI with your other devices.
+**IMPORTANT NOTICE: BE CAREFUL TO TREAT THIS URI. THE URI CONTAINS YOUR CREDENTIALS EVEN THOUGH NOBODY COULD READ WITHOUT THE PASSPHRASE.**
+
+### Subsequent Devices
+
+Strongly recommend using the vault in which all files are completely synchronized including timestamps. Otherwise, some files will be corrupted if failed to resolve conflicts. To simplify, I recommend using a new empty vault.
+
+1. Install the plug-in.
+2. Open the link that you copied from the other device.
+   1. If you are hard to open the link (i.e., in android), you can use `Open setup URI` from the command palette and paste the URI into LiveSync manually.
+3. The plug-in asks you that are you sure to apply the configurations. Please answer `Yes` and the following instruction below:
+	1. Answer `Yes` to `Keep local DB?`.
+		*Note: If you started with existed vault, you have to answer `No`. And `No` to `Rebuild the database?`.*
+	2. Answer `Yes` to `Keep remote DB?`.
+	3. Answer `Yes` to `Unlock and replicate?`.
+	Yes, you have to answer `Yes` to everything.
+	Then, all your settings are copied from the first device.
+4. Your notes will arrive soon.
+
+## Something looks corrupted...
+
+Please open the link again and answer as below:
+- If your local database looks corrupted
+(in other words, when your Obsidian getting weird even standalone.)
+	- Answer `No` to `Keep local DB?`
+- If your remote database looks corrupted
+(in other words, when something happens while replicating)
+	- Answer `No` to `Keep remote DB?`
+
+If you answered `No` to both, your databases will be rebuilt by the content on your device. And the remote database will lock out other devices. You have to synchronize all your devices again. (When this time, almost all your files should be synchronized including a timestamp. So you can use the existed vault).
+
 
 ## Test Server
 
@@ -76,10 +117,17 @@ Synchronization status is shown in statusbar.
 -   ↑ Uploaded pieces
 -   ↓ Downloaded pieces
 -   ⏳ Count of the pending process  
+-   🧩 Count of the files that waiting for their chunks.
 If you have deleted or renamed files, please wait until this disappears.
 
-# More supplements
 
+## Supplements
+(This section will be rewrited soon)
+-   When the file has been deleted, the deletion of the file is replicated to other devices.
+-   When the folder became empty by replication, The folder will be deleted in the default setting. But you can change this behaivour. Check the [Settings](docs/settings.md).
+-   LiveSync drains many batteries in mobile devices.
+-   Mobile Obsidian can not connect to the non-secure(HTTP) or local CA-signed servers, even though the certificate is stored in the device store.
+-   There are no 'exclude_folders' like configurations.
 -   When synchronized, files are compared by their modified times and overwritten by the newer ones once. Then plugin checks the conflicts and if a merge is needed, the dialog will open.
 -   Rarely, the file in the database would be broken. The plugin will not write storage when it looks broken, so some old files must be on your device. If you edit the file, it will be cured. But if the file does not exist on any device, can not rescue it. So you can delete these items from the setting dialog.
 -   If your database looks corrupted, try "Drop History". Usually, It is the easiest way.

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
@@ -18,7 +20,51 @@ Note: This password is saved into your Obsidian's vault in plain text.
 The Database name to synchronize.  
 ⚠️If not exist, created automatically.
 
+
+
+### Use the old connecting method
+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.
@@ -44,40 +90,11 @@ As a result, Obsidian's behavior is temporarily slowed down.
 Default is 300 seconds.
 If you are an early adopter, maybe this value is left as 30 seconds. Please change this value to larger values.
 
+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.
-
-### 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.
 
@@ -195,6 +212,29 @@ You can set synchronization method at once as these pattern:
   - Sync on File Open : disabled
   - Sync on Start : disabled
 
+### Use history
+If you enable this option, you can keep document histories in your database.  
+(Not all intermediate changes are synchronized.)  
+You can check the changes caused by your edit and/or replication.
+
+### Enable plugin synchronization
+If you want to use this feature, you have to activate this feature by this switch.
+
+### Sweep plugins automatically
+Plugin sweep will run before replication automatically.
+
+### Sweep plugins periodically
+Plugin sweep will run each 1 minute.
+
+### Notify updates
+When replication is complete, a message will be notified if a newer version of the plugin applied to this device is configured on another device.
+
+### Device and Vault name
+To save the plugins, you have to set a unique name every each device.
+
+### Open
+Open the "Plugins and their settings" dialog.
+
 ## Hatch
 From here, everything is under the hood. Please handle it with care.
 

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文字確保した上で、できるだけ効率的に同期できるよう、ノートを分割してチャンクを作成します。  

esbuild.config.mjs

@@ -0,0 +1,37 @@
+import esbuild from "esbuild";
+import process from "process";
+import builtins from "builtin-modules";
+import sveltePlugin from "esbuild-svelte";
+import sveltePreprocess from "svelte-preprocess";
+
+const banner = `/*
+THIS IS A GENERATED/BUNDLED FILE BY ESBUILD
+if you want to view the source, please visit the github repository of this plugin
+*/
+`;
+
+const prod = process.argv[2] === "production";
+
+esbuild
+    .build({
+        banner: {
+            js: banner,
+        },
+        entryPoints: ["src/main.ts"],
+        bundle: true,
+        external: ["obsidian", "electron", ...builtins],
+        format: "cjs",
+        watch: !prod,
+        target: "es2015",
+        logLevel: "info",
+        sourcemap: prod ? false : "inline",
+        treeShaking: true,
+        plugins: [
+            sveltePlugin({
+                preprocess: sveltePreprocess(),
+                compilerOptions: { css: true },
+            }),
+        ],
+        outfile: "main.js",
+    })
+    .catch(() => process.exit(1));

manifest.json

@@ -1,10 +1,10 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.6.0",
+    "version": "0.11.6",
     "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",
     "authorUrl": "https://github.com/vrtmrz",
     "isDesktopOnly": false
-}
+}

package.json

@@ -1,11 +1,12 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.6.0",
+    "version": "0.11.6",
     "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",
     "scripts": {
-        "dev": "rollup --config rollup.config.js -w",
-        "build": "rollup --config rollup.config.js --environment BUILD:production",
+        "dev": "node esbuild.config.mjs",
+        "build": "node esbuild.config.mjs production",
         "lint": "eslint src"
     },
     "keywords": [],
@@ -16,19 +17,28 @@
         "@rollup/plugin-node-resolve": "^11.2.1",
         "@rollup/plugin-typescript": "^8.2.1",
         "@types/diff-match-patch": "^1.0.32",
+        "@types/pouchdb": "^6.4.0",
         "@types/pouchdb-browser": "^6.1.3",
         "@typescript-eslint/eslint-plugin": "^5.7.0",
         "@typescript-eslint/parser": "^5.0.0",
+        "builtin-modules": "^3.2.0",
+        "esbuild": "0.13.12",
+        "esbuild-svelte": "^0.6.0",
         "eslint": "^7.32.0",
         "eslint-config-airbnb-base": "^14.2.1",
         "eslint-plugin-import": "^2.25.2",
-        "obsidian": "^0.13.11",
+        "obsidian": "^0.14.6",
         "rollup": "^2.32.1",
+        "svelte-preprocess": "^4.10.2",
         "tslib": "^2.2.0",
         "typescript": "^4.2.4"
     },
     "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,7 +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 "./lib/src/types";
+import { Logger } from "./lib/src/logger";
 
 export class DocumentHistoryModal extends Modal {
     plugin: ObsidianLiveSyncPlugin;
@@ -14,6 +17,7 @@ export class DocumentHistoryModal extends Modal {
     file: string;
 
     revs_info: PouchDB.Core.RevisionInfo[] = [];
+    currentText = "";
 
     constructor(app: App, plugin: ObsidianLiveSyncPlugin, file: TFile) {
         super(app);
@@ -37,6 +41,7 @@ export class DocumentHistoryModal extends Modal {
         const index = this.revs_info.length - 1 - (this.range.value as any) / 1;
         const rev = this.revs_info[index];
         const w = await db.getDBEntry(path2id(this.file), { rev: rev.rev }, false, false);
+        this.currentText = "";
 
         if (w === false) {
             this.info.innerHTML = "";
@@ -44,6 +49,7 @@ export class DocumentHistoryModal extends Modal {
         } else {
             this.info.innerHTML = `Modified:${new Date(w.mtime).toLocaleString()}`;
             let result = "";
+            this.currentText = w.data;
             if (this.showDiff) {
                 const prevRevIdx = this.revs_info.length - 1 - ((this.range.value as any) / 1 - 1);
                 if (prevRevIdx >= 0 && prevRevIdx < this.revs_info.length) {
@@ -124,6 +130,14 @@ export class DocumentHistoryModal extends Modal {
         this.contentView = div;
         div.addClass("op-scrollable");
         div.addClass("op-pre");
+        const buttons = contentEl.createDiv("");
+        buttons.createEl("button", { text: "Copy to clipboard" }, (e) => {
+            e.addClass("mod-cta");
+            e.addEventListener("click", async () => {
+                await navigator.clipboard.writeText(this.currentText);
+                Logger(`Old content copied to clipboard`, LOG_LEVEL.NOTICE);
+            });
+        });
     }
     onClose() {
         const { contentEl } = this;

src/KeyValueDB.ts

@@ -0,0 +1,50 @@
+import { deleteDB, IDBPDatabase, openDB } from "idb";
+export interface KeyValueDatabase {
+    get<T>(key: string): Promise<T>;
+    set<T>(key: string, value: T): Promise<IDBValidKey>;
+    del(key: string): Promise<void>;
+    clear(): Promise<void>;
+    keys(query?: IDBValidKey | IDBKeyRange, count?: number): Promise<IDBValidKey[]>;
+    close(): void;
+    destroy(): void;
+}
+const databaseCache: { [key: string]: IDBPDatabase<any> } = {};
+export const OpenKeyValueDatabase = (dbKey: string): KeyValueDatabase => {
+    if (dbKey in databaseCache) {
+        databaseCache[dbKey].close();
+        delete databaseCache[dbKey];
+    }
+    const storeKey = dbKey;
+    const dbPromise = openDB(dbKey, 1, {
+        upgrade(db) {
+            db.createObjectStore(storeKey);
+        },
+    });
+    ~(async () => (databaseCache[dbKey] = await dbPromise))();
+    return {
+        async get<T>(key: string): Promise<T> {
+            return (await dbPromise).get(storeKey, key);
+        },
+        async set<T>(key: string, value: T) {
+            return (await dbPromise).put(storeKey, value, key);
+        },
+        async del(key: string) {
+            return (await dbPromise).delete(storeKey, key);
+        },
+        async clear() {
+            return (await dbPromise).clear(storeKey);
+        },
+        async keys(query?: IDBValidKey | IDBKeyRange, count?: number) {
+            return (await dbPromise).getAllKeys(storeKey, query, count);
+        },
+        async close() {
+            delete databaseCache[dbKey];
+            return (await dbPromise).close();
+        },
+        async destroy() {
+            delete databaseCache[dbKey];
+            (await dbPromise).close();
+            await deleteDB(dbKey);
+        },
+    };
+};

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 { escapeStringToHTML, versionNumberString2Number, 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,10 +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,
-        });
+        // 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;
@@ -73,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 => {
@@ -166,7 +173,125 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                         await this.plugin.saveSettings();
                     })
             )
+
+            // 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("Encrypt contents on the remote database. If you use the plugins synchronizing feature, enabling this is recommend.")
+            .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")
@@ -180,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" });
@@ -223,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>
@@ -499,6 +710,24 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 })
             );
 
+        // new Setting(containerSyncSettingEl)
+        //     .setName("Skip old files on sync")
+        //     .setDesc("Skip old incoming if incoming changes older than storage.")
+        //     .addToggle((toggle) =>
+        //         toggle.setValue(this.plugin.settings.skipOlderFilesOnSync).onChange(async (value) => {
+        //             this.plugin.settings.skipOlderFilesOnSync = value;
+        //             await this.plugin.saveSettings();
+        //         })
+        //     );
+        new Setting(containerSyncSettingEl)
+            .setName("Check conflict only on opening file.")
+            .setDesc("Do not check conflict while replication")
+            .addToggle((toggle) =>
+                toggle.setValue(this.plugin.settings.checkConflictOnlyOnOpen).onChange(async (value) => {
+                    this.plugin.settings.checkConflictOnlyOnOpen = value;
+                    await this.plugin.saveSettings();
+                })
+            );
         containerSyncSettingEl.createEl("div", {
             text: sanitizeHTMLToDom(`Advanced settings<br>
             If you reached the payload size limit when using IBM Cloudant, please set batch size and batch limit to a lower value.`),
@@ -603,7 +832,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             );
 
         new Setting(containerMiscellaneousEl)
-            .setName("Use history (beta)")
+            .setName("Use history")
             .setDesc("Use history dialog (Restart required, auto compaction would be disabled, and more storage will be consumed)")
             .addToggle((toggle) =>
                 toggle.setValue(this.plugin.settings.useHistory).onChange(async (value) => {
@@ -645,7 +874,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;
@@ -678,7 +907,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++;
@@ -704,7 +933,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 () => {
@@ -816,6 +1045,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
@@ -824,26 +1067,18 @@ 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) => {
                 this.plugin.settings.usePluginSync = value;
                 await this.plugin.saveSettings();
-                updatePluginPane();
-            })
-        );
-        new Setting(containerPluginSettings).setName("Show own plugins and settings").addToggle((toggle) =>
-            toggle.setValue(this.plugin.settings.showOwnPlugins).onChange(async (value) => {
-                this.plugin.settings.showOwnPlugins = value;
-                await this.plugin.saveSettings();
-                updatePluginPane();
             })
         );
 
         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;
@@ -853,8 +1088,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;
@@ -877,247 +1112,33 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             .setDesc("")
             .addText((text) => {
                 text.setPlaceholder("desktop-main")
-                    .setValue(this.plugin.settings.deviceAndVaultName)
+                    .setValue(this.plugin.deviceAndVaultName)
                     .onChange(async (value) => {
-                        this.plugin.settings.deviceAndVaultName = value;
+                        this.plugin.deviceAndVaultName = value;
                         await this.plugin.saveSettings();
                     });
                 // text.inputEl.setAttribute("type", "password");
             });
+        new Setting(containerPluginSettings)
+            .setName("Open")
+            .setDesc("Open the plugin dialog")
+            .addButton((button) => {
+                button
+                    .setButtonText("Open")
+                    .setDisabled(false)
+                    .onClick(() => {
+                        this.plugin.showPluginSyncModal();
+                    });
+            });
 
         updateDisabledOfDeviceAndVaultName();
-        const sweepPlugin = async (showMessage: boolean) => {
-            if (!this.plugin.settings.usePluginSync) {
-                return;
-            }
-            await this.plugin.sweepPlugin(showMessage);
-            updatePluginPane();
-        };
-        const updatePluginPane = async () => {
-            pluginConfig.innerHTML = "<div class='sls-plugins-wrap'>Retrieving...</div>";
-            const { plugins, allPlugins, thisDevicePlugins } = await this.plugin.getPluginList();
-            let html = `
-            <div class='sls-plugins-wrap'>
-            <table class='sls-plugins-tbl'>
-            `;
-            for (const vaults in plugins) {
-                if (!this.plugin.settings.showOwnPlugins && vaults == this.plugin.settings.deviceAndVaultName) continue;
-                html += `
-                <tr>
-                    <th colspan=1 class='sls-plugins-tbl-device-head'>${escapeStringToHTML(vaults)}</th>
-                    <td class='sls-plugins-tbl-device-head sls-plugins-tbl-buttons'>
-                        <button class='sls-plugin-apply-all-newer-plugin mod-cta' data-key="${vaults}" aria-label="Apply all newer (without setting)">⚡</button>
-                        <button class='sls-plugin-apply-all-newer-setting mod-cta' data-key="${vaults}" aria-label="Apply all newer settings">📚</button>
-                        <button class='sls-plugin-delete mod-warning' data-key="${vaults}" aria-label="Delete">❌</button>
-                    </td>
-                </tr>`;
-                for (const v of plugins[vaults]) {
-                    const mtime = v.mtime == 0 ? "-" : new Date(v.mtime).toLocaleString();
-                    let settingApplyable: boolean | string = "-";
-                    let settingFleshness = "";
-                    let isSameVersion = false;
-                    let isSameContents = false;
-                    if (thisDevicePlugins[v.manifest.id]) {
-                        if (thisDevicePlugins[v.manifest.id].manifest.version == v.manifest.version) {
-                            isSameVersion = true;
-                        }
-                        if (thisDevicePlugins[v.manifest.id].styleCss == v.styleCss && thisDevicePlugins[v.manifest.id].mainJs == v.mainJs && thisDevicePlugins[v.manifest.id].manifestJson == v.manifestJson) {
-                            isSameContents = true;
-                        }
-                    }
-                    if (thisDevicePlugins[v.manifest.id] && v.dataJson) {
-                        // have this plugin.
-                        const localSetting = thisDevicePlugins[v.manifest.id].dataJson || null;
-
-                        try {
-                            const remoteSetting = v.dataJson;
-                            if (!localSetting) {
-                                settingFleshness = "newer";
-                                settingApplyable = true;
-                            } else if (localSetting == remoteSetting) {
-                                settingApplyable = "even";
-                            } else {
-                                if (v.mtime > thisDevicePlugins[v.manifest.id].mtime) {
-                                    settingFleshness = "newer";
-                                } else {
-                                    settingFleshness = "older";
-                                }
-                                settingApplyable = true;
-                            }
-                        } catch (ex) {
-                            settingApplyable = "could not decrypt";
-                        }
-                    } else if (!v.dataJson) {
-                        settingApplyable = "N/A";
-                    }
-                    // very ugly way.
-                    const piece = `
-                    <tr class='divider'>
-                        <th colspan=2></th>
-                    </tr>
-                    <tr>
-                        <th class='sls-table-head'>${escapeStringToHTML(v.manifest.name)}</th>
-                        <td class="sls-table-tail tcenter">${isSameContents ? "even" : `<button data-key='${v._id}' class='apply-plugin-version mod-cta'>Use (${isSameVersion ? "=" : ""}${v.manifest.version}) </button>`}</td>
-                    </tr>
-                    <tr>
-                        <td class="sls-table-head tcenter">${escapeStringToHTML(mtime)}</td>
-                        <td class="sls-table-tail tcenter">${settingApplyable === true ? "<button data-key='" + v._id + "' class='apply-plugin-data mod-cta'>Apply (" + settingFleshness + ")</button>" : settingApplyable}</td>
-                    </tr>
-                    `;
-                    html += piece;
-                }
-                html += `
-                <tr class='divider'>
-                    <th colspan=2></th>
-                </tr>
-`;
-            }
-            html += "</table></div>";
-            pluginConfig.innerHTML = html;
-            pluginConfig.querySelectorAll(".apply-plugin-data").forEach((e) =>
-                e.addEventListener("click", async (evt) => {
-                    const plugin = allPlugins[e.attributes.getNamedItem("data-key").value];
-                    Logger(`Updating plugin:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                    await this.plugin.applyPluginData(plugin);
-                    Logger(`Setting done:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                    await sweepPlugin(true);
-                })
-            );
-            pluginConfig.querySelectorAll(".apply-plugin-version").forEach((e) =>
-                e.addEventListener("click", async (evt) => {
-                    const plugin = allPlugins[e.attributes.getNamedItem("data-key").value];
-                    Logger(`Setting plugin:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                    await this.plugin.applyPlugin(plugin);
-                    Logger(`Updated plugin:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                    await sweepPlugin(true);
-                })
-            );
-            pluginConfig.querySelectorAll(".sls-plugin-apply-all-newer-plugin").forEach((e) =>
-                e.addEventListener("click", async (evt) => {
-                    Logger("Apply all newer plugins.", LOG_LEVEL.NOTICE);
-                    const vaultname = e.attributes.getNamedItem("data-key").value;
-                    const plugins = Object.values(allPlugins).filter((e) => e.deviceVaultName == vaultname && e.manifest.id != "obsidian-livesync");
-                    for (const plugin of plugins) {
-                        const currentPlugin = thisDevicePlugins[plugin.manifest.id];
-                        if (currentPlugin) {
-                            const thisVersion = versionNumberString2Number(plugin.manifest.version);
-                            const currentVersion = versionNumberString2Number(currentPlugin.manifest.version);
-                            if (thisVersion > currentVersion) {
-                                Logger(`Updating plugin:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                                await this.plugin.applyPlugin(plugin);
-                                Logger(`Updated plugin:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                            } else {
-                                Logger(`Plugin ${plugin.manifest.name} is not new`);
-                            }
-                        } else {
-                            Logger(`Updating plugin:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                            await this.plugin.applyPlugin(plugin);
-                            Logger(`Updated plugin:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                        }
-                    }
-                    await sweepPlugin(true);
-                    Logger("Done", LOG_LEVEL.NOTICE);
-                })
-            );
-            pluginConfig.querySelectorAll(".sls-plugin-apply-all-newer-setting").forEach((e) =>
-                e.addEventListener("click", async (evt) => {
-                    Logger("Apply all newer settings.", LOG_LEVEL.NOTICE);
-                    const vaultname = e.attributes.getNamedItem("data-key").value;
-                    const plugins = Object.values(allPlugins).filter((e) => e.deviceVaultName == vaultname && e.manifest.id != "obsidian-livesync");
-                    for (const plugin of plugins) {
-                        const currentPlugin = thisDevicePlugins[plugin.manifest.id];
-                        if (currentPlugin) {
-                            const thisVersion = plugin.mtime;
-                            const currentVersion = currentPlugin.mtime;
-                            if (thisVersion > currentVersion) {
-                                Logger(`Setting plugin:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                                await this.plugin.applyPluginData(plugin);
-                                Logger(`Setting done:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                            } else {
-                                Logger(`Setting ${plugin.manifest.name} is not new`);
-                            }
-                        } else {
-                            Logger(`Setting plugin:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                            await this.plugin.applyPluginData(plugin);
-                            Logger(`Setting done:${plugin.manifest.name}`, LOG_LEVEL.NOTICE);
-                        }
-                    }
-                    await sweepPlugin(true);
-                    Logger("Done", LOG_LEVEL.NOTICE);
-                })
-            );
-            pluginConfig.querySelectorAll(".sls-plugin-delete").forEach((e) =>
-                e.addEventListener("click", async (evt) => {
-                    const db = this.plugin.localDatabase.localDatabase;
-                    const vaultname = e.attributes.getNamedItem("data-key").value;
-                    const oldDocs = await db.allDocs({ startkey: `ps:${vaultname}-`, endkey: `ps:${vaultname}.`, include_docs: true });
-                    Logger(`Deleting ${vaultname}`, LOG_LEVEL.NOTICE);
-                    const delDocs = oldDocs.rows.map((e) => {
-                        e.doc._deleted = true;
-                        return e.doc;
-                    });
-                    await db.bulkDocs(delDocs);
-                    Logger(`Deleted ${vaultname}`, LOG_LEVEL.NOTICE);
-                    await this.plugin.replicate(true);
-                    await updatePluginPane();
-                })
-            );
-        };
-
-        const pluginConfig = containerPluginSettings.createEl("div");
-
-        new Setting(containerPluginSettings)
-            .setName("Reload")
-            .setDesc("Replicate once and reload the list")
-            .addButton((button) =>
-                button
-                    .setButtonText("Reload")
-                    .setDisabled(false)
-                    .onClick(async () => {
-                        if (!this.plugin.settings.usePluginSync) {
-                            return;
-                        }
-                        await this.plugin.replicate(true);
-                        await updatePluginPane();
-                    })
-            );
-        new Setting(containerPluginSettings)
-            .setName("Save plugins into the database")
-            .setDesc("")
-            .addButton((button) =>
-                button
-                    .setButtonText("Save plugins")
-                    .setDisabled(false)
-                    .onClick(async () => {
-                        if (!this.plugin.settings.usePluginSync) {
-                            return;
-                        }
-                        Logger("Save plugins.", LOG_LEVEL.NOTICE);
-                        await sweepPlugin(true);
-                        Logger("All plugins have been saved.", LOG_LEVEL.NOTICE);
-                        await this.plugin.replicate(true);
-                    })
-            );
-        new Setting(containerPluginSettings)
-            .setName("Check updates")
-            .setDesc("")
-            .addButton((button) =>
-                button
-                    .setButtonText("Check")
-                    .setDisabled(false)
-                    .onClick(async () => {
-                        Logger("Checking plugins.", LOG_LEVEL.NOTICE);
-                        await this.plugin.checkPluginUpdate();
-                    })
-            );
-        updatePluginPane();
 
         addScreenElement("60", containerPluginSettings);
 
         const containerCorruptedDataEl = containerEl.createDiv();
 
-        containerCorruptedDataEl.createEl("h3", { text: "Corrupted data" });
-
+        containerCorruptedDataEl.createEl("h3", { text: "Corrupted or missing data" });
+        containerCorruptedDataEl.createEl("h4", { text: "Corrupted" });
         if (Object.keys(this.plugin.localDatabase.corruptedEntries).length > 0) {
             const cx = containerCorruptedDataEl.createEl("div", { text: "If you have copy of these items on any device, simply edit once or twice. Or not, delete this. sorry.." });
             for (const k in this.plugin.localDatabase.corruptedEntries) {
@@ -1146,6 +1167,38 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         } else {
             containerCorruptedDataEl.createEl("div", { text: "There is no corrupted data." });
         }
+        containerCorruptedDataEl.createEl("h4", { text: "Missing or waiting" });
+        if (Object.keys(this.plugin.queuedFiles).length > 0) {
+            const cx = containerCorruptedDataEl.createEl("div", {
+                text: "These files have missing or waiting chunks. Perhaps almost chunks will be found in a while after replication. But if there're no chunk, you have to restore database entry from existed file by hitting the button below.",
+            });
+            const files = [...new Set([...this.plugin.queuedFiles.map((e) => e.entry._id)])];
+            for (const k of files) {
+                const xx = cx.createEl("div", { text: `${id2path(k)}` });
+
+                const ba = xx.createEl("button", { text: `Delete this` }, (e) => {
+                    e.addEventListener("click", async () => {
+                        await this.plugin.localDatabase.deleteDBEntry(k);
+                        xx.remove();
+                    });
+                });
+                ba.addClass("mod-warning");
+                xx.createEl("button", { text: `Restore from file` }, (e) => {
+                    e.addEventListener("click", async () => {
+                        const f = await this.app.vault.getFiles().filter((e) => path2id(e.path) == k);
+                        if (f.length == 0) {
+                            Logger("Not found in vault", LOG_LEVEL.NOTICE);
+                            return;
+                        }
+                        await this.plugin.updateIntoDB(f[0]);
+                        xx.remove();
+                    });
+                });
+                xx.addClass("mod-warning");
+            }
+        } else {
+            containerCorruptedDataEl.createEl("div", { text: "There is no missing or waiting chunk." });
+        }
         applyDisplayEnabled();
         addScreenElement("70", containerCorruptedDataEl);
         changeDisplay("0");

src/PluginPane.svelte

@@ -0,0 +1,295 @@
+<script lang="ts">
+    import ObsidianLiveSyncPlugin from "./main";
+    import { onMount } from "svelte";
+    import { DevicePluginList, PluginDataEntry } from "./types";
+    import { versionNumberString2Number } from "./lib/src/utils";
+
+    type JudgeResult = "" | "NEWER" | "EVEN" | "EVEN_BUT_DIFFERENT" | "OLDER" | "REMOTE_ONLY";
+
+    interface PluginDataEntryDisp extends PluginDataEntry {
+        versionInfo: string;
+        mtimeInfo: string;
+        mtimeFlag: JudgeResult;
+        versionFlag: JudgeResult;
+    }
+
+    export let plugin: ObsidianLiveSyncPlugin;
+    let plugins: PluginDataEntry[] = [];
+    let deviceAndPlugins: { [key: string]: PluginDataEntryDisp[] } = {};
+    let devicePluginList: [string, PluginDataEntryDisp[]][] = null;
+    let ownPlugins: DevicePluginList = null;
+    let showOwnPlugins = false;
+    let targetList: { [key: string]: boolean } = {};
+
+    function saveTargetList() {
+        window.localStorage.setItem("ols-plugin-targetlist", JSON.stringify(targetList));
+    }
+
+    function loadTargetList() {
+        let e = window.localStorage.getItem("ols-plugin-targetlist") || "{}";
+        try {
+            targetList = JSON.parse(e);
+        } catch (_) {
+            // NO OP.
+        }
+    }
+
+    function clearSelection() {
+        targetList = {};
+    }
+
+    async function updateList() {
+        let x = await plugin.getPluginList();
+        ownPlugins = x.thisDevicePlugins;
+        plugins = Object.values(x.allPlugins);
+        let targetListItems = Array.from(new Set(plugins.map((e) => e.deviceVaultName + "---" + e.manifest.id)));
+        let newTargetList: { [key: string]: boolean } = {};
+        for (const id of targetListItems) {
+            for (const tag of ["---plugin", "---setting"]) {
+                newTargetList[id + tag] = id + tag in targetList && targetList[id + tag];
+            }
+        }
+        targetList = newTargetList;
+        saveTargetList();
+    }
+
+    $: {
+        deviceAndPlugins = {};
+        for (const p of plugins) {
+            if (p.deviceVaultName == plugin.deviceAndVaultName && !showOwnPlugins) {
+                continue;
+            }
+            if (!(p.deviceVaultName in deviceAndPlugins)) {
+                deviceAndPlugins[p.deviceVaultName] = [];
+            }
+            let dispInfo: PluginDataEntryDisp = { ...p, versionInfo: "", mtimeInfo: "", versionFlag: "", mtimeFlag: "" };
+            dispInfo.versionInfo = p.manifest.version;
+            let x = new Date().getTime() / 1000;
+            let mtime = p.mtime / 1000;
+            let diff = (x - mtime) / 60;
+            if (p.mtime == 0) {
+                dispInfo.mtimeInfo = `-`;
+            } else if (diff < 60) {
+                dispInfo.mtimeInfo = `${diff | 0} Mins ago`;
+            } else if (diff < 60 * 24) {
+                dispInfo.mtimeInfo = `${(diff / 60) | 0} Hours ago`;
+            } else if (diff < 60 * 24 * 10) {
+                dispInfo.mtimeInfo = `${(diff / (60 * 24)) | 0} Days ago`;
+            } else {
+                dispInfo.mtimeInfo = new Date(dispInfo.mtime).toLocaleString();
+            }
+            // compare with own plugin
+            let id = p.manifest.id;
+
+            if (id in ownPlugins) {
+                // Which we have.
+                const ownPlugin = ownPlugins[id];
+                let localVer = versionNumberString2Number(ownPlugin.manifest.version);
+                let pluginVer = versionNumberString2Number(p.manifest.version);
+                if (localVer > pluginVer) {
+                    dispInfo.versionFlag = "OLDER";
+                } else if (localVer == pluginVer) {
+                    if (ownPlugin.manifestJson + (ownPlugin.styleCss ?? "") + ownPlugin.mainJs != p.manifestJson + (p.styleCss ?? "") + p.mainJs) {
+                        dispInfo.versionFlag = "EVEN_BUT_DIFFERENT";
+                    } else {
+                        dispInfo.versionFlag = "EVEN";
+                    }
+                } else if (localVer < pluginVer) {
+                    dispInfo.versionFlag = "NEWER";
+                }
+                if ((ownPlugin.dataJson ?? "") == (p.dataJson ?? "")) {
+                    if (ownPlugin.mtime == 0 && p.mtime == 0) {
+                        dispInfo.mtimeFlag = "";
+                    } else {
+                        dispInfo.mtimeFlag = "EVEN";
+                    }
+                } else {
+                    if (((ownPlugin.mtime / 1000) | 0) > ((p.mtime / 1000) | 0)) {
+                        dispInfo.mtimeFlag = "OLDER";
+                    } else if (((ownPlugin.mtime / 1000) | 0) == ((p.mtime / 1000) | 0)) {
+                        dispInfo.mtimeFlag = "EVEN_BUT_DIFFERENT";
+                    } else if (((ownPlugin.mtime / 1000) | 0) < ((p.mtime / 1000) | 0)) {
+                        dispInfo.mtimeFlag = "NEWER";
+                    }
+                }
+            } else {
+                dispInfo.versionFlag = "REMOTE_ONLY";
+                dispInfo.mtimeFlag = "REMOTE_ONLY";
+            }
+
+            deviceAndPlugins[p.deviceVaultName].push(dispInfo);
+        }
+        devicePluginList = Object.entries(deviceAndPlugins);
+    }
+
+    function getDispString(stat: JudgeResult): string {
+        if (stat == "") return "";
+        if (stat == "NEWER") return " (Newer)";
+        if (stat == "OLDER") return " (Older)";
+        if (stat == "EVEN") return " (Even)";
+        if (stat == "EVEN_BUT_DIFFERENT") return " (Even but different)";
+        if (stat == "REMOTE_ONLY") return " (Remote Only)";
+        return "";
+    }
+
+    onMount(async () => {
+        loadTargetList();
+        await updateList();
+    });
+
+    function toggleShowOwnPlugins() {
+        showOwnPlugins = !showOwnPlugins;
+    }
+
+    function toggleTarget(key: string) {
+        targetList[key] = !targetList[key];
+        saveTargetList();
+    }
+
+    function toggleAll(devicename: string) {
+        for (const c in targetList) {
+            if (c.startsWith(devicename)) {
+                targetList[c] = true;
+            }
+        }
+    }
+
+    async function sweepPlugins() {
+        //@ts-ignore
+        await plugin.app.plugins.loadManifests();
+        await plugin.sweepPlugin(true);
+        updateList();
+    }
+
+    async function applyPlugins() {
+        for (const c in targetList) {
+            if (targetList[c] == true) {
+                const [deviceAndVault, id, opt] = c.split("---");
+                if (deviceAndVault in deviceAndPlugins) {
+                    const entry = deviceAndPlugins[deviceAndVault].find((e) => e.manifest.id == id);
+                    if (entry) {
+                        if (opt == "plugin") {
+                            if (entry.versionFlag != "EVEN") await plugin.applyPlugin(entry);
+                        } else if (opt == "setting") {
+                            if (entry.mtimeFlag != "EVEN") await plugin.applyPluginData(entry);
+                        }
+                    }
+                }
+            }
+        }
+        //@ts-ignore
+        await plugin.app.plugins.loadManifests();
+        await plugin.sweepPlugin(true);
+        updateList();
+    }
+
+    async function checkUpdates() {
+        await plugin.checkPluginUpdate();
+    }
+    async function replicateAndRefresh() {
+        await plugin.replicate(true);
+        updateList();
+    }
+</script>
+
+<div>
+    <h1>Plugins and their settings</h1>
+    <div class="ols-plugins-div-buttons">
+        Show own items
+        <div class="checkbox-container" class:is-enabled={showOwnPlugins} on:click={toggleShowOwnPlugins} />
+    </div>
+    <div class="sls-plugins-wrap">
+        <table class="sls-plugins-tbl">
+            <tr style="position:sticky">
+                <th class="sls-plugins-tbl-device-head">Name</th>
+                <th class="sls-plugins-tbl-device-head">Info</th>
+                <th class="sls-plugins-tbl-device-head">Target</th>
+            </tr>
+            {#if !devicePluginList}
+                <tr>
+                    <td colspan="3" class="sls-table-tail tcenter"> Retrieving... </td>
+                </tr>
+            {:else if devicePluginList.length == 0}
+                <tr>
+                    <td colspan="3" class="sls-table-tail tcenter"> No plugins found. </td>
+                </tr>
+            {:else}
+                {#each devicePluginList as [deviceName, devicePlugins]}
+                    <tr>
+                        <th colspan="2" class="sls-plugins-tbl-device-head">{deviceName}</th>
+                        <th class="sls-plugins-tbl-device-head">
+                            <button class="mod-cta" on:click={() => toggleAll(deviceName)}>✔</button>
+                        </th>
+                    </tr>
+                    {#each devicePlugins as plugin}
+                        <tr>
+                            <td class="sls-table-head">{plugin.manifest.name}</td>
+                            <td class="sls-table-tail tcenter">{plugin.versionInfo}{getDispString(plugin.versionFlag)}</td>
+                            <td class="sls-table-tail tcenter">
+                                {#if plugin.versionFlag === "EVEN" || plugin.versionFlag === ""}
+                                    -
+                                {:else}
+                                    <div class="wrapToggle">
+                                        <div
+                                            class="checkbox-container"
+                                            class:is-enabled={targetList[plugin.deviceVaultName + "---" + plugin.manifest.id + "---plugin"]}
+                                            on:click={() => toggleTarget(plugin.deviceVaultName + "---" + plugin.manifest.id + "---plugin")}
+                                        />
+                                    </div>
+                                {/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="sls-table-head">Settings</td>
+                            <td class="sls-table-tail tcenter">{plugin.mtimeInfo}{getDispString(plugin.mtimeFlag)}</td>
+                            <td class="sls-table-tail tcenter">
+                                {#if plugin.mtimeFlag === "EVEN" || plugin.mtimeFlag === ""}
+                                    -
+                                {:else}
+                                    <div class="wrapToggle">
+                                        <div
+                                            class="checkbox-container"
+                                            class:is-enabled={targetList[plugin.deviceVaultName + "---" + plugin.manifest.id + "---setting"]}
+                                            on:click={() => toggleTarget(plugin.deviceVaultName + "---" + plugin.manifest.id + "---setting")}
+                                        />
+                                    </div>
+                                {/if}
+                            </td>
+                        </tr>
+                        <tr class="divider">
+                            <th colspan="3" />
+                        </tr>
+                    {/each}
+                {/each}
+            {/if}
+        </table>
+    </div>
+    <div class="ols-plugins-div-buttons">
+        <button class="" on:click={replicateAndRefresh}>Replicate and refresh</button>
+        <button class="" on:click={clearSelection}>Clear Selection</button>
+    </div>
+
+    <div class="ols-plugins-div-buttons">
+        <button class="mod-cta" on:click={checkUpdates}>Check Updates</button>
+        <button class="mod-cta" on:click={sweepPlugins}>Scan installed</button>
+        <button class="mod-cta" on:click={applyPlugins}>Apply all</button>
+    </div>
+    <!--    <div class="ols-plugins-div-buttons">-->
+    <!--        <button class="mod-warning" on:click={applyPlugins}>Delete all selected</button>-->
+    <!--    </div>-->
+</div>
+
+<style>
+    .ols-plugins-div-buttons {
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-end;
+        margin-top: 8px;
+    }
+
+    .wrapToggle {
+        display: flex;
+        justify-content: center;
+        align-content: center;
+    }
+</style>

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/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,151 +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 { 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;
-}
-
-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,
-};
-
-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;
@@ -154,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[];
 }
@@ -228,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,236 +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);
-                });
-        });
-    }
+    return id2path_base(normalizePath(filename));
 }

src/utils_couchdb.ts

@@ -1,7 +1,8 @@
-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 => {
     if (uri.startsWith("https://")) return true;
@@ -12,13 +13,45 @@ let last_post_successed = false;
 export const getLastPostFailedBySize = () => {
     return !last_post_successed;
 };
-export const connectRemoteCouchDB = async (uri: string, auth: { username: string; password: string }): Promise<string | { db: PouchDB.Database<EntryDoc>; info: PouchDB.Core.DatabaseInfo }> => {
+const fetchByAPI = async (request: RequestUrlParam): Promise<RequestUrlResponse> => {
+    const ret = await requestUrl(request);
+    if (ret.status - (ret.status % 100) !== 200) {
+        const er: Error & { status?: number } = new Error(`Request Error:${ret.status}`);
+        if (ret.json) {
+            er.message = ret.json.reason;
+            er.name = `${ret.json.error ?? ""}:${ret.json.message ?? ""}`;
+        }
+        er.status = ret.status;
+        throw er;
+    }
+    return ret;
+};
+
+export 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) {
+        const utf8str = String.fromCharCode.apply(null, new TextEncoder().encode(`${auth.username}:${auth.password}`));
+        const encoded = window.btoa(utf8str);
+        authHeader = "Basic " + encoded;
+    } else {
+        authHeader = "";
+    }
     const conf: PouchDB.HttpAdapter.HttpAdapterConfiguration = {
         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";
@@ -26,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);
@@ -35,6 +67,52 @@ export const connectRemoteCouchDB = async (uri: string, auth: { username: string
                 }
                 size = ` (${opts_length})`;
             }
+
+            if (!disableRequestURI && typeof url == "string" && typeof (opts.body ?? "") == "string") {
+                const body = opts.body as string;
+
+                const transformedHeaders = { ...(opts.headers as Record<string, string>) };
+                if (authHeader != "") transformedHeaders["authorization"] = authHeader;
+                delete transformedHeaders["host"];
+                delete transformedHeaders["Host"];
+                delete transformedHeaders["content-length"];
+                delete transformedHeaders["Content-Length"];
+                const requestParam: RequestUrlParam = {
+                    url: url as string,
+                    method: opts.method,
+                    body: body,
+                    headers: transformedHeaders,
+                    contentType: "application/json",
+                    // contentType: opts.headers,
+                };
+
+                try {
+                    const r = await fetchByAPI(requestParam);
+                    if (method == "POST" || method == "PUT") {
+                        last_post_successed = r.status - (r.status % 100) == 200;
+                    } else {
+                        last_post_successed = true;
+                    }
+                    Logger(`HTTP:${method}${size} to:${localURL} -> ${r.status}`, LOG_LEVEL.DEBUG);
+
+                    return new Response(r.arrayBuffer, {
+                        headers: r.headers,
+                        status: r.status,
+                        statusText: `${r.status}`,
+                    });
+                } catch (ex) {
+                    Logger(`HTTP:${method}${size} to:${localURL} -> failed`, LOG_LEVEL.VERBOSE);
+                    // limit only in bulk_docs.
+                    if (url.toString().indexOf("_bulk_docs") !== -1) {
+                        last_post_successed = false;
+                    }
+                    Logger(ex);
+                    throw ex;
+                }
+            }
+
+            // -old implementation
+
             try {
                 const responce: Response = await fetch(url, opts);
                 if (method == "POST" || method == "PUT") {
@@ -42,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);
@@ -55,7 +134,11 @@ export const connectRemoteCouchDB = async (uri: string, auth: { username: string
             // return await fetch(url, opts);
         },
     };
+
     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 };
@@ -111,3 +194,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,48 +1,82 @@
 .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);
 }
+
 .op-scrollable {
     overflow-y: scroll;
     /* min-height: 280px; */
     max-height: 280px;
     user-select: text;
 }
+
 .op-pre {
     white-space: pre-wrap;
 }
+
 .op-warn {
     border: 1px solid salmon;
     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%);
 }
+
 .tcenter {
     text-align: center;
 }
+
 .sls-plugins-wrap {
     display: flex;
     flex-grow: 1;
-    /* overflow: scroll; */
+    max-height: 50vh;
+    overflow-y: scroll;
 }
+
 .sls-plugins-tbl {
     border: 1px solid var(--background-modifier-border);
     width: 100%;
+    max-height: 80%;
 }
+
 .divider th {
     border-top: 1px solid var(--background-modifier-border);
 }
+
 /* .sls-table-head{
     width:50%;
 }
@@ -54,9 +88,11 @@
 .sls-btn-left {
     padding-right: 4px;
 }
+
 .sls-btn-right {
     padding-left: 4px;
 }
+
 .sls-hidden {
     display: none;
 }
@@ -64,9 +100,12 @@
 :root {
     --slsmessage: "";
 }
+
 .CodeMirror-wrap::before,
-.cm-s-obsidian > .cm-editor::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; */
@@ -82,12 +121,15 @@
 .CodeMirror-wrap::before {
     right: 0px;
 }
-.cm-s-obsidian > .cm-editor::before {
+
+.cm-s-obsidian>.cm-editor::before {
     right: 16px;
 }
+
 .sls-setting-tab {
     display: none;
 }
+
 div.sls-setting-menu-btn {
     color: var(--text-normal);
     background-color: var(--background-secondary-alt);
@@ -108,8 +150,9 @@ div.sls-setting-menu-btn {
     flex-grow: 1;
     /* width: 100%; */
 }
-.sls-setting-tab:hover ~ div.sls-setting-menu-btn,
-.sls-setting-tab:checked ~ div.sls-setting-menu-btn {
+
+.sls-setting-tab:hover~div.sls-setting-menu-btn,
+.sls-setting-tab:checked~div.sls-setting-menu-btn {
     background-color: var(--interactive-accent);
     color: var(--text-on-accent);
 }
@@ -120,14 +163,17 @@ div.sls-setting-menu-btn {
     /* flex-wrap: wrap; */
     overflow-x: auto;
 }
+
 .sls-setting-label {
     flex-grow: 1;
     display: inline-flex;
     justify-content: center;
 }
+
 .setting-collapsed {
     display: none;
 }
+
 .sls-plugins-tbl-buttons {
     text-align: right;
 }
@@ -136,13 +182,16 @@ div.sls-setting-menu-btn {
     flex-grow: 0;
     padding: 6px 10px;
 }
+
 .sls-plugins-tbl-device-head {
     background-color: var(--background-secondary-alt);
     color: var(--text-accent);
 }
+
 .op-flex {
     display: flex;
 }
+
 .op-flex input {
     display: inline-flex;
     flex-grow: 1;
@@ -162,11 +211,30 @@ div.sls-setting-menu-btn {
     color: var(--text-on-accent);
     background-color: var(--text-accent);
 }
+
 .history-normal {
     color: var(--text-normal);
 }
+
 .history-deleted {
     color: var(--text-on-accent);
     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

@@ -1,21 +1,16 @@
 {
     "compilerOptions": {
         "baseUrl": ".",
-        "inlineSourceMap": true,
-        "inlineSources": true,
         "module": "ESNext",
-        "target": "es6",
+        "target": "ES6",
         "allowJs": true,
         "noImplicitAny": true,
         "moduleResolution": "node",
+        // "importsNotUsedAsValues": "error",
         "importHelpers": true,
-        "noImplicitReturns": true,
-        "noImplicitThis": true,
-        "strictFunctionTypes": true,
         "alwaysStrict": true,
-        "lib": ["dom", "es5", "ES6", "ES7", "es2020"]
+        "lib": ["es2018", "DOM", "ES5", "ES6", "ES7"]
     },
-    "include": ["./src/*.ts"],
-    // "files": ["./src/main.ts"],
+    "include": ["**/*.ts"],
     "exclude": ["pouchdb-browser-webpack"]
 }