Fixed:

- Some extensions are encoded incorrectly.

README.md

@@ -75,12 +75,15 @@ Synchronization status is shown in statusbar.
     -   ⚠ Error occurred.
 -   ↑ Uploaded pieces
 -   ↓ Downloaded pieces
+-   ⏳ Count of the pending process  
+If you have deleted or renamed files, please wait until this disappears.
 
 # More supplements
 
 -   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.
+-   To stop the bootup sequence for fixing problems on databases, you can put `redflag.md` on top of your vault.
 -   Q: Database is growing, how can I shrink it up?
     A: each of the docs is saved with their old 100 revisions to detect and resolve confliction. Picture yourself that one device has been off the line for a while, and joined again. The device has to check his note and remote saved note. If exists in revision histories of remote notes even though the device's note is a little different from the latest one, it could be merged safely. Even if that is not in revision histories, we only have to check differences after the revision that both devices commonly have. This is like The git's conflict resolving method. So, We have to make the database again like an enlarged git repo if you want to solve the root of the problem.
 -   And more technical Information are in the [Technical Information](docs/tech_info.md)

README_ja.md

@@ -78,11 +78,14 @@ Self-hosted LiveSync用にWebClipperも作りました。Chrome Web Storeから
   - ⚠ エラーが発生しています
 - ↑ 送信したデータ数
 - ↓ 受信したデータ数
+-   ⏳ 保留している処理の数です  
+ファイルを削除したりリネームした場合、この表示が消えるまでお待ちください。
 
 # さらなる補足
 - ファイルは同期された後、タイムスタンプを比較して新しければいったん新しい方で上書きされます。その後、衝突が発生したかによって、マージが行われます。
 - まれにファイルが破損することがあります。破損したファイルに関してはディスクへの反映を試みないため、実際には使用しているデバイスには少し古いファイルが残っていることが多いです。そのファイルを再度更新してもらうと、データベースが更新されて問題なくなるケースがあります。ファイルがどの端末にも存在しない場合は、設定画面から、削除できます。
 - データベースが変。そういうときは、いったんデータベースをDrop Historyのapply and sendで再初期化してみてください。だいたい直ります。
+- データベースの復旧中に再起動した場合など、うまくローカルデータベースを修正できない際には、Vaultのトップに`redflag.md`というファイルを置いてください。起動時のシーケンスがスキップされます。
 - データベースが大きくなってきてるんだけど、小さくできる？→各ノートは、それぞれの古い100リビジョンとともに保存されています。例えば、しばらくオフラインだったあるデバイスが、久しぶりに同期したと想定してみてください。そのとき、そのデバイスは最新とは少し異なるリビジョンを持ってるはずです。その場合でも、リモートのリビジョン履歴にリモートのものが存在した場合、安全にマージできます。もしリビジョン履歴に存在しなかった場合、確認しなければいけない差分も、対象を存在して持っている共通のリビジョン以降のみに絞れます。ちょうどGitのような方法で、衝突を解決している形になるのです。そのため、肥大化したリポジトリの解消と同様に、本質的にデータベースを小さくしたい場合は、データベースの作り直しが必要です。
 - その他の技術的なお話は、[技術的な内容](docs/tech_info_ja.md)に書いてあります。
 

docs/settings.md

@@ -212,8 +212,11 @@ The remote database indicates that has been unlocked Pattern 1.
 When you mark all devices as resolved, you can unlock the database.
 But, there's no problem even if you leave it as it is.
 
-### Reread all files
-Reread all files in the vault, and update them into the database if there's diff or could not read from the database.
+### Verify and repair all files
+read all files in the vault, and update them into the database if there's diff or could not read from the database.
+
+### Sanity check
+Make sure that all the files on the local database have all chunks.
 
 ### Drop history
 Drop all histories on the local database and the remote database, and initialize When synchronization time has been prolonged to the new device or new vault, or database size became to be much larger. Try this.

docs/settings_ja.md

@@ -142,12 +142,34 @@ Self-hosted LiveSyncは通常、フォルダ内のファイルがすべて削除
 ### Use newer file if conflicted (beta)
 競合が発生したとき、常に新しいファイルを使用して競合を自動的に解決します。
 
+### Advanced settings
+Self-hosted LiveSyncはPouchDBを使用し、リモートと[このプロトコル](https://docs.couchdb.org/en/stable/replication/protocol.html)で同期しています。  
+そのため、全てのノートなどはデータベースが許容するペイロードサイズやドキュメントサイズに併せてチャンクに分割されています。
+
+しかしながら、それだけでは不十分なケースがあり、[Replicate Changes](https://docs.couchdb.org/en/stable/replication/protocol.html#replicate-changes)の[2.4.2.5.2. Upload Batch of Changed Documents](https://docs.couchdb.org/en/stable/replication/protocol.html#upload-batch-of-changed-documents)を参照すると、このリクエストは巨大になる可能性がありました。
+
+残念ながら、このサイズを呼び出しごとに自動的に調整する方法はありません。  
+そのため、設定を変更できるように機能追加いたしました。
+
+備考：もし小さな値を設定した場合、リクエスト数は増えます。  
+もしサーバから遠い場合、トータルのスループットは遅くなり、転送量は増えます。
+
+### Batch size
+一度に処理するChange feedの数です。デフォルトは250です。
+
+### Batch limit
+一度に処理するBatchの数です。デフォルトは40です。
+
 ## Miscellaneous
 その他の設定です
 ### Show status inside editor
-同期の情報をエディター内に表示します。
+同期の情報をエディター内に表示します。  
 モバイルで便利です。
 
+### Check integrity on saving
+保存時にデータが全て保存できたかチェックを行います。
+
+
 ## Hatch
 ここから先は、困ったときに開ける蓋の中身です。注意して使用してください。
 
@@ -166,9 +188,12 @@ Self-hosted LiveSyncは通常、フォルダ内のファイルがすべて削除
 ご使用のすべてのデバイスでロックを解除した場合は、データベースのロックを解除することができます。  
 ただし、このまま放置しても問題はありません。
 
-### Reread all files
+### Verify and repair all files
 Vault内のファイルを全て読み込み直し、もし差分があったり、データベースから正常に読み込めなかったものに関して、データベースに反映します。
 
+### Sanity check
+ローカルデータベースに保存されている全てのファイルが正しくチャンクを持っていることを確認します。
+
 ### Drop history
 データベースに記録されている履歴を削除し、データベースを初期化します。  
 新しい端末や新しいVaultへの同期にやたらと時間がかかったり、データベースサイズが肥大化したりしてきた際に使用してください。  

manifest.json

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

package-lock.json

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

package.json

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

src/ConflictResolveModal.ts

@@ -7,6 +7,7 @@ export class ConflictResolveModal extends Modal {
     // result: Array<[number, string]>;
     result: diff_result;
     callback: (remove_rev: string) => Promise<void>;
+
     constructor(app: App, diff: diff_result, callback: (remove_rev: string) => Promise<void>) {
         super(app);
         this.result = diff;
@@ -45,18 +46,21 @@ export class ConflictResolveModal extends Modal {
         contentEl.createEl("button", { text: "Keep A" }, (e) => {
             e.addEventListener("click", async () => {
                 await this.callback(this.result.right.rev);
+                this.callback = null;
                 this.close();
             });
         });
         contentEl.createEl("button", { text: "Keep B" }, (e) => {
             e.addEventListener("click", async () => {
                 await this.callback(this.result.left.rev);
+                this.callback = null;
                 this.close();
             });
         });
         contentEl.createEl("button", { text: "Concat both" }, (e) => {
             e.addEventListener("click", async () => {
-                await this.callback(null);
+                await this.callback("");
+                this.callback = null;
                 this.close();
             });
         });
@@ -70,5 +74,8 @@ export class ConflictResolveModal extends Modal {
     onClose() {
         const { contentEl } = this;
         contentEl.empty();
+        if (this.callback != null) {
+            this.callback(null);
+        }
     }
 }

src/DocumentHistoryModal.ts

@@ -0,0 +1,132 @@
+import { TFile, Modal, App } from "obsidian";
+import { path2id, escapeStringToHTML } from "./utils";
+import ObsidianLiveSyncPlugin from "./main";
+import { DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_patch } from "diff-match-patch";
+
+export class DocumentHistoryModal extends Modal {
+    plugin: ObsidianLiveSyncPlugin;
+    range: HTMLInputElement;
+    contentView: HTMLDivElement;
+    info: HTMLDivElement;
+    fileInfo: HTMLDivElement;
+    showDiff = false;
+
+    file: string;
+
+    revs_info: PouchDB.Core.RevisionInfo[] = [];
+
+    constructor(app: App, plugin: ObsidianLiveSyncPlugin, file: TFile) {
+        super(app);
+        this.plugin = plugin;
+        this.file = file.path;
+        if (localStorage.getItem("ols-history-highlightdiff") == "1") {
+            this.showDiff = true;
+        }
+    }
+    async loadFile() {
+        const db = this.plugin.localDatabase;
+        const w = await db.localDatabase.get(path2id(this.file), { revs_info: true });
+        this.revs_info = w._revs_info.filter((e) => e.status == "available");
+        this.range.max = `${this.revs_info.length - 1}`;
+        this.range.value = this.range.max;
+        this.fileInfo.setText(`${this.file} / ${this.revs_info.length} revisions`);
+        await this.loadRevs();
+    }
+    async loadRevs() {
+        const db = this.plugin.localDatabase;
+        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);
+
+        if (w === false) {
+            this.info.innerHTML = "";
+            this.contentView.innerHTML = `Could not read this revision<br>(${rev.rev})`;
+        } else {
+            this.info.innerHTML = `Modified:${new Date(w.mtime).toLocaleString()}`;
+            let result = "";
+            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) {
+                    const oldRev = this.revs_info[prevRevIdx].rev;
+                    const w2 = await db.getDBEntry(path2id(this.file), { rev: oldRev }, false, false);
+                    if (w2 != false) {
+                        const dmp = new diff_match_patch();
+                        const diff = dmp.diff_main(w2.data, w.data);
+                        dmp.diff_cleanupSemantic(diff);
+                        for (const v of diff) {
+                            const x1 = v[0];
+                            const x2 = v[1];
+                            if (x1 == DIFF_DELETE) {
+                                result += "<span class='history-deleted'>" + escapeStringToHTML(x2) + "</span>";
+                            } else if (x1 == DIFF_EQUAL) {
+                                result += "<span class='history-normal'>" + escapeStringToHTML(x2) + "</span>";
+                            } else if (x1 == DIFF_INSERT) {
+                                result += "<span class='history-added'>" + escapeStringToHTML(x2) + "</span>";
+                            }
+                        }
+
+                        result = result.replace(/\n/g, "<br>");
+                    } else {
+                        result = escapeStringToHTML(w.data);
+                    }
+                } else {
+                    result = escapeStringToHTML(w.data);
+                }
+            } else {
+                result = escapeStringToHTML(w.data);
+            }
+            this.contentView.innerHTML = result;
+        }
+    }
+
+    onOpen() {
+        const { contentEl } = this;
+
+        contentEl.empty();
+        contentEl.createEl("h2", { text: "Document History" });
+        this.fileInfo = contentEl.createDiv("");
+        this.fileInfo.addClass("op-info");
+        const divView = contentEl.createDiv("");
+        divView.addClass("op-flex");
+
+        divView.createEl("input", { type: "range" }, (e) => {
+            this.range = e;
+            e.addEventListener("change", (e) => {
+                this.loadRevs();
+            });
+            e.addEventListener("input", (e) => {
+                this.loadRevs();
+            });
+        });
+        contentEl
+            .createDiv("", (e) => {
+                e.createEl("label", {}, (label) => {
+                    label.appendChild(
+                        createEl("input", { type: "checkbox" }, (checkbox) => {
+                            if (this.showDiff) {
+                                checkbox.checked = true;
+                            }
+                            checkbox.addEventListener("input", (evt: any) => {
+                                this.showDiff = checkbox.checked;
+                                localStorage.setItem("ols-history-highlightdiff", this.showDiff == true ? "1" : "");
+                                this.loadRevs();
+                            });
+                        })
+                    );
+                    label.appendText("Highlight diff");
+                });
+            })
+            .addClass("op-info");
+        this.info = contentEl.createDiv("");
+        this.info.addClass("op-info");
+        this.loadFile();
+        const div = contentEl.createDiv({ text: "Loading old revisions..." });
+        this.contentView = div;
+        div.addClass("op-scrollable");
+        div.addClass("op-pre");
+    }
+    onClose() {
+        const { contentEl } = this;
+        contentEl.empty();
+    }
+}

src/LocalPouchDB.ts

@@ -23,9 +23,9 @@ import {
     MILSTONE_DOCID,
     DatabaseConnectingStatus,
 } from "./types";
-import { resolveWithIgnoreKnownError, delay, path2id, runWithLock } from "./utils";
+import { resolveWithIgnoreKnownError, delay, path2id, runWithLock, isPlainText } from "./utils";
 import { Logger } from "./logger";
-import { checkRemoteVersion, connectRemoteCouchDB } from "./utils_couchdb";
+import { checkRemoteVersion, connectRemoteCouchDB, getLastPostFailedBySize } from "./utils_couchdb";
 import { decrypt, encrypt } from "./e2ee";
 
 export class LocalPouchDB {
@@ -121,7 +121,7 @@ export class LocalPouchDB {
         this.changeHandler = this.cancelHandler(this.changeHandler);
         this.localDatabase = null;
         this.localDatabase = new PouchDB<EntryDoc>(this.dbname + "-livesync", {
-            auto_compaction: true,
+            auto_compaction: this.settings.useHistory ? false : true,
             revs_limit: 100,
             deterministic_revs: true,
         });
@@ -403,41 +403,44 @@ export class LocalPouchDB {
     async deleteDBEntry(path: string, opt?: PouchDB.Core.GetOptions): Promise<boolean> {
         await this.waitForGCComplete();
         const id = path2id(path);
+
         try {
             let obj: EntryDocResponse = null;
-            if (opt) {
-                obj = await this.localDatabase.get(id, opt);
-            } else {
-                obj = await this.localDatabase.get(id);
-            }
+            return await runWithLock("file:" + id, false, async () => {
+                if (opt) {
+                    obj = await this.localDatabase.get(id, opt);
+                } else {
+                    obj = await this.localDatabase.get(id);
+                }
 
-            if (obj.type && obj.type == "leaf") {
-                //do nothing for leaf;
-                return false;
-            }
-            //Check it out and fix docs to regular case
-            if (!obj.type || (obj.type && obj.type == "notes")) {
-                obj._deleted = true;
-                const r = await this.localDatabase.put(obj);
-                this.updateRecentModifiedDocs(r.id, r.rev, true);
-                if (typeof this.corruptedEntries[obj._id] != "undefined") {
-                    delete this.corruptedEntries[obj._id];
+                if (obj.type && obj.type == "leaf") {
+                    //do nothing for leaf;
+                    return false;
                 }
-                return true;
-                // simple note
-            }
-            if (obj.type == "newnote" || obj.type == "plain") {
-                obj._deleted = true;
-                const r = await this.localDatabase.put(obj);
-                Logger(`entry removed:${obj._id}-${r.rev}`);
-                this.updateRecentModifiedDocs(r.id, r.rev, true);
-                if (typeof this.corruptedEntries[obj._id] != "undefined") {
-                    delete this.corruptedEntries[obj._id];
+                //Check it out and fix docs to regular case
+                if (!obj.type || (obj.type && obj.type == "notes")) {
+                    obj._deleted = true;
+                    const r = await this.localDatabase.put(obj);
+                    this.updateRecentModifiedDocs(r.id, r.rev, true);
+                    if (typeof this.corruptedEntries[obj._id] != "undefined") {
+                        delete this.corruptedEntries[obj._id];
+                    }
+                    return true;
+                    // simple note
                 }
-                return true;
-            } else {
-                return false;
-            }
+                if (obj.type == "newnote" || obj.type == "plain") {
+                    obj._deleted = true;
+                    const r = await this.localDatabase.put(obj);
+                    Logger(`entry removed:${obj._id}-${r.rev}`);
+                    this.updateRecentModifiedDocs(r.id, r.rev, true);
+                    if (typeof this.corruptedEntries[obj._id] != "undefined") {
+                        delete this.corruptedEntries[obj._id];
+                    }
+                    return true;
+                } else {
+                    return false;
+                }
+            });
         } catch (ex) {
             if (ex.status && ex.status == 404) {
                 return false;
@@ -478,10 +481,13 @@ export class LocalPouchDB {
         let notfound = 0;
         for (const v of delDocs) {
             try {
-                const item = await this.localDatabase.get(v);
-                item._deleted = true;
-                await this.localDatabase.put(item);
-                this.updateRecentModifiedDocs(item._id, item._rev, true);
+                await runWithLock("file:" + v, false, async () => {
+                    const item = await this.localDatabase.get(v);
+                    item._deleted = true;
+                    await this.localDatabase.put(item);
+                    this.updateRecentModifiedDocs(item._id, item._rev, true);
+                });
+
                 deleteCount++;
             } catch (ex) {
                 if (ex.status && ex.status == 404) {
@@ -495,18 +501,6 @@ export class LocalPouchDB {
         Logger(`deleteDBEntryPrefix:deleted ${deleteCount} items, skipped ${notfound}`);
         return true;
     }
-    isPlainText(filename: string): boolean {
-        if (filename.endsWith(".md")) return true;
-        if (filename.endsWith(".txt")) return true;
-        if (filename.endsWith(".svg")) return true;
-        if (filename.endsWith(".html")) return true;
-        if (filename.endsWith(".csv")) return true;
-        if (filename.endsWith(".css")) return true;
-        if (filename.endsWith(".js")) return true;
-        if (filename.endsWith(".xml")) return true;
-
-        return false;
-    }
     async putDBEntry(note: LoadedEntry) {
         await this.waitForGCComplete();
         let leftData = note.data;
@@ -518,7 +512,7 @@ export class LocalPouchDB {
         let plainSplit = false;
         let cacheUsed = 0;
         const userpasswordHash = this.h32Raw(new TextEncoder().encode(this.settings.passphrase));
-        if (this.isPlainText(note._id)) {
+        if (isPlainText(note._id)) {
             pieceSize = MAX_DOC_SIZE;
             plainSplit = true;
         }
@@ -540,7 +534,6 @@ export class LocalPouchDB {
                 cPieceSize = 0;
                 // lookup for next splittion .
                 // we're standing on "\n"
-                // debugger
                 do {
                     const n1 = leftData.indexOf("\n", cPieceSize + 1);
                     const n2 = leftData.indexOf("\n\n", cPieceSize + 1);
@@ -691,33 +684,35 @@ export class LocalPouchDB {
                 type: plainSplit ? "plain" : "newnote",
             };
             // Here for upsert logic,
-            try {
-                const old = await this.localDatabase.get(newDoc._id);
-                if (!old.type || old.type == "notes" || old.type == "newnote" || old.type == "plain") {
-                    // simple use rev for new doc
-                    newDoc._rev = old._rev;
+            await runWithLock("file:" + newDoc._id, false, async () => {
+                try {
+                    const old = await this.localDatabase.get(newDoc._id);
+                    if (!old.type || old.type == "notes" || old.type == "newnote" || old.type == "plain") {
+                        // simple use rev for new doc
+                        newDoc._rev = old._rev;
+                    }
+                } catch (ex) {
+                    if (ex.status && ex.status == 404) {
+                        // NO OP/
+                    } else {
+                        throw ex;
+                    }
                 }
-            } catch (ex) {
-                if (ex.status && ex.status == 404) {
-                    // NO OP/
+                const r = await this.localDatabase.put(newDoc, { force: true });
+                this.updateRecentModifiedDocs(r.id, r.rev, newDoc._deleted);
+                if (typeof this.corruptedEntries[note._id] != "undefined") {
+                    delete this.corruptedEntries[note._id];
+                }
+                if (this.settings.checkIntegrityOnSave) {
+                    if (!this.sanCheck(await this.localDatabase.get(r.id))) {
+                        Logger("note save failed!", LOG_LEVEL.NOTICE);
+                    } else {
+                        Logger(`note has been surely saved:${newDoc._id}:${r.rev}`);
+                    }
                 } else {
-                    throw ex;
+                    Logger(`note saved:${newDoc._id}:${r.rev}`);
                 }
-            }
-            const r = await this.localDatabase.put(newDoc, { force: true });
-            this.updateRecentModifiedDocs(r.id, r.rev, newDoc._deleted);
-            if (typeof this.corruptedEntries[note._id] != "undefined") {
-                delete this.corruptedEntries[note._id];
-            }
-            if (this.settings.checkIntegrityOnSave) {
-                if (!this.sanCheck(await this.localDatabase.get(r.id))) {
-                    Logger("note save failed!", LOG_LEVEL.NOTICE);
-                } else {
-                    Logger(`note has been surely saved:${newDoc._id}:${r.rev}`);
-                }
-            } else {
-                Logger(`note saved:${newDoc._id}:${r.rev}`);
-            }
+            });
         } else {
             Logger(`note coud not saved:${note._id}`);
         }
@@ -756,6 +751,12 @@ export class LocalPouchDB {
             }
 
             const syncOptionBase: PouchDB.Replication.SyncOptions = {
+                pull: {
+                    checkpoint: "target",
+                },
+                push: {
+                    checkpoint: "source",
+                },
                 batches_limit: setting.batches_limit,
                 batch_size: setting.batch_size,
             };
@@ -763,7 +764,7 @@ export class LocalPouchDB {
             const db = dbret.db;
             const totalCount = (await this.localDatabase.info()).doc_count;
             //replicate once
-            const replicate = this.localDatabase.replicate.to(db, syncOptionBase);
+            const replicate = this.localDatabase.replicate.to(db, { checkpoint: "source", ...syncOptionBase });
             replicate
                 .on("active", () => {
                     this.syncStatus = "CONNECTED";
@@ -799,7 +800,7 @@ export class LocalPouchDB {
         });
     }
 
-    async checkReplicationConnectivity(setting: ObsidianLiveSyncSettings, keepAlive: boolean) {
+    async checkReplicationConnectivity(setting: ObsidianLiveSyncSettings, keepAlive: boolean, skipCheck: boolean) {
         if (!this.isReady) {
             Logger("Database is not ready.");
             return false;
@@ -825,69 +826,95 @@ export class LocalPouchDB {
             return false;
         }
 
-        if (!(await checkRemoteVersion(dbret.db, this.migrate.bind(this), VER))) {
-            Logger("Remote database is newer or corrupted, make sure to latest version of self-hosted-livesync installed", LOG_LEVEL.NOTICE);
-            return false;
+        if (!skipCheck) {
+            if (!(await checkRemoteVersion(dbret.db, this.migrate.bind(this), VER))) {
+                Logger("Remote database is newer or corrupted, make sure to latest version of self-hosted-livesync installed", LOG_LEVEL.NOTICE);
+                return false;
+            }
+
+            const defMilestonePoint: EntryMilestoneInfo = {
+                _id: MILSTONE_DOCID,
+                type: "milestoneinfo",
+                created: (new Date() as any) / 1,
+                locked: false,
+                accepted_nodes: [this.nodeid],
+            };
+            // const remoteInfo = dbret.info;
+            // const localInfo = await this.localDatabase.info();
+            // const remoteDocsCount = remoteInfo.doc_count;
+            // const localDocsCount = localInfo.doc_count;
+            // const remoteUpdSeq = typeof remoteInfo.update_seq == "string" ? Number(remoteInfo.update_seq.split("-")[0]) : remoteInfo.update_seq;
+            // const localUpdSeq = typeof localInfo.update_seq == "string" ? Number(localInfo.update_seq.split("-")[0]) : localInfo.update_seq;
+
+            // Logger(`Database diffences: remote:${remoteDocsCount} docs / last update ${remoteUpdSeq}`);
+            // Logger(`Database diffences: local :${localDocsCount} docs / last update ${localUpdSeq}`);
+
+            const remoteMilestone: EntryMilestoneInfo = await resolveWithIgnoreKnownError(dbret.db.get(MILSTONE_DOCID), defMilestonePoint);
+            this.remoteLocked = remoteMilestone.locked;
+            this.remoteLockedAndDeviceNotAccepted = remoteMilestone.locked && remoteMilestone.accepted_nodes.indexOf(this.nodeid) == -1;
+
+            if (remoteMilestone.locked && remoteMilestone.accepted_nodes.indexOf(this.nodeid) == -1) {
+                Logger("Remote database marked as 'Auto Sync Locked'. And this devide does not marked as resolved device. see settings dialog.", LOG_LEVEL.NOTICE);
+                return false;
+            }
+            if (typeof remoteMilestone._rev == "undefined") {
+                await dbret.db.put(remoteMilestone);
+            }
         }
-
-        const defMilestonePoint: EntryMilestoneInfo = {
-            _id: MILSTONE_DOCID,
-            type: "milestoneinfo",
-            created: (new Date() as any) / 1,
-            locked: false,
-            accepted_nodes: [this.nodeid],
-        };
-
-        const remoteMilestone: EntryMilestoneInfo = await resolveWithIgnoreKnownError(dbret.db.get(MILSTONE_DOCID), defMilestonePoint);
-        this.remoteLocked = remoteMilestone.locked;
-        this.remoteLockedAndDeviceNotAccepted = remoteMilestone.locked && remoteMilestone.accepted_nodes.indexOf(this.nodeid) == -1;
-
-        if (remoteMilestone.locked && remoteMilestone.accepted_nodes.indexOf(this.nodeid) == -1) {
-            Logger("Remote database marked as 'Auto Sync Locked'. And this devide does not marked as resolved device. see settings dialog.", LOG_LEVEL.NOTICE);
-            return false;
-        }
-        if (typeof remoteMilestone._rev == "undefined") {
-            await dbret.db.put(remoteMilestone);
-        }
-
         const syncOptionBase: PouchDB.Replication.SyncOptions = {
             batches_limit: setting.batches_limit,
             batch_size: setting.batch_size,
         };
         const syncOption: PouchDB.Replication.SyncOptions = keepAlive ? { live: true, retry: true, heartbeat: 30000, ...syncOptionBase } : { ...syncOptionBase };
 
-        return { db: dbret.db, syncOptionBase, syncOption };
+        return { db: dbret.db, info: dbret.info, syncOptionBase, syncOption };
     }
 
     async openReplication(setting: ObsidianLiveSyncSettings, keepAlive: boolean, showResult: boolean, callback: (e: PouchDB.Core.ExistingDocument<EntryDoc>[]) => Promise<void>): Promise<boolean> {
         return await runWithLock("replicate", false, () => {
-            return this._openReplication(setting, keepAlive, showResult, callback);
+            return this._openReplication(setting, keepAlive, showResult, callback, false);
         });
     }
 
-    async _openReplication(setting: ObsidianLiveSyncSettings, keepAlive: boolean, showResult: boolean, callback: (e: PouchDB.Core.ExistingDocument<EntryDoc>[]) => Promise<void>): Promise<boolean> {
-        const ret = await this.checkReplicationConnectivity(setting, keepAlive);
+    originalSetting: ObsidianLiveSyncSettings = null;
+    // last_seq: number = 200;
+    async _openReplication(setting: ObsidianLiveSyncSettings, keepAlive: boolean, showResult: boolean, callback: (e: PouchDB.Core.ExistingDocument<EntryDoc>[]) => Promise<void>, retrying: boolean): Promise<boolean> {
+        const ret = await this.checkReplicationConnectivity(setting, keepAlive, retrying);
         if (ret === false) return false;
         let notice: Notice = null;
         if (showResult) {
-            notice = new Notice("Replicating", 0);
+            notice = new Notice("Looking for the point last synchronized point.", 0);
         }
         const { db, syncOptionBase, syncOption } = ret;
         //replicate once
         this.syncStatus = "STARTED";
+        this.updateInfo();
 
         let resolved = false;
         const docArrivedOnStart = this.docArrived;
         const docSentOnStart = this.docSent;
+
         const _openReplicationSync = () => {
             Logger("Sync Main Started");
+            if (!retrying) {
+                this.originalSetting = setting;
+            }
             this.syncHandler = this.cancelHandler(this.syncHandler);
-            this.syncHandler = this.localDatabase.sync<EntryDoc>(db, syncOption);
+            this.syncHandler = this.localDatabase.sync<EntryDoc>(db, {
+                ...syncOption,
+                pull: {
+                    checkpoint: "target",
+                },
+                push: {
+                    checkpoint: "source",
+                },
+            });
             this.syncHandler
                 .on("active", () => {
                     this.syncStatus = "CONNECTED";
                     this.updateInfo();
                     Logger("Replication activated");
+                    if (notice != null) notice.setMessage(`Activated..`);
                 })
                 .on("change", async (e) => {
                     try {
@@ -908,6 +935,16 @@ export class LocalPouchDB {
                         Logger("Replication callback error");
                         Logger(ex);
                     }
+                    // re-connect to retry with original setting
+                    if (retrying) {
+                        if (this.docSent - docSentOnStart + (this.docArrived - docArrivedOnStart) > this.originalSetting.batch_size * 2) {
+                            // restore sync values
+                            Logger("Back into original settings once.");
+                            if (notice != null) notice.hide();
+                            this.syncHandler = this.cancelHandler(this.syncHandler);
+                            this._openReplication(this.originalSetting, keepAlive, showResult, callback, false);
+                        }
+                    }
                 })
                 .on("complete", (e) => {
                     this.syncStatus = "COMPLETED";
@@ -932,8 +969,25 @@ export class LocalPouchDB {
                     this.syncHandler = this.cancelHandler(this.syncHandler);
                     this.updateInfo();
                     if (notice != null) notice.hide();
-                    Logger("Replication error", LOG_LEVEL.NOTICE);
-                    Logger(e);
+                    if (getLastPostFailedBySize()) {
+                        if (keepAlive) {
+                            Logger("Replication stopped.", LOG_LEVEL.NOTICE);
+                        } else {
+                            // Duplicate settings for smaller batch.
+                            const xsetting: ObsidianLiveSyncSettings = JSON.parse(JSON.stringify(setting));
+                            xsetting.batch_size = Math.ceil(xsetting.batch_size / 2);
+                            xsetting.batches_limit = Math.ceil(xsetting.batches_limit / 2);
+                            if (xsetting.batch_size <= 3 || xsetting.batches_limit <= 3) {
+                                Logger("We can't replicate more lower value.", showResult ? LOG_LEVEL.NOTICE : LOG_LEVEL.INFO);
+                            } else {
+                                Logger(`Retry with lower batch size:${xsetting.batch_size}/${xsetting.batches_limit}`, showResult ? LOG_LEVEL.NOTICE : LOG_LEVEL.INFO);
+                                this._openReplication(xsetting, keepAlive, showResult, callback, true);
+                            }
+                        }
+                    } else {
+                        Logger("Replication error", LOG_LEVEL.NOTICE);
+                        Logger(e);
+                    }
                 })
                 .on("paused", (e) => {
                     this.syncStatus = "PAUSED";
@@ -958,7 +1012,7 @@ export class LocalPouchDB {
         Logger(await db.info(), LOG_LEVEL.VERBOSE);
         let replicate: PouchDB.Replication.Replication<EntryDoc>;
         try {
-            replicate = this.localDatabase.replicate.from(db, syncOptionBase);
+            replicate = this.localDatabase.replicate.from(db, { checkpoint: "target", ...syncOptionBase });
             replicate
                 .on("active", () => {
                     this.syncStatus = "CONNECTED";
@@ -996,7 +1050,6 @@ export class LocalPouchDB {
             this.cancelHandler(replicate);
             this.syncHandler = this.cancelHandler(this.syncHandler);
             if (notice != null) notice.hide();
-            // debugger;
             throw ex;
         }
     }
@@ -1139,7 +1192,13 @@ export class LocalPouchDB {
         }
         return false;
     }
+
     async garbageCollect() {
+        // if (this.settings.useHistory) {
+        //     Logger("GC skipped for using history", LOG_LEVEL.VERBOSE);
+        //     return;
+        // }
+        // NOTE:Garbage collection could break old revisions.
         await runWithLock("replicate", true, async () => {
             if (this.gcRunning) return;
             this.gcRunning = true;
@@ -1153,29 +1212,36 @@ export class LocalPouchDB {
                 let usedPieces: string[] = [];
                 Logger("Collecting Garbage");
                 do {
-                    const result = await this.localDatabase.allDocs({ include_docs: true, skip: c, limit: 500, conflicts: true });
+                    const result = await this.localDatabase.allDocs({ include_docs: false, skip: c, limit: 2000, conflicts: true });
                     readCount = result.rows.length;
                     Logger("checked:" + readCount);
                     if (readCount > 0) {
                         //there are some result
                         for (const v of result.rows) {
-                            const doc = v.doc;
-                            if (doc.type == "newnote" || doc.type == "plain") {
-                                // used pieces memo.
-                                usedPieces = Array.from(new Set([...usedPieces, ...doc.children]));
-                                if (doc._conflicts) {
-                                    for (const cid of doc._conflicts) {
-                                        const p = await this.localDatabase.get<EntryDoc>(doc._id, { rev: cid });
-                                        if (p.type == "newnote" || p.type == "plain") {
-                                            usedPieces = Array.from(new Set([...usedPieces, ...p.children]));
+                            if (v.id.startsWith("h:")) {
+                                hashPieces = Array.from(new Set([...hashPieces, v.id]));
+                            } else {
+                                const docT = await this.localDatabase.get(v.id, { revs_info: true });
+                                const revs = docT._revs_info;
+                                // console.log(`revs:${revs.length}`)
+                                for (const rev of revs) {
+                                    if (rev.status != "available") continue;
+                                    // console.log(`id:${docT._id},rev:${rev.rev}`);
+                                    const doc = await this.localDatabase.get(v.id, { rev: rev.rev });
+                                    if ("children" in doc) {
+                                        // used pieces memo.
+                                        usedPieces = Array.from(new Set([...usedPieces, ...doc.children]));
+                                        if (doc._conflicts) {
+                                            for (const cid of doc._conflicts) {
+                                                const p = await this.localDatabase.get<EntryDoc>(doc._id, { rev: cid });
+                                                if (p.type == "newnote" || p.type == "plain") {
+                                                    usedPieces = Array.from(new Set([...usedPieces, ...p.children]));
+                                                }
+                                            }
                                         }
                                     }
                                 }
                             }
-                            if (doc.type == "leaf") {
-                                // all pieces.
-                                hashPieces = Array.from(new Set([...hashPieces, doc._id]));
-                            }
                         }
                     }
                     c += readCount;

src/ObsidianLiveSyncSettingTab.ts

@@ -72,7 +72,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
 
         const containerRemoteDatabaseEl = containerEl.createDiv();
         containerRemoteDatabaseEl.createEl("h3", { text: "Remote Database configuration" });
-        const syncWarn = containerRemoteDatabaseEl.createEl("div", { text: "The remote configuration is locked while any synchronization is enabled." });
+        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("sls-hidden");
 
@@ -602,6 +602,15 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     })
             );
 
+        new Setting(containerMiscellaneousEl)
+            .setName("Use history (beta)")
+            .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) => {
+                    this.plugin.settings.useHistory = value;
+                    await this.plugin.saveSettings();
+                })
+            );
         addScreenElement("40", containerMiscellaneousEl);
 
         const containerHatchEl = containerEl.createDiv();
@@ -635,6 +644,8 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 c.addClass("op-warn");
             }
         }
+        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");
         const dropHistory = async (sendToServer: boolean) => {
             this.plugin.settings.liveSync = false;
             this.plugin.settings.periodicReplication = false;
@@ -763,6 +774,10 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                 })
             );
 
+        containerHatchEl.createEl("div", {
+            text: sanitizeHTMLToDom(`Advanced buttons<br>
+                These buttons could break your database easily.`),
+        });
         new Setting(containerHatchEl)
             .setName("Reset remote database")
             .setDesc("Reset remote database, this affects only database. If you replicate again, remote database will restored by local database.")
@@ -805,7 +820,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
         // With great respect, thank you TfTHacker!
         // refered: https://github.com/TfTHacker/obsidian42-brat/blob/main/src/features/BetaPlugins.ts
         const containerPluginSettings = containerEl.createDiv();
-        containerPluginSettings.createEl("h3", { text: "Plugins and settings (bleeding edge)" });
+        containerPluginSettings.createEl("h3", { text: "Plugins and settings (beta)" });
 
         const updateDisabledOfDeviceAndVaultName = () => {
             vaultName.setDisabled(this.plugin.settings.autoSweepPlugins || this.plugin.settings.autoSweepPluginsPeriodic);

src/main.ts

@@ -1,13 +1,30 @@
 import { debounce, Notice, Plugin, TFile, addIcon, TFolder, normalizePath, TAbstractFile, Editor, MarkdownView, PluginManifest } from "obsidian";
 import { diff_match_patch } from "diff-match-patch";
 
-import { EntryDoc, LoadedEntry, ObsidianLiveSyncSettings, diff_check_result, diff_result_leaf, EntryBody, PluginDataEntry, LOG_LEVEL, VER, PERIODIC_PLUGIN_SWEEP, DEFAULT_SETTINGS, PluginList, DevicePluginList } from "./types";
-import { base64ToString, arrayBufferToBase64, base64ToArrayBuffer, isValidPath, versionNumberString2Number, id2path, path2id, runWithLock } from "./utils";
+import {
+    EntryDoc,
+    LoadedEntry,
+    ObsidianLiveSyncSettings,
+    diff_check_result,
+    diff_result_leaf,
+    EntryBody,
+    PluginDataEntry,
+    LOG_LEVEL,
+    VER,
+    PERIODIC_PLUGIN_SWEEP,
+    DEFAULT_SETTINGS,
+    PluginList,
+    DevicePluginList,
+    diff_result,
+    FLAGMD_REDFLAG,
+} from "./types";
+import { base64ToString, arrayBufferToBase64, base64ToArrayBuffer, isValidPath, versionNumberString2Number, id2path, path2id, runWithLock, shouldBeIgnored, getProcessingCounts, setLockNotifier, isPlainText } from "./utils";
 import { Logger, setLogger } from "./logger";
 import { LocalPouchDB } from "./LocalPouchDB";
 import { LogDisplayModal } from "./LogDisplayModal";
 import { ConflictResolveModal } from "./ConflictResolveModal";
 import { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab";
+import { DocumentHistoryModal } from "./DocumentHistoryModal";
 
 export default class ObsidianLiveSyncPlugin extends Plugin {
     settings: ObsidianLiveSyncSettings;
@@ -22,13 +39,27 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         this.registerInterval(timer);
         return timer;
     }
+    isRedFlagRaised(): boolean {
+        const redflag = this.app.vault.getAbstractFileByPath(normalizePath(FLAGMD_REDFLAG));
+        if (redflag != null) {
+            return true;
+        }
+        return false;
+    }
+    showHistory(file: TFile) {
+        if (!this.settings.useHistory) {
+            Logger("You have to enable Use History in misc.", LOG_LEVEL.NOTICE);
+        } else {
+            new DocumentHistoryModal(this.app, this, file).open();
+        }
+    }
     async onload() {
         setLogger(this.addLog.bind(this)); // Logger moved to global.
         Logger("loading plugin");
         const lsname = "obsidian-live-sync-ver" + this.app.vault.getName();
         const last_version = localStorage.getItem(lsname);
         await this.loadSettings();
-        if (!last_version || Number(last_version) < VER) {
+        if (last_version && Number(last_version) < VER) {
             this.settings.liveSync = false;
             this.settings.syncOnSave = false;
             this.settings.syncOnStart = false;
@@ -90,7 +121,27 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
 
         this.app.workspace.onLayoutReady(async () => {
             try {
-                await this.initializeDatabase();
+                if (this.isRedFlagRaised()) {
+                    this.settings.batchSave = false;
+                    this.settings.liveSync = false;
+                    this.settings.periodicReplication = false;
+                    this.settings.syncOnSave = false;
+                    this.settings.syncOnStart = false;
+                    this.settings.syncOnFileOpen = false;
+                    this.settings.autoSweepPlugins = false;
+                    this.settings.usePluginSync = false;
+                    this.settings.suspendFileWatching = true;
+                    await this.saveSettings();
+                    await this.openDatabase();
+                    const warningMessage = "The red flag is raised! The whole initialize steps are skipped, and any file changes are not captured.";
+                    Logger(warningMessage, LOG_LEVEL.NOTICE);
+                    this.setStatusBarText(warningMessage);
+                } else {
+                    if (this.settings.suspendFileWatching) {
+                        Logger("'Suspend file watching' turned on. Are you sure this is what you intended? Every modification on the vault will be ignored.", LOG_LEVEL.NOTICE);
+                    }
+                    await this.initializeDatabase();
+                }
                 await this.realizeSettingSyncMode();
                 this.registerWatchEvents();
                 if (this.settings.syncOnStart) {
@@ -116,6 +167,13 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                 this.localDatabase.getDBEntry(view.file.path, {}, true, false);
             },
         });
+        this.addCommand({
+            id: "livesync-checkdoc-conflicted",
+            name: "Resolve if conflicted.",
+            editorCallback: async (editor: Editor, view: MarkdownView) => {
+                await this.showIfConflicted(view.file);
+            },
+        });
         this.addCommand({
             id: "livesync-gc",
             name: "garbage collect now",
@@ -153,8 +211,18 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                 this.saveSettings();
             },
         });
+        this.addCommand({
+            id: "livesync-history",
+            name: "Show history",
+            editorCallback: (editor: Editor, view: MarkdownView) => {
+                this.showHistory(view.file);
+            },
+        });
         this.triggerRealizeSettingSyncMode = debounce(this.triggerRealizeSettingSyncMode.bind(this), 1000);
         this.triggerCheckPluginUpdate = debounce(this.triggerCheckPluginUpdate.bind(this), 3000);
+        setLockNotifier(() => {
+            this.refreshStatusText();
+        });
     }
     onunload() {
         this.localDatabase.onunload();
@@ -203,6 +271,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
     gcTimerHandler: any = null;
     gcHook() {
         if (this.settings.gcDelay == 0) return;
+        if (this.settings.useHistory) return;
         const GC_DELAY = this.settings.gcDelay * 1000; // if leaving opening window, try GC,
         if (this.gcTimerHandler != null) {
             clearTimeout(this.gcTimerHandler);
@@ -284,18 +353,18 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         this.watchVaultChangeAsync(file, ...args);
     }
     async applyBatchChange() {
+        if (!this.settings.batchSave || this.batchFileChange.length == 0) {
+            return [];
+        }
         return await runWithLock("batchSave", false, async () => {
             const batchItems = JSON.parse(JSON.stringify(this.batchFileChange)) as string[];
             this.batchFileChange = [];
-            const files = this.app.vault.getFiles();
             const promises = batchItems.map(async (e) => {
                 try {
-                    if (await this.app.vault.adapter.exists(normalizePath(e))) {
-                        const f = files.find((f) => f.path == e);
-                        if (f) {
-                            await this.updateIntoDB(f);
-                            Logger(`Batch save:${e}`);
-                        }
+                    const f = this.app.vault.getAbstractFileByPath(normalizePath(e));
+                    if (f && f instanceof TFile) {
+                        await this.updateIntoDB(f);
+                        Logger(`Batch save:${e}`);
                     }
                 } catch (ex) {
                     Logger(`Batch save error:${e}`, LOG_LEVEL.NOTICE);
@@ -358,25 +427,37 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
     }
     async watchVaultRenameAsync(file: TAbstractFile, oldFile: any) {
         Logger(`${oldFile} renamed to ${file.path}`, LOG_LEVEL.VERBOSE);
-        await this.applyBatchChange();
+        try {
+            await this.applyBatchChange();
+        } catch (ex) {
+            Logger(ex);
+        }
         if (file instanceof TFolder) {
             const newFiles = this.GetAllFilesRecursively(file);
             // for guard edge cases. this won't happen and each file's event will be raise.
             for (const i of newFiles) {
-                const newFilePath = normalizePath(this.getFilePath(i));
-                const newFile = this.app.vault.getAbstractFileByPath(newFilePath);
-                if (newFile instanceof TFile) {
-                    Logger(`save ${newFile.path} into db`);
-                    await this.updateIntoDB(newFile);
+                try {
+                    const newFilePath = normalizePath(this.getFilePath(i));
+                    const newFile = this.app.vault.getAbstractFileByPath(newFilePath);
+                    if (newFile instanceof TFile) {
+                        Logger(`save ${newFile.path} into db`);
+                        await this.updateIntoDB(newFile);
+                    }
+                } catch (ex) {
+                    Logger(ex);
                 }
             }
             Logger(`delete below ${oldFile} from db`);
             await this.deleteFromDBbyPath(oldFile);
         } else if (file instanceof TFile) {
-            Logger(`file save ${file.path} into db`);
-            await this.updateIntoDB(file);
-            Logger(`deleted ${oldFile} into db`);
-            await this.deleteFromDBbyPath(oldFile);
+            try {
+                Logger(`file save ${file.path} into db`);
+                await this.updateIntoDB(file);
+                Logger(`deleted ${oldFile} into db`);
+                await this.deleteFromDBbyPath(oldFile);
+            } catch (ex) {
+                Logger(ex);
+            }
         }
         this.gcHook();
     }
@@ -398,9 +479,6 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
 
         this.logMessage = [].concat(this.logMessage).concat([newmessage]).slice(-100);
         console.log(valutName + ":" + newmessage);
-        // if (this.statusBar2 != null) {
-        //     this.statusBar2.setText(newmessage.substring(0, 60));
-        // }
 
         if (level >= LOG_LEVEL.NOTICE) {
             if (messagecontent in this.notifies) {
@@ -454,6 +532,9 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
 
     async doc2storage_create(docEntry: EntryBody, force?: boolean) {
         const pathSrc = id2path(docEntry._id);
+        if (shouldBeIgnored(pathSrc)) {
+            return;
+        }
         const doc = await this.localDatabase.getDBEntry(pathSrc, { rev: docEntry._rev });
         if (doc === false) return;
         const path = id2path(doc._id);
@@ -468,7 +549,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                 try {
                     const newfile = await this.app.vault.createBinary(normalizePath(path), bin, { ctime: doc.ctime, mtime: doc.mtime });
                     Logger("live : write to local (newfile:b) " + path);
-                    await this.app.vault.trigger("create", newfile);
+                    this.app.vault.trigger("create", newfile);
                 } catch (ex) {
                     Logger("could not write to local (newfile:bin) " + path, LOG_LEVEL.NOTICE);
                     Logger(ex, LOG_LEVEL.VERBOSE);
@@ -483,7 +564,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
             try {
                 const newfile = await this.app.vault.create(normalizePath(path), doc.data, { ctime: doc.ctime, mtime: doc.mtime });
                 Logger("live : write to local (newfile:p) " + path);
-                await this.app.vault.trigger("create", newfile);
+                this.app.vault.trigger("create", newfile);
             } catch (ex) {
                 Logger("could not write to local (newfile:plain) " + path, LOG_LEVEL.NOTICE);
                 Logger(ex, LOG_LEVEL.VERBOSE);
@@ -511,6 +592,9 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
     }
     async doc2storate_modify(docEntry: EntryBody, file: TFile, force?: boolean) {
         const pathSrc = id2path(docEntry._id);
+        if (shouldBeIgnored(pathSrc)) {
+            return;
+        }
         if (docEntry._deleted) {
             //basically pass.
             //but if there're no docs left, delete file.
@@ -544,7 +628,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                     try {
                         await this.app.vault.modifyBinary(file, bin, { ctime: doc.ctime, mtime: doc.mtime });
                         Logger(msg);
-                        await this.app.vault.trigger("modify", file);
+                        this.app.vault.trigger("modify", file);
                     } catch (ex) {
                         Logger("could not write to local (modify:bin) " + path, LOG_LEVEL.NOTICE);
                     }
@@ -558,7 +642,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
                 try {
                     await this.app.vault.modify(file, doc.data, { ctime: doc.ctime, mtime: doc.mtime });
                     Logger(msg);
-                    await this.app.vault.trigger("modify", file);
+                    this.app.vault.trigger("modify", file);
                 } catch (ex) {
                     Logger("could not write to local (modify:plain) " + path, LOG_LEVEL.NOTICE);
                 }
@@ -574,20 +658,20 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         }
     }
     async handleDBChanged(change: EntryBody) {
-        const allfiles = this.app.vault.getFiles();
-        const targetFiles = allfiles.filter((e) => e.path == id2path(change._id));
-        if (targetFiles.length == 0) {
+        const targetFile = this.app.vault.getAbstractFileByPath(id2path(change._id));
+        if (targetFile == null) {
             if (change._deleted) {
                 return;
             }
             const doc = change;
             await this.doc2storage_create(doc);
-        }
-        if (targetFiles.length == 1) {
+        } else if (targetFile instanceof TFile) {
             const doc = change;
-            const file = targetFiles[0];
+            const file = targetFile;
             await this.doc2storate_modify(doc, file);
-            await this.showIfConflicted(file);
+            this.queueConflictedCheck(file);
+        } else {
+            Logger(`${id2path(change._id)} is already exist as the folder`);
         }
     }
 
@@ -720,9 +804,11 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         let waiting = "";
         if (this.settings.batchSave) {
             waiting = " " + this.batchFileChange.map((e) => "🛫").join("");
-            waiting = waiting.replace(/🛫{10}/g, "🚀");
+            waiting = waiting.replace(/(🛫){10}/g, "🚀");
         }
-        const message = `Sync:${w} ↑${sent} ↓${arrived}${waiting}`;
+        const procs = getProcessingCounts();
+        const procsDisp = procs == 0 ? "" : ` ⏳${procs}`;
+        const message = `Sync:${w} ↑${sent} ↓${arrived}${waiting}${procsDisp}`;
         this.setStatusBarText(message);
     }
     setStatusBarText(message: string) {
@@ -909,7 +995,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
     // --> conflict resolving
     async getConflictedDoc(path: string, rev: string): Promise<false | diff_result_leaf> {
         try {
-            const doc = await this.localDatabase.getDBEntry(path, { rev: rev });
+            const doc = await this.localDatabase.getDBEntry(path, { rev: rev }, false, false);
             if (doc === false) return false;
             let data = doc.data;
             if (doc.datatype == "newnote") {
@@ -936,7 +1022,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
      * @returns true -> resolved, false -> nothing to do, or check result.
      */
     async getConflictedStatus(path: string): Promise<diff_check_result> {
-        const test = await this.localDatabase.getDBEntry(path, { conflicts: true });
+        const test = await this.localDatabase.getDBEntry(path, { conflicts: true }, false, false);
         if (test === false) return false;
         if (test == null) return false;
         if (!test._conflicts) return false;
@@ -990,69 +1076,110 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
             diff: diff,
         };
     }
+    showMergeDialog(file: TFile, conflictCheckResult: diff_result): Promise<boolean> {
+        return new Promise((res, rej) => {
+            Logger("open conflict dialog", LOG_LEVEL.VERBOSE);
+            new ConflictResolveModal(this.app, conflictCheckResult, async (selected) => {
+                const testDoc = await this.localDatabase.getDBEntry(file.path, { conflicts: true });
+                if (testDoc === false) {
+                    Logger("Missing file..", LOG_LEVEL.VERBOSE);
+                    return res(true);
+                }
+                if (!testDoc._conflicts) {
+                    Logger("Nothing have to do with this conflict", LOG_LEVEL.VERBOSE);
+                    return res(true);
+                }
+                const toDelete = selected;
+                const toKeep = conflictCheckResult.left.rev != toDelete ? conflictCheckResult.left.rev : conflictCheckResult.right.rev;
+                if (toDelete == "") {
+                    //concat both,
+                    // write data,and delete both old rev.
+                    const p = conflictCheckResult.diff.map((e) => e[1]).join("");
+                    await this.app.vault.modify(file, p);
+                    await this.updateIntoDB(file);
+                    await this.localDatabase.deleteDBEntry(file.path, { rev: conflictCheckResult.left.rev });
+                    await this.localDatabase.deleteDBEntry(file.path, { rev: conflictCheckResult.right.rev });
+                    await this.pullFile(file.path);
+                    Logger("concat both file");
+                    setTimeout(() => {
+                        //resolved, check again.
+                        this.showIfConflicted(file);
+                    }, 500);
+                } else if (toDelete == null) {
+                    Logger("Leave it still conflicted");
+                } else {
+                    Logger(`resolved conflict:${file.path}`);
+                    await this.localDatabase.deleteDBEntry(file.path, { rev: toDelete });
+                    await this.pullFile(file.path, null, true, toKeep);
+                    setTimeout(() => {
+                        //resolved, check again.
+                        this.showIfConflicted(file);
+                    }, 500);
+                }
+
+                return res(true);
+            }).open();
+        });
+    }
+    conflictedCheckFiles: string[] = [];
+
+    // queueing the conflicted file check
+    conflictedCheckTimer: number;
+    queueConflictedCheck(file: TFile) {
+        this.conflictedCheckFiles = this.conflictedCheckFiles.filter((e) => e != file.path);
+        this.conflictedCheckFiles.push(file.path);
+        if (this.conflictedCheckTimer != null) {
+            window.clearTimeout(this.conflictedCheckTimer);
+        }
+        this.conflictedCheckTimer = window.setTimeout(async () => {
+            this.conflictedCheckTimer = null;
+            const checkFiles = JSON.parse(JSON.stringify(this.conflictedCheckFiles)) as string[];
+            for (const filename of checkFiles) {
+                try {
+                    const file = this.app.vault.getAbstractFileByPath(filename);
+                    if (file != null && file instanceof TFile) {
+                        await this.showIfConflicted(file);
+                    }
+                } catch (ex) {
+                    Logger(ex);
+                }
+            }
+        }, 1000);
+    }
     async showIfConflicted(file: TFile) {
         await runWithLock("conflicted", false, async () => {
             const conflictCheckResult = await this.getConflictedStatus(file.path);
-            if (conflictCheckResult === false) return; //nothign to do.
+            if (conflictCheckResult === false) {
+                //nothign to do.
+                return;
+            }
             if (conflictCheckResult === true) {
                 //auto resolved, but need check again;
+                Logger("conflict:Automatically merged, but we have to check it again");
                 setTimeout(() => {
                     this.showIfConflicted(file);
                 }, 500);
                 return;
             }
             //there conflicts, and have to resolve ;
-            const leaf = this.app.workspace.activeLeaf;
-            if (leaf) {
-                new ConflictResolveModal(this.app, conflictCheckResult, async (selected) => {
-                    const testDoc = await this.localDatabase.getDBEntry(file.path, { conflicts: true });
-                    if (testDoc === false) return;
-                    if (!testDoc._conflicts) {
-                        Logger("something went wrong on merging.", LOG_LEVEL.NOTICE);
-                        return;
-                    }
-                    const toDelete = selected;
-                    if (toDelete == null) {
-                        //concat both,
-                        // write data,and delete both old rev.
-                        const p = conflictCheckResult.diff.map((e) => e[1]).join("");
-                        await this.app.vault.modify(file, p);
-                        await this.localDatabase.deleteDBEntry(file.path, { rev: conflictCheckResult.left.rev });
-                        await this.localDatabase.deleteDBEntry(file.path, { rev: conflictCheckResult.right.rev });
-                        return;
-                    }
-                    if (toDelete == "") {
-                        return;
-                    }
-                    Logger(`resolved conflict:${file.path}`);
-                    await this.localDatabase.deleteDBEntry(file.path, { rev: toDelete });
-                    await this.pullFile(file.path, null, true);
-                    setTimeout(() => {
-                        //resolved, check again.
-                        this.showIfConflicted(file);
-                    }, 500);
-                }).open();
-            }
+            await this.showMergeDialog(file, conflictCheckResult);
         });
     }
     async pullFile(filename: string, fileList?: TFile[], force?: boolean, rev?: string, waitForReady = true) {
-        if (!fileList) {
-            fileList = this.app.vault.getFiles();
-        }
-        const targetFiles = fileList.filter((e) => e.path == id2path(filename));
-        if (targetFiles.length == 0) {
+        const targetFile = this.app.vault.getAbstractFileByPath(id2path(filename));
+        if (targetFile == null) {
             //have to create;
             const doc = await this.localDatabase.getDBEntry(filename, rev ? { rev: rev } : null, false, waitForReady);
             if (doc === false) return;
             await this.doc2storage_create(doc, force);
-        } else if (targetFiles.length == 1) {
+        } else if (targetFile instanceof TFile) {
             //normal case
-            const file = targetFiles[0];
+            const file = targetFile;
             const doc = await this.localDatabase.getDBEntry(filename, rev ? { rev: rev } : null, false, waitForReady);
             if (doc === false) return;
             await this.doc2storate_modify(doc, file, force);
         } else {
-            Logger(`target files:${filename} is two or more files in your vault`);
+            Logger(`target files:${filename} is exists as the folder`);
             //something went wrong..
         }
         //when to opened file;
@@ -1084,10 +1211,13 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
     }
 
     async updateIntoDB(file: TFile) {
+        if (shouldBeIgnored(file.path)) {
+            return;
+        }
         await this.localDatabase.waitForGCComplete();
         let content = "";
         let datatype: "plain" | "newnote" = "newnote";
-        if (file.extension != "md") {
+        if (!isPlainText(file.name)) {
             const contentBin = await this.app.vault.readBinary(file);
             content = await arrayBufferToBase64(contentBin);
             datatype = "newnote";
@@ -1105,17 +1235,21 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
             children: [],
             datatype: datatype,
         };
-        //From here
-        const old = await this.localDatabase.getDBEntry(fullpath, null, false, false);
-        if (old !== false) {
-            const oldData = { data: old.data, deleted: old._deleted };
-            const newData = { data: d.data, deleted: d._deleted };
-            if (JSON.stringify(oldData) == JSON.stringify(newData)) {
-                Logger("not changed:" + fullpath + (d._deleted ? " (deleted)" : ""), LOG_LEVEL.VERBOSE);
-                return;
+        //upsert should locked
+        const isNotChanged = await runWithLock("file:" + fullpath, false, async () => {
+            const old = await this.localDatabase.getDBEntry(fullpath, null, false, false);
+            if (old !== false) {
+                const oldData = { data: old.data, deleted: old._deleted };
+                const newData = { data: d.data, deleted: d._deleted };
+                if (JSON.stringify(oldData) == JSON.stringify(newData)) {
+                    Logger("not changed:" + fullpath + (d._deleted ? " (deleted)" : ""), LOG_LEVEL.VERBOSE);
+                    return true;
+                }
+                // d._rev = old._rev;
             }
-            // d._rev = old._rev;
-        }
+            return false;
+        });
+        if (isNotChanged) return;
         await this.localDatabase.putDBEntry(d);
 
         Logger("put database:" + fullpath + "(" + datatype + ") ");
@@ -1167,7 +1301,6 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
         return { plugins, allPlugins, thisDevicePlugins };
     }
     async sweepPlugin(showMessage = false) {
-        console.log(`pluginSync:${this.settings.usePluginSync}`);
         if (!this.settings.usePluginSync) return;
         await runWithLock("sweepplugin", false, async () => {
             const logLevel = showMessage ? LOG_LEVEL.NOTICE : LOG_LEVEL.INFO;

src/types.ts

@@ -58,6 +58,7 @@ export interface ObsidianLiveSyncSettings {
     checkIntegrityOnSave: boolean;
     batch_size: number;
     batches_limit: number;
+    useHistory:boolean;
 }
 
 export const DEFAULT_SETTINGS: ObsidianLiveSyncSettings = {
@@ -98,6 +99,7 @@ export const DEFAULT_SETTINGS: ObsidianLiveSyncSettings = {
     checkIntegrityOnSave: false,
     batch_size: 250,
     batches_limit: 40,
+    useHistory:false,
 };
 
 export const PERIODIC_PLUGIN_SWEEP = 60;
@@ -226,3 +228,5 @@ export interface PluginList {
 export interface DevicePluginList {
     [key: string]: PluginDataEntry;
 }
+
+export const FLAGMD_REDFLAG = "redflag.md";

src/utils.ts

@@ -1,6 +1,6 @@
 import { normalizePath } from "obsidian";
 import { Logger } from "./logger";
-import { LOG_LEVEL } from "./types";
+import { FLAGMD_REDFLAG, LOG_LEVEL } from "./types";
 
 export function arrayBufferToBase64(buffer: ArrayBuffer): Promise<string> {
     return new Promise((res) => {
@@ -79,6 +79,13 @@ export function isValidPath(filename: string): boolean {
     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
@@ -114,20 +121,43 @@ function objectToKey(key: any): string {
     const keys = Object.keys(key).sort((a, b) => a.localeCompare(b));
     return keys.map((e) => e + objectToKey(key[e])).join(":");
 }
-// Just run some async/await as like transacion SERIALIZABLE
+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);
+    // 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);
-            Logger(`Lock:${lockKey}:released`, LOG_LEVEL.VERBOSE);
+            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()
@@ -138,11 +168,17 @@ export function runWithLock<T>(key: unknown, ignoreWhenRunning: boolean, proc: (
                     .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();
+                }
             }
         }
     };
@@ -164,7 +200,7 @@ export function runWithLock<T>(key: unknown, ignoreWhenRunning: boolean, proc: (
             new Promise<void>((res, rej) => {
                 proc()
                     .then((v) => {
-                        Logger(`Lock:${key}:processed`, LOG_LEVEL.VERBOSE);
+                        // Logger(`Lock:${key}:processed`, LOG_LEVEL.VERBOSE);
                         handleNextProcs();
                         responderRes(v);
                         res();
@@ -178,10 +214,13 @@ export function runWithLock<T>(key: unknown, ignoreWhenRunning: boolean, proc: (
             });
 
         pendingProcs[lockKey].push(subproc);
+        notifyLock();
+        // Logger(`Lock:${lockKey}:queud:left${pendingProcs[lockKey].length}`, LOG_LEVEL.VERBOSE);
         return responder;
     } else {
         runningProcs.push(lockKey);
-        Logger(`Lock:${lockKey}:aqquired`, LOG_LEVEL.VERBOSE);
+        notifyLock();
+        // Logger(`Lock:${lockKey}:aqquired`, LOG_LEVEL.VERBOSE);
         return new Promise((res, rej) => {
             proc()
                 .then((v) => {
@@ -195,3 +234,16 @@ export function runWithLock<T>(key: unknown, ignoreWhenRunning: boolean, proc: (
         });
     }
 }
+
+export function isPlainText(filename: string): boolean {
+    if (filename.endsWith(".md")) return true;
+    if (filename.endsWith(".txt")) return true;
+    if (filename.endsWith(".svg")) return true;
+    if (filename.endsWith(".html")) return true;
+    if (filename.endsWith(".csv")) return true;
+    if (filename.endsWith(".css")) return true;
+    if (filename.endsWith(".js")) return true;
+    if (filename.endsWith(".xml")) return true;
+
+    return false;
+}

src/utils_couchdb.ts

@@ -8,11 +8,54 @@ export const isValidRemoteCouchDBURI = (uri: string): boolean => {
     if (uri.startsWith("http://")) return true;
     return false;
 };
+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 }> => {
     if (!isValidRemoteCouchDBURI(uri)) return "Remote URI is not valid";
-    const db: PouchDB.Database<EntryDoc> = new PouchDB<EntryDoc>(uri, {
+    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";
+            if (opts.body) {
+                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);
+                        throw new Error("This request should fail on IBM Cloudant.");
+                    }
+                }
+                size = ` (${opts_length})`;
+            }
+            try {
+                const responce: Response = await fetch(url, opts);
+                if (method == "POST" || method == "PUT") {
+                    last_post_successed = responce.ok;
+                } else {
+                    last_post_successed = true;
+                }
+                Logger(`HTTP:${method}${size} to:${localURL} -> ${responce.status}`, LOG_LEVEL.VERBOSE);
+                return responce;
+            } catch (ex) {
+                Logger(`HTTP:${method}${size} to:${localURL} -> failed`, LOG_LEVEL.VERBOSE);
+                if (!size_ok && (method == "POST" || method == "PUT")) {
+                    last_post_successed = false;
+                }
+                Logger(ex);
+                throw ex;
+            }
+            // return await fetch(url, opts);
+        },
+    };
+    const db: PouchDB.Database<EntryDoc> = new PouchDB<EntryDoc>(uri, conf);
     try {
         const info = await db.info();
         return { db: db, info: info };

styles.css

@@ -140,3 +140,33 @@ div.sls-setting-menu-btn {
     background-color: var(--background-secondary-alt);
     color: var(--text-accent);
 }
+.op-flex {
+    display: flex;
+}
+.op-flex input {
+    display: inline-flex;
+    flex-grow: 1;
+    margin-bottom: 8px;
+}
+
+.op-info {
+    display: inline-flex;
+    flex-grow: 1;
+    border-bottom: 1px solid var(--background-modifier-border);
+    width: 100%;
+    margin-bottom: 4px;
+    padding-bottom: 4px;
+}
+
+.history-added {
+    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;
+}