Bump for release-mistake.

### Fixed

- No longer conflicted files are handled in the boot-up process. No more unexpected overwriting.
    - It ignores `Always overwrite with a newer file`, and always be prevented for the safety. Please pick it manually or open the file.
- Some log messages on conflict resolution has been corrected.
- Automatic merge notifications, displayed on the grounds of `same`, have been degraded to logs.

### Improved

- Now we can fetch the remote database with keeping local files completely intact.
    - In new option, all files are stored into the local database before the fetching, and will be merged automatically or detected as conflicts.
- The dialogue presenting options when performing `Fetch` are now more informative.

### Refactored

- Some class methods have been fixed its arguments to be more consistent.
- Types have been defined for some conditional results.

.eslintignore

@@ -1,9 +0,0 @@
-node_modules
-build
-.eslintrc.js.bak
-src/lib/src/patches/pouchdb-utils
-esbuild.config.mjs
-rollup.config.js
-src/lib/test
-src/lib/src/cli
-main.js

.eslintrc

@@ -1,13 +1,34 @@
 {
     "root": true,
     "parser": "@typescript-eslint/parser",
-    "plugins": ["@typescript-eslint"],
-    "extends": ["eslint:recommended", "plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended"],
+    "plugins": [
+        "@typescript-eslint",
+        "eslint-plugin-svelte",
+        "eslint-plugin-import"
+    ],
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/eslint-recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
     "parserOptions": {
         "sourceType": "module",
-        "project": ["tsconfig.json"]
+        "project": [
+            "tsconfig.json"
+        ]
     },
-    "ignorePatterns": [],
+    "ignorePatterns": [
+        "**/node_modules/*",
+        "**/jest.config.js",
+        "src/lib/coverage",
+        "src/lib/browsertest",
+        "**/test.ts",
+        "**/tests.ts",
+        "**/**test.ts",
+        "**/**.test.ts",
+        "esbuild.*.mjs",
+        "terser.*.mjs"
+    ],
     "rules": {
         "no-unused-vars": "off",
         "@typescript-eslint/no-unused-vars": [
@@ -34,4 +55,4 @@
             }
         ]
     }
-}
+}

README.md

@@ -18,6 +18,10 @@ Note: This plugin cannot synchronise with the official "Obsidian Sync".
 - Supporting End-to-end encryption.
 - Synchronisation of settings, snippets, themes, and plug-ins, via [Customization sync(Beta)](#customization-sync) or [Hidden File Sync](#hiddenfilesync)
 - WebClip from [obsidian-livesync-webclip](https://chrome.google.com/webstore/detail/obsidian-livesync-webclip/jfpaflmpckblieefkegjncjoceapakdf)
+- WebRTC peer-to-peer synchronisation without the need any `host` is now possible. (Experimental)
+  - This feature is still in the experimental stage. Please be careful when using it. 
+  - Instead of using public servers, you can use [webpeer](https://github.com/vrtmrz/livesync-commonlib/tree/main/apps/webpeer) the pseudo client for receiving and sending between devices.
+  - There is an [explanatory article](https://fancy-syncing.vrtmrz.net/blog/0034-p2p-sync), although it is in Japanese. I will write the English version soon. 
 
 This plug-in might be useful for researchers, engineers, and developers with a need to keep their notes fully self-hosted for security reasons. Or just anyone who would like the peace of mind of knowing that their notes are fully private.
 

docs/terms.md

@@ -1,10 +1,24 @@
-# Terms used in this project
+# Notes on Terminology, Spelling, Vocabulary Conventions
 
-## Terms
+## Spelling and Vocabulary conventions
 
-### Chunks
-<!-- TBW, sorry for the draft! -->
+1. Almost all of the english words are written in British English. For example, "organisation" instead of "organization", "synchronisation" instead of "synchronization", etc. This convention originated from the author's personal preference but is now maintained for consistency.
 
+2. Idiomatic terms, such as used in HTML, CSS, and JavaScript, are usually be aligned with the language used in the technology. For example, "color" instead of "colour", "program" instead of "programme", etc. Especially, terms which are used for attributes, properties, and methods are notable.
 
-<!-- Please feel free to write any terms that should be mentioned. And please make pull request. I would love to fill the rest.  -->
-<!-- ### Chunks -->
+3. We use `dialogue` in documentation for consistency. While `dialog` may appear in source code, particularly in class names, method names, and attributes (following technical conventions in No. 2), we consistently use `dialogue` for user-facing messages and general documentation text. This approach balances No. 1 with No. 2.
+
+4. Contractions are not used. For example, "do not" instead of "don't", "cannot" instead of "can't", etc. especially `'d`.
+   - We may encounter difficulties with tenses.
+
+5. However, try using affirmative forms, `Discard` instead of `Do not keep`, `Continue` instead of `Do not stop`, etc.
+    - Some languages, such as Japanese, have a different meaning for `yes` and `no` between affirmative and negative questions.
+
+## Terminology
+
+- Self-hosted LiveSync
+    - This plug-in name. `Self-hosted` is one word.
+- LiveSync
+    - Very confusing term.
+        - As shorten-form of `Self-hosted LiveSync`.
+        - As a name of synchronisation mode. This should be changed to `Continuos`, in contrast to `Periodic`.

docs/troubleshooting.md

@@ -1,6 +1,6 @@
-<!-- 2024-02-15 -->
-# Tips and Troubleshooting
+<!-- 2025-02-18 -->
 
+# Tips and Troubleshooting
 
 - [Tips and Troubleshooting](#tips-and-troubleshooting)
   - [Notable bugs and fixes](#notable-bugs-and-fixes)
@@ -25,14 +25,16 @@
 
 <!-- - -->
 
-
 ## Notable bugs and fixes
+
 ### Binary files get bigger on iOS
+
 - Reported at: v0.20.x
 - Fixed at: v0.21.2 (Fixed but not reviewed)
 - Required action: larger files will not be fixed automatically, please perform `Verify and repair all files`. If our local database and storage are not matched, we will be asked to apply which one.
 
 ### Some setting name has been changed
+
 - Fixed at: v0.22.6
 
 | Previous name                | New name                                 |
@@ -58,13 +60,16 @@ Therefore, experienced users (especially those stable enough not to have to rebu
 Please disable it when you have enough time.
 
 ### ZIP (or any extensions) files were not synchronised. Why?
+
 It depends on Obsidian detects. May toggling `Detect all extensions` of `File and links` (setting of Obsidian) will help us.
 
 ### I hope to report the issue, but you said you needs `Report`. How to make it?
+
 We can copy the report to the clipboard, by pressing the `Make report` button on the `Hatch` pane.
 ![Screenshot](../images/hatch.png)
 
 ### Where can I check the log?
+
 We can launch the log pane by `Show log` on the command palette.
 And if you have troubled something, please enable the `Verbose Log` on the `General Setting` pane.
 
@@ -73,16 +78,20 @@ However, the logs would not be kept so long and cleared when restarted. If you w
 ![ScreenShot](../images/write_logs_into_the_file.png)
 
 > [!IMPORTANT]
+>
 > - Writing logs into the file will impact the performance.
 > - Please make sure that you have erased all your confidential information before reporting issue.
 
 ### Why are the logs volatile and ephemeral?
+
 To avoid unexpected exposure to our confidential things.
 
 ### Some network logs are not written into the file.
+
 Especially the CORS error will be reported as a general error to the plug-in for security reasons. So we cannot detect and log it. We are only able to investigate them by [Checking the network log](#checking-the-network-log).
 
 ### If a file were deleted or trimmed, the capacity of the database should be reduced, right?
+
 No, even though if files were deleted, chunks were not deleted.
 Self-hosted LiveSync splits the files into multiple chunks and transfers only newly created. This behaviour enables us to less traffic. And, the chunks will be shared between the files to reduce the total usage of the database.
 
@@ -93,24 +102,42 @@ To shrink the database size, `Rebuild everything` only reliably and effectively.
 ### How can I use the DevTools?
 
 #### Checking the network log
+
 1. Open the network pane.
 2. Find the requests marked in red.  
-![Errored](../images/devtools1.png)
+   ![Errored](../images/devtools1.png)
 3. Capture the `Headers`, `Payload`, and, `Response`. **Please be sure to keep important information confidential**. If the `Response` contains secrets, you can omitted that.
-Note: Headers contains a some credentials. **The path of the request URL, Remote Address, authority, and authorization must be concealed.**  
-![Concealed sample](../images/devtools2.png)
+   Note: Headers contains a some credentials. **The path of the request URL, Remote Address, authority, and authorization must be concealed.**  
+   ![Concealed sample](../images/devtools2.png)
 
 ## Troubleshooting
+
 <!-- Add here -->
 
 ### On the mobile device, cannot synchronise on the local network!
+
 Obsidian mobile is not able to connect to the non-secure end-point, such as starting with `http://`. Make sure your URI of CouchDB. Also not able to use a self-signed certificate.
 
 ### I think that something bad happening on the vault...
+
 Place `redflag.md` on top of the vault, and restart Obsidian. The most simple way is to create a new note and rename it to `redflag`. Of course, we can put it without Obsidian.
 
 If there is `redflag.md`, Self-hosted LiveSync suspends all database and storage processes.
 
+There are some options to use `redflag.md`.
+
+| Filename      | Human-Friendly Name | Description                                                                          |
+| ------------- | ------------------- | ------------------------------------------------------------------------------------ |
+| `redflag.md`  | -                   | Suspends all processes.                                                              |
+| `redflag2.md` | `flag_rebuild.md`   | Suspends all processes, and rebuild both local and remote databases by local files.  |
+| `redflag3.md` | `flag_fetch.md`     | Suspends all processes, discard the local database, and fetch from the remote again. |
+
+When fetching everything remotely or performing a rebuild, restarting Obsidian is performed once for safety reasons. At that time, Self-hosted LiveSync uses these files to determine whether the process should be carried out.
+(The use of normal markdown files is a trick to externally force cancellation in the event of faults in the rebuild or fetch function itself, especially on mobile devices).
+This mechanism is also used for set-up. And just for information, these files are also not subject to synchronisation.
+
+However, occasionally the deletion of files may fail. This should generally work normally after restarting Obsidian. (As far as I can observe).
+
 ## Tips
 
 ### How to resolve `Tweaks Mismatched of Changed`
@@ -125,7 +152,7 @@ Following dialogue will be shown:
 
 - If we want to propagate the setting of the device, we should choose `Update with mine`.
 - On other devices, we should choose `Use configured` to accept and use the configured configuration.
-- `Dismiss` can postpone a decision. However, we cannot synchronise until we have decided. 
+- `Dismiss` can postpone a decision. However, we cannot synchronise until we have decided.
 
 Rest assured that in most cases we can choose `Use configured`. (Unless you are certain that you have not changed the configuration).
 
@@ -133,16 +160,16 @@ If we see it for the first time, it reflects the settings of the device that has
 
 <!-- Add here -->
 
-
 ### Old tips
--   Rarely, a file in the database could be corrupted. The plugin will not write to local storage when a file looks corrupted. If a local version of the file is on your device, the corruption could be fixed by editing the local file and synchronizing it. But if the file does not exist on any of your devices, then it can not be rescued. In this case, you can delete these items from the settings dialog.
--   To stop the boot-up sequence (eg. for fixing problems on databases), you can put a `redflag.md` file (or directory) at the root of your vault.
-    Tip for iOS: a redflag directory can be created at the root of the vault using the File application.
--   Also, with `redflag2.md` placed, we can automatically rebuild both the local and the remote databases during the boot-up sequence. With `redflag3.md`, we can discard only the local database and fetch from the remote again.
--   Q: The database is growing, how can I shrink it down?
-    A: each of the docs is saved with their past 100 revisions for detecting and resolving conflicts. Picturing that one device has been offline for a while, and comes online again. The device has to compare its notes with the remotely saved ones. If there exists a historic revision in which the note used to be identical, it could be updated safely (like git fast-forward). Even if that is not in revision histories, we only have to check the differences after the revision that both devices commonly have. This is like 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 is in the [Technical Information](tech_info.md)
--   If you want to synchronize files without obsidian, you can use [filesystem-livesync](https://github.com/vrtmrz/filesystem-livesync).
--   WebClipper is also available on Chrome Web Store:[obsidian-livesync-webclip](https://chrome.google.com/webstore/detail/obsidian-livesync-webclip/jfpaflmpckblieefkegjncjoceapakdf)
+
+- Rarely, a file in the database could be corrupted. The plugin will not write to local storage when a file looks corrupted. If a local version of the file is on your device, the corruption could be fixed by editing the local file and synchronizing it. But if the file does not exist on any of your devices, then it can not be rescued. In this case, you can delete these items from the settings dialog.
+- To stop the boot-up sequence (eg. for fixing problems on databases), you can put a `redflag.md` file (or directory) at the root of your vault.
+  Tip for iOS: a redflag directory can be created at the root of the vault using the File application.
+- Also, with `redflag2.md` placed, we can automatically rebuild both the local and the remote databases during the boot-up sequence. With `redflag3.md`, we can discard only the local database and fetch from the remote again.
+- Q: The database is growing, how can I shrink it down?
+  A: each of the docs is saved with their past 100 revisions for detecting and resolving conflicts. Picturing that one device has been offline for a while, and comes online again. The device has to compare its notes with the remotely saved ones. If there exists a historic revision in which the note used to be identical, it could be updated safely (like git fast-forward). Even if that is not in revision histories, we only have to check the differences after the revision that both devices commonly have. This is like 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 is in the [Technical Information](tech_info.md)
+- If you want to synchronize files without obsidian, you can use [filesystem-livesync](https://github.com/vrtmrz/filesystem-livesync).
+- WebClipper is also available on Chrome Web Store:[obsidian-livesync-webclip](https://chrome.google.com/webstore/detail/obsidian-livesync-webclip/jfpaflmpckblieefkegjncjoceapakdf)
 
 Repo is here: [obsidian-livesync-webclip](https://github.com/vrtmrz/obsidian-livesync-webclip). (Docs are a work in progress.)

esbuild.config.mjs

@@ -4,7 +4,7 @@ import esbuild from "esbuild";
 import process from "process";
 import builtins from "builtin-modules";
 import sveltePlugin from "esbuild-svelte";
-import sveltePreprocess from "svelte-preprocess";
+import { sveltePreprocess } from "svelte-preprocess";
 import fs from "node:fs";
 // import terser from "terser";
 import { minify } from "terser";

eslint.config.mjs

@@ -0,0 +1,100 @@
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import svelte from "eslint-plugin-svelte";
+import _import from "eslint-plugin-import";
+import { fixupPluginRules } from "@eslint/compat";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all,
+});
+
+export default [
+    {
+        ignores: [
+            "**/node_modules/*",
+            "**/jest.config.js",
+            "src/lib/coverage",
+            "src/lib/browsertest",
+            "**/test.ts",
+            "**/tests.ts",
+            "**/**test.ts",
+            "**/**.test.ts",
+            "**/esbuild.*.mjs",
+            "**/terser.*.mjs",
+            "**/node_modules",
+            "**/build",
+            "**/.eslintrc.js.bak",
+            "src/lib/src/patches/pouchdb-utils",
+            "**/esbuild.config.mjs",
+            "**/rollup.config.js",
+            "modules/octagonal-wheels/rollup.config.js",
+            "modules/octagonal-wheels/dist/**/*",
+            "src/lib/test",
+            "src/lib/src/cli",
+            "**/main.js",
+            "src/lib/apps/webpeer/dist",
+            "src/lib/apps/webpeer/svelte.config.js",
+        ],
+    },
+    ...compat.extends(
+        "eslint:recommended",
+        "plugin:@typescript-eslint/eslint-recommended",
+        "plugin:@typescript-eslint/recommended"
+    ),
+    {
+        plugins: {
+            "@typescript-eslint": typescriptEslint,
+            svelte,
+            import: fixupPluginRules(_import),
+        },
+
+        languageOptions: {
+            parser: tsParser,
+            ecmaVersion: 5,
+            sourceType: "module",
+
+            parserOptions: {
+                project: ["tsconfig.json"],
+            },
+        },
+
+        rules: {
+            "no-unused-vars": "off",
+
+            "@typescript-eslint/no-unused-vars": [
+                "error",
+                {
+                    args: "none",
+                },
+            ],
+
+            "no-unused-labels": "off",
+            "@typescript-eslint/ban-ts-comment": "off",
+            "no-prototype-builtins": "off",
+            "@typescript-eslint/no-empty-function": "off",
+            "require-await": "error",
+            "@typescript-eslint/require-await": "warn",
+            "@typescript-eslint/no-misused-promises": "warn",
+            "@typescript-eslint/no-floating-promises": "warn",
+            "no-async-promise-executor": "warn",
+            "@typescript-eslint/no-explicit-any": "off",
+            "@typescript-eslint/no-unnecessary-type-assertion": "error",
+
+            "no-constant-condition": [
+                "error",
+                {
+                    checkLoops: false,
+                },
+            ],
+        },
+    },
+];
+

manifest.json

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

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.24.11",
+    "version": "0.24.22",
     "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",
@@ -22,6 +22,9 @@
     "license": "MIT",
     "devDependencies": {
         "@chialab/esbuild-plugin-worker": "^0.18.1",
+        "@eslint/compat": "^1.2.6",
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "^9.20.0",
         "@tsconfig/svelte": "^5.0.4",
         "@types/diff-match-patch": "^1.0.36",
         "@types/node": "^22.5.4",
@@ -33,17 +36,17 @@
         "@types/pouchdb-mapreduce": "^6.1.10",
         "@types/pouchdb-replication": "^6.4.7",
         "@types/transform-pouch": "^1.0.6",
-        "@typescript-eslint/eslint-plugin": "^8.23.0",
-        "@typescript-eslint/parser": "^8.23.0",
+        "@typescript-eslint/eslint-plugin": "^8.24.1",
+        "@typescript-eslint/parser": "^8.24.1",
         "builtin-modules": "^4.0.0",
         "esbuild": "0.24.2",
         "esbuild-svelte": "^0.9.0",
-        "eslint": "^8.57.0",
-        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint": "^9.20.1",
         "eslint-plugin-import": "^2.31.0",
+        "eslint-plugin-svelte": "^2.46.1",
         "events": "^3.3.0",
         "obsidian": "^1.7.2",
-        "postcss": "^8.5.1",
+        "postcss": "^8.5.2",
         "postcss-load-config": "^6.0.1",
         "pouchdb-adapter-http": "^9.0.0",
         "pouchdb-adapter-idb": "^9.0.0",
@@ -55,10 +58,10 @@
         "pouchdb-merge": "^9.0.0",
         "pouchdb-replication": "^9.0.0",
         "pouchdb-utils": "^9.0.0",
-        "prettier": "^3.4.2",
-        "svelte": "^5.19.7",
+        "prettier": "^3.5.1",
+        "svelte": "^5.20.1",
         "svelte-preprocess": "^6.0.3",
-        "terser": "^5.37.0",
+        "terser": "^5.39.0",
         "transform-pouch": "^2.0.0",
         "tslib": "^2.8.1",
         "tsx": "^4.19.2",
@@ -74,9 +77,10 @@
         "fflate": "^0.8.2",
         "idb": "^8.0.2",
         "minimatch": "^10.0.1",
-        "octagonal-wheels": "^0.1.23",
+        "octagonal-wheels": "^0.1.24",
+        "qrcode-generator": "^1.4.4",
         "svelte-check": "^4.1.4",
-        "trystero": "^0.20.0",
+        "trystero": "^0.20.1",
         "xxhash-wasm-102": "npm:xxhash-wasm@^1.0.2"
     }
 }

src/common/events.ts

@@ -1,19 +1,11 @@
-import type { FilePathWithPrefix, ObsidianLiveSyncSettings } from "../lib/src/common/types";
 import { eventHub } from "../lib/src/hub/hub";
 import type ObsidianLiveSyncPlugin from "../main";
 
-export const EVENT_LAYOUT_READY = "layout-ready";
 export const EVENT_PLUGIN_LOADED = "plugin-loaded";
 export const EVENT_PLUGIN_UNLOADED = "plugin-unloaded";
-export const EVENT_SETTING_SAVED = "setting-saved";
-export const EVENT_FILE_RENAMED = "file-renamed";
 export const EVENT_FILE_SAVED = "file-saved";
 export const EVENT_LEAF_ACTIVE_CHANGED = "leaf-active-changed";
 
-export const EVENT_DATABASE_REBUILT = "database-rebuilt";
-
-export const EVENT_LOG_ADDED = "log-added";
-
 export const EVENT_REQUEST_OPEN_SETTINGS = "request-open-settings";
 export const EVENT_REQUEST_OPEN_SETTING_WIZARD = "request-open-setting-wizard";
 export const EVENT_REQUEST_OPEN_SETUP_URI = "request-open-setup-uri";
@@ -26,32 +18,26 @@ export const EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG = "request-open-plugin-sync-d
 export const EVENT_REQUEST_OPEN_P2P = "request-open-p2p";
 export const EVENT_REQUEST_CLOSE_P2P = "request-close-p2p";
 
+export const EVENT_REQUEST_RUN_DOCTOR = "request-run-doctor";
+
 // export const EVENT_FILE_CHANGED = "file-changed";
 
 declare global {
     interface LSEvents {
-        [EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG]: undefined;
-        [EVENT_FILE_SAVED]: undefined;
-        [EVENT_REQUEST_OPEN_SETUP_URI]: undefined;
-        [EVENT_REQUEST_COPY_SETUP_URI]: undefined;
-        [EVENT_REQUEST_RELOAD_SETTING_TAB]: undefined;
-        [EVENT_PLUGIN_UNLOADED]: undefined;
-        [EVENT_SETTING_SAVED]: ObsidianLiveSyncSettings;
         [EVENT_PLUGIN_LOADED]: ObsidianLiveSyncPlugin;
-        [EVENT_LAYOUT_READY]: undefined;
-        "event-file-changed": { file: FilePathWithPrefix; automated: boolean };
-        "document-stub-created": {
-            toc: Set<string>;
-            stub: { [key: string]: { [key: string]: Map<string, Record<string, string>> } };
-        };
+        [EVENT_PLUGIN_UNLOADED]: undefined;
+        [EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG]: undefined;
         [EVENT_REQUEST_OPEN_SETTINGS]: undefined;
         [EVENT_REQUEST_OPEN_SETTING_WIZARD]: undefined;
-        [EVENT_FILE_RENAMED]: { newPath: FilePathWithPrefix; old: FilePathWithPrefix };
+        [EVENT_REQUEST_RELOAD_SETTING_TAB]: undefined;
         [EVENT_LEAF_ACTIVE_CHANGED]: undefined;
-        [EVENT_REQUEST_OPEN_P2P]: undefined;
         [EVENT_REQUEST_CLOSE_P2P]: undefined;
-        [EVENT_DATABASE_REBUILT]: undefined;
+        [EVENT_REQUEST_OPEN_P2P]: undefined;
+        [EVENT_REQUEST_OPEN_SETUP_URI]: undefined;
+        [EVENT_REQUEST_COPY_SETUP_URI]: undefined;
+        [EVENT_REQUEST_RUN_DOCTOR]: string;
     }
 }
 
+export * from "../lib/src/events/coreEvents.ts";
 export { eventHub };

src/common/types.ts

@@ -88,3 +88,4 @@ export const ICXHeader = "ix:";
 
 export const FileWatchEventQueueMax = 10;
 export const configURIBase = "obsidian://setuplivesync?settings=";
+export const configURIBaseQR = "obsidian://setuplivesync?settingsQR=";

src/common/utils.ts

@@ -30,6 +30,7 @@ import { sameChangePairs } from "./stores.ts";
 import type { KeyValueDatabase } from "./KeyValueDB.ts";
 import { scheduleTask } from "octagonal-wheels/concurrency/task";
 import { EVENT_PLUGIN_UNLOADED, eventHub } from "./events.ts";
+import { promiseWithResolver, type PromiseWithResolvers } from "octagonal-wheels/promises";
 
 export { scheduleTask, cancelTask, cancelAllTasks } from "../lib/src/concurrency/task.ts";
 
@@ -493,3 +494,163 @@ export function onlyInNTimes(n: number, proc: (progress: number) => any) {
         }
     };
 }
+
+const waitingTasks = {} as Record<string, { task?: PromiseWithResolvers<any>; previous: number; leastNext: number }>;
+
+export function rateLimitedSharedExecution<T>(key: string, interval: number, proc: () => Promise<T>): Promise<T> {
+    if (!(key in waitingTasks)) {
+        waitingTasks[key] = { task: undefined, previous: 0, leastNext: 0 };
+    }
+    if (waitingTasks[key].task) {
+        // Extend the previous execution time.
+        waitingTasks[key].leastNext = Date.now() + interval;
+        return waitingTasks[key].task.promise;
+    }
+
+    const previous = waitingTasks[key].previous;
+
+    const delay = previous == 0 ? 0 : Math.max(interval - (Date.now() - previous), 0);
+
+    const task = promiseWithResolver<T>();
+    void task.promise.finally(() => {
+        if (waitingTasks[key].task === task) {
+            waitingTasks[key].task = undefined;
+            waitingTasks[key].previous = Math.max(Date.now(), waitingTasks[key].leastNext);
+        }
+    });
+    waitingTasks[key] = {
+        task,
+        previous: Date.now(),
+        leastNext: Date.now() + interval,
+    };
+    void scheduleTask("thin-out-" + key, delay, async () => {
+        try {
+            task.resolve(await proc());
+        } catch (ex) {
+            task.reject(ex);
+        }
+    });
+    return task.promise;
+}
+export function updatePreviousExecutionTime(key: string, timeDelta: number = 0) {
+    if (!(key in waitingTasks)) {
+        waitingTasks[key] = { task: undefined, previous: 0, leastNext: 0 };
+    }
+    waitingTasks[key].leastNext = Math.max(Date.now() + timeDelta, waitingTasks[key].leastNext);
+}
+
+const prefixMapObject = {
+    s: {
+        1: "V",
+        2: "W",
+        3: "X",
+        4: "Y",
+        5: "Z",
+    },
+    o: {
+        1: "v",
+        2: "w",
+        3: "x",
+        4: "y",
+        5: "z",
+    },
+} as Record<string, Record<number, string>>;
+
+const decodePrefixMapObject = Object.fromEntries(
+    Object.entries(prefixMapObject).flatMap(([prefix, map]) =>
+        Object.entries(map).map(([len, char]) => [char, { prefix, len: parseInt(len) }])
+    )
+);
+
+const prefixMapNumber = {
+    n: {
+        1: "a",
+        2: "b",
+        3: "c",
+        4: "d",
+        5: "e",
+    },
+    N: {
+        1: "A",
+        2: "B",
+        3: "C",
+        4: "D",
+        5: "E",
+    },
+} as Record<string, Record<number, string>>;
+
+const decodePrefixMapNumber = Object.fromEntries(
+    Object.entries(prefixMapNumber).flatMap(([prefix, map]) =>
+        Object.entries(map).map(([len, char]) => [char, { prefix, len: parseInt(len) }])
+    )
+);
+export function encodeAnyArray(obj: any[]): string {
+    const tempArray = obj.map((v) => {
+        if (v == null) return "n";
+        if (v == false) return "f";
+        if (v == true) return "t";
+        if (v == undefined) return "u";
+        if (typeof v == "number") {
+            const b36 = v.toString(36);
+            const strNum = v.toString();
+            const expression = b36.length < strNum.length ? "N" : "n";
+            const encodedStr = expression == "N" ? b36 : strNum;
+            const len = encodedStr.length.toString(36);
+            const lenLen = len.length;
+
+            const prefix2 = prefixMapNumber[expression][lenLen];
+            return prefix2 + len + encodedStr;
+        }
+        const str = typeof v == "string" ? v : JSON.stringify(v);
+        const prefix = typeof v == "string" ? "s" : "o";
+        const length = str.length.toString(36);
+        const lenLen = length.length;
+
+        const prefix2 = prefixMapObject[prefix][lenLen];
+        return prefix2 + length + str;
+    });
+    const w = tempArray.join("");
+    return w;
+}
+
+const decodeMapConstant = {
+    u: undefined,
+    n: null,
+    f: false,
+    t: true,
+} as Record<string, any>;
+export function decodeAnyArray(str: string): any[] {
+    const result = [];
+    let i = 0;
+    while (i < str.length) {
+        const char = str[i];
+        i++;
+        if (char in decodeMapConstant) {
+            result.push(decodeMapConstant[char]);
+            continue;
+        }
+        if (char in decodePrefixMapNumber) {
+            const { prefix, len } = decodePrefixMapNumber[char];
+            const lenStr = str.substring(i, i + len);
+            i += len;
+            const radix = prefix == "N" ? 36 : 10;
+            const lenNum = parseInt(lenStr, 36);
+            const value = str.substring(i, i + lenNum);
+            i += lenNum;
+            result.push(parseInt(value, radix));
+            continue;
+        }
+        const { prefix, len } = decodePrefixMapObject[char];
+        const lenStr = str.substring(i, i + len);
+        i += len;
+        const lenNum = parseInt(lenStr, 36);
+        const value = str.substring(i, i + lenNum);
+        i += lenNum;
+        if (prefix == "s") {
+            result.push(value);
+        } else {
+            result.push(JSON.parse(value));
+        }
+    }
+    return result;
+}

src/features/ConfigSync/CmdConfigSync.ts

@@ -1306,7 +1306,7 @@ export class ConfigSync extends LiveSyncCommands implements IObsidianModule {
                         );
                         return;
                     }
-                    const docXDoc = await this.localDatabase.getDBEntryFromMeta(old, {}, false, false);
+                    const docXDoc = await this.localDatabase.getDBEntryFromMeta(old, false, false);
                     if (docXDoc == false) {
                         throw "Could not load the document";
                     }
@@ -1440,7 +1440,7 @@ export class ConfigSync extends LiveSyncCommands implements IObsidianModule {
                         // this._log(`STORAGE --> DB:${prefixedFileName}: (config) Skipped (Same time)`, LOG_LEVEL_VERBOSE);
                         return true;
                     }
-                    const oldC = await this.localDatabase.getDBEntryFromMeta(old, {}, false, false);
+                    const oldC = await this.localDatabase.getDBEntryFromMeta(old, false, false);
                     if (oldC) {
                         const d = (await deserialize(getDocDataAsArray(oldC.data), {})) as PluginDataEx;
                         if (d.files.length == dt.files.length) {

src/features/HiddenFileCommon/JsonResolveModal.ts

@@ -2,13 +2,14 @@ import { App, Modal } from "../../deps.ts";
 import { type FilePath, type LoadedEntry } from "../../lib/src/common/types.ts";
 import JsonResolvePane from "./JsonResolvePane.svelte";
 import { waitForSignal } from "../../lib/src/common/utils.ts";
+import { mount, unmount } from "svelte";
 
 export class JsonResolveModal extends Modal {
     // result: Array<[number, string]>;
     filename: FilePath;
     callback?: (keepRev?: string, mergedStr?: string) => Promise<void>;
     docs: LoadedEntry[];
-    component?: JsonResolvePane;
+    component?: ReturnType<typeof mount>;
     nameA: string;
     nameB: string;
     defaultSelect: string;
@@ -55,7 +56,7 @@ export class JsonResolveModal extends Modal {
         contentEl.empty();
 
         if (this.component == undefined) {
-            this.component = new JsonResolvePane({
+            this.component = mount(JsonResolvePane, {
                 target: contentEl,
                 props: {
                     docs: this.docs,
@@ -81,7 +82,7 @@ export class JsonResolveModal extends Modal {
             void this.callback(undefined);
         }
         if (this.component != undefined) {
-            this.component.$destroy();
+            void unmount(this.component);
             this.component = undefined;
         }
     }

src/features/HiddenFileCommon/JsonResolvePane.svelte

@@ -2,29 +2,64 @@
     import { type Diff, DIFF_DELETE, DIFF_INSERT, diff_match_patch } from "../../deps.ts";
     import type { FilePath, LoadedEntry } from "../../lib/src/common/types.ts";
     import { decodeBinary, readString } from "../../lib/src/string_and_binary/convert.ts";
-    import { getDocData, mergeObject } from "../../lib/src/common/utils.ts";
+    import { getDocData, isObjectDifferent, mergeObject } from "../../lib/src/common/utils.ts";
 
-    export let docs: LoadedEntry[] = [];
-    export let callback: (keepRev?: string, mergedStr?: string) => Promise<void> = async (_, __) => {
-        Promise.resolve();
-    };
-    export let filename: FilePath = "" as FilePath;
-    export let nameA: string = "A";
-    export let nameB: string = "B";
-    export let defaultSelect: string = "";
-    export let keepOrder = false;
-    export let hideLocal: boolean = false;
-    let docA: LoadedEntry;
-    let docB: LoadedEntry;
-    let docAContent = "";
-    let docBContent = "";
-    let objA: any = {};
-    let objB: any = {};
-    let objAB: any = {};
-    let objBA: any = {};
-    let diffs: Diff[];
+    interface Props {
+        docs?: LoadedEntry[];
+        callback?: (keepRev?: string, mergedStr?: string) => Promise<void>;
+        filename?: FilePath;
+        nameA?: string;
+        nameB?: string;
+        defaultSelect?: string;
+        keepOrder?: boolean;
+        hideLocal?: boolean;
+    }
+
+    let {
+        docs = $bindable([]),
+        callback = $bindable((async (_, __) => {
+            Promise.resolve();
+        }) as (keepRev?: string, mergedStr?: string) => Promise<void>),
+        filename = $bindable("" as FilePath),
+        nameA = $bindable("A"),
+        nameB = $bindable("B"),
+        defaultSelect = $bindable("" as string),
+        keepOrder = $bindable(false),
+        hideLocal = $bindable(false),
+    }: Props = $props();
+    type JSONData = Record<string | number | symbol, any> | [any];
+
+    const docsArray = $derived.by(() => {
+        if (docs && docs.length >= 1) {
+            if (keepOrder || docs[0].mtime < docs[1].mtime) {
+                return { a: docs[0], b: docs[1] } as const;
+            } else {
+                return { a: docs[1], b: docs[0] } as const;
+            }
+        }
+        return { a: false, b: false } as const;
+    });
+    const docA = $derived(docsArray.a);
+    const docB = $derived(docsArray.b);
+    const docAContent = $derived(docA && docToString(docA));
+    const docBContent = $derived(docB && docToString(docB));
+
+    function parseJson(json: string | false) {
+        if (json === false) return false;
+        try {
+            return JSON.parse(json) as JSONData;
+        } catch (ex) {
+            return false;
+        }
+    }
+    const objA = $derived(parseJson(docAContent) || {});
+    const objB = $derived(parseJson(docBContent) || {});
+    const objAB = $derived(mergeObject(objA, objB));
+    const objBAw = $derived(mergeObject(objB, objA));
+    const objBA = $derived(isObjectDifferent(objBAw, objAB) ? objBAw : false);
+    let diffs: Diff[] = $derived.by(() => (objA && selectedObj ? getJsonDiff(objA, selectedObj) : []));
     type SelectModes = "" | "A" | "B" | "AB" | "BA";
-    let mode: SelectModes = defaultSelect as SelectModes;
+    let mode: SelectModes = $state(defaultSelect as SelectModes);
 
     function docToString(doc: LoadedEntry) {
         return doc.datatype == "plain" ? getDocData(doc.data) : readString(new Uint8Array(decodeBinary(doc.data)));
@@ -45,6 +80,7 @@
         return getDiff(JSON.stringify(a, null, 2), JSON.stringify(b, null, 2));
     }
     function apply() {
+        if (!docA || !docB) return;
         if (docA._id == docB._id) {
             if (mode == "A") return callback(docA._rev!, undefined);
             if (mode == "B") return callback(docB._rev!, undefined);
@@ -59,50 +95,23 @@
     function cancel() {
         callback(undefined, undefined);
     }
-    $: {
-        if (docs && docs.length >= 1) {
-            if (keepOrder || docs[0].mtime < docs[1].mtime) {
-                docA = docs[0];
-                docB = docs[1];
-            } else {
-                docA = docs[1];
-                docB = docs[0];
-            }
-            docAContent = docToString(docA);
-            docBContent = docToString(docB);
+    const mergedObjs = $derived.by(
+        () =>
+            ({
+                "": false,
+                A: objA,
+                B: objB,
+                AB: objAB,
+                BA: objBA,
+            }) as Record<SelectModes, JSONData | false>
+    );
 
-            try {
-                objA = false;
-                objB = false;
-                objA = JSON.parse(docAContent);
-                objB = JSON.parse(docBContent);
-                objAB = mergeObject(objA, objB);
-                objBA = mergeObject(objB, objA);
-                if (JSON.stringify(objAB) == JSON.stringify(objBA)) {
-                    objBA = false;
-                }
-            } catch (ex) {
-                objBA = false;
-                objAB = false;
-            }
-        }
-    }
-    $: mergedObjs = {
-        "": false,
-        A: objA,
-        B: objB,
-        AB: objAB,
-        BA: objBA,
-    };
+    let selectedObj = $derived(mode in mergedObjs ? mergedObjs[mode] : {});
 
-    $: selectedObj = mode in mergedObjs ? mergedObjs[mode] : {};
-    $: {
-        diffs = getJsonDiff(objA, selectedObj);
-    }
+    let modesSrc = $state([] as ["" | "A" | "B" | "AB" | "BA", string][]);
 
-    let modes = [] as ["" | "A" | "B" | "AB" | "BA", string][];
-    $: {
-        let newModes = [] as typeof modes;
+    const modes = $derived.by(() => {
+        let newModes = [] as typeof modesSrc;
 
         if (!hideLocal) {
             newModes.push(["", "Not now"]);
@@ -111,15 +120,15 @@
         newModes.push(["B", nameB || "B"]);
         newModes.push(["AB", `${nameA || "A"} + ${nameB || "B"}`]);
         newModes.push(["BA", `${nameB || "B"} + ${nameA || "A"}`]);
-        modes = newModes;
-    }
+        return newModes;
+    });
 </script>
 
 <h2>{filename}</h2>
 {#if !docA || !docB}
     <div class="message">Just for a minute, please!</div>
     <div class="buttons">
-        <button on:click={apply}>Dismiss</button>
+        <button onclick={apply}>Dismiss</button>
     </div>
 {:else}
     <div class="options">
@@ -148,39 +157,39 @@
     <div class="infos">
         <table>
             <tbody>
-            <tr>
-                <th>{nameA}</th>
-                <td
-                    >{#if docA._id == docB._id}
-                        Rev:{revStringToRevNumber(docA._rev)}
-                    {/if}
-                    {new Date(docA.mtime).toLocaleString()}</td
-                >
-                <td>
-                    {docAContent.length} letters
-                </td>
-            </tr>
-            <tr>
-                <th>{nameB}</th>
-                <td
-                    >{#if docA._id == docB._id}
-                        Rev:{revStringToRevNumber(docB._rev)}
-                    {/if}
-                    {new Date(docB.mtime).toLocaleString()}</td
-                >
-                <td>
-                    {docBContent.length} letters
-                </td>
-            </tr>
+                <tr>
+                    <th>{nameA}</th>
+                    <td
+                        >{#if docA._id == docB._id}
+                            Rev:{revStringToRevNumber(docA._rev)}
+                        {/if}
+                        {new Date(docA.mtime).toLocaleString()}</td
+                    >
+                    <td>
+                        {docAContent && docAContent.length} letters
+                    </td>
+                </tr>
+                <tr>
+                    <th>{nameB}</th>
+                    <td
+                        >{#if docA._id == docB._id}
+                            Rev:{revStringToRevNumber(docB._rev)}
+                        {/if}
+                        {new Date(docB.mtime).toLocaleString()}</td
+                    >
+                    <td>
+                        {docBContent && docBContent.length} letters
+                    </td>
+                </tr>
             </tbody>
         </table>
     </div>
 
     <div class="buttons">
         {#if hideLocal}
-            <button on:click={cancel}>Cancel</button>
+            <button onclick={cancel}>Cancel</button>
         {/if}
-        <button on:click={apply}>Apply</button>
+        <button onclick={apply}>Apply</button>
     </div>
 {/if}
 

src/features/HiddenFileSync/CmdHiddenFileSync.ts

@@ -701,7 +701,7 @@ Offline Changed files: ${processFiles.length}`;
                             ?.filter((e) => e.status == "available" && Number(e.rev.split("-")[0]) < conflictedRevNo)
                             .first()?.rev ?? "";
                     const result = await this.plugin.localDatabase.mergeObject(
-                        path,
+                        doc.path,
                         commonBase,
                         doc._rev,
                         conflictedRev
@@ -1490,7 +1490,7 @@ Offline Changed files: ${files.length}`;
                     }
                     return false;
                 } else {
-                    const fileOnDB = await this.localDatabase.getDBEntryFromMeta(metaOnDB, {}, false, true, true);
+                    const fileOnDB = await this.localDatabase.getDBEntryFromMeta(metaOnDB, false, true);
                     if (fileOnDB === false) {
                         throw new Error(`Failed to read file from database:${storageFilePath}`);
                     }

src/features/P2PSync/CmdP2PReplicator.ts

@@ -0,0 +1,179 @@
+import type { IObsidianModule } from "../../modules/AbstractObsidianModule";
+import { P2PReplicatorPaneView, VIEW_TYPE_P2P } from "./P2PReplicator/P2PReplicatorPaneView.ts";
+import {
+    AutoAccepting,
+    LOG_LEVEL_NOTICE,
+    REMOTE_P2P,
+    type EntryDoc,
+    type P2PSyncSetting,
+    type RemoteDBSettings,
+} from "../../lib/src/common/types.ts";
+import { LiveSyncCommands } from "../LiveSyncCommands.ts";
+import { LiveSyncTrysteroReplicator } from "../../lib/src/replication/trystero/LiveSyncTrysteroReplicator.ts";
+import { EVENT_REQUEST_OPEN_P2P, eventHub } from "../../common/events.ts";
+import type { LiveSyncAbstractReplicator } from "../../lib/src/replication/LiveSyncAbstractReplicator.ts";
+import { Logger } from "octagonal-wheels/common/logger";
+import type { CommandShim } from "../../lib/src/replication/trystero/P2PReplicatorPaneCommon.ts";
+import {
+    P2PReplicatorMixIn,
+    removeP2PReplicatorInstance,
+    type P2PReplicatorBase,
+} from "../../lib/src/replication/trystero/P2PReplicatorCore.ts";
+import { reactiveSource } from "octagonal-wheels/dataobject/reactive_v2";
+import type { Confirm } from "../../lib/src/interfaces/Confirm.ts";
+import type ObsidianLiveSyncPlugin from "../../main.ts";
+import type { SimpleStore } from "octagonal-wheels/databases/SimpleStoreBase";
+import { getPlatformName } from "../../lib/src/PlatformAPIs/obsidian/Environment.ts";
+
+class P2PReplicatorCommandBase extends LiveSyncCommands implements P2PReplicatorBase {
+    storeP2PStatusLine = reactiveSource("");
+
+    getSettings(): P2PSyncSetting {
+        return this.plugin.settings;
+    }
+    get settings() {
+        return this.plugin.settings;
+    }
+    getDB() {
+        return this.plugin.localDatabase.localDatabase;
+    }
+
+    get confirm(): Confirm {
+        return this.plugin.confirm;
+    }
+    _simpleStore!: SimpleStore<any>;
+
+    simpleStore(): SimpleStore<any> {
+        return this._simpleStore;
+    }
+
+    constructor(plugin: ObsidianLiveSyncPlugin) {
+        super(plugin);
+    }
+
+    async handleReplicatedDocuments(docs: EntryDoc[]): Promise<void> {
+        // console.log("Processing Replicated Docs", docs);
+        return await this.plugin.$$parseReplicationResult(docs as PouchDB.Core.ExistingDocument<EntryDoc>[]);
+    }
+    onunload(): void {
+        throw new Error("Method not implemented.");
+    }
+    onload(): void | Promise<void> {
+        throw new Error("Method not implemented.");
+    }
+
+    init() {
+        this._simpleStore = this.plugin.$$getSimpleStore("p2p-sync");
+        return Promise.resolve(this);
+    }
+}
+
+export class P2PReplicator
+    extends P2PReplicatorMixIn(P2PReplicatorCommandBase)
+    implements IObsidianModule, CommandShim
+{
+    storeP2PStatusLine = reactiveSource("");
+    $anyNewReplicator(settingOverride: Partial<RemoteDBSettings> = {}): Promise<LiveSyncAbstractReplicator> {
+        const settings = { ...this.settings, ...settingOverride };
+        if (settings.remoteType == REMOTE_P2P) {
+            return Promise.resolve(new LiveSyncTrysteroReplicator(this.plugin));
+        }
+        return undefined!;
+    }
+    override getPlatform(): string {
+        return getPlatformName();
+    }
+
+    override onunload(): void {
+        removeP2PReplicatorInstance();
+        void this.close();
+    }
+
+    override onload(): void | Promise<void> {
+        eventHub.onEvent(EVENT_REQUEST_OPEN_P2P, () => {
+            void this.openPane();
+        });
+        this.p2pLogCollector.p2pReplicationLine.onChanged((line) => {
+            this.storeP2PStatusLine.value = line.value;
+        });
+    }
+    async $everyOnInitializeDatabase(): Promise<boolean> {
+        await this.initialiseP2PReplicator();
+        return Promise.resolve(true);
+    }
+
+    async $allSuspendExtraSync() {
+        this.plugin.settings.P2P_Enabled = false;
+        this.plugin.settings.P2P_AutoAccepting = AutoAccepting.NONE;
+        this.plugin.settings.P2P_AutoBroadcast = false;
+        this.plugin.settings.P2P_AutoStart = false;
+        this.plugin.settings.P2P_AutoSyncPeers = "";
+        this.plugin.settings.P2P_AutoWatchPeers = "";
+        return await Promise.resolve(true);
+    }
+
+    async $everyOnLoadStart() {
+        return await Promise.resolve();
+    }
+
+    async openPane() {
+        await this.plugin.$$showView(VIEW_TYPE_P2P);
+    }
+
+    async $everyOnloadStart(): Promise<boolean> {
+        this.plugin.registerView(VIEW_TYPE_P2P, (leaf) => new P2PReplicatorPaneView(leaf, this.plugin));
+        this.plugin.addCommand({
+            id: "open-p2p-replicator",
+            name: "P2P Sync : Open P2P Replicator",
+            callback: async () => {
+                await this.openPane();
+            },
+        });
+        this.plugin.addCommand({
+            id: "p2p-establish-connection",
+            name: "P2P Sync : Connect to the Signalling Server",
+            checkCallback: (isChecking) => {
+                if (isChecking) {
+                    return !(this._replicatorInstance?.server?.isServing ?? false);
+                }
+                void this.open();
+            },
+        });
+        this.plugin.addCommand({
+            id: "p2p-close-connection",
+            name: "P2P Sync : Disconnect from the Signalling Server",
+            checkCallback: (isChecking) => {
+                if (isChecking) {
+                    return this._replicatorInstance?.server?.isServing ?? false;
+                }
+                Logger(`Closing P2P Connection`, LOG_LEVEL_NOTICE);
+                void this.close();
+            },
+        });
+        this.plugin.addCommand({
+            id: "replicate-now-by-p2p",
+            name: "Replicate now by P2P",
+            checkCallback: (isChecking) => {
+                if (isChecking) {
+                    if (this.settings.remoteType == REMOTE_P2P) return false;
+                    if (!this._replicatorInstance?.server?.isServing) return false;
+                    return true;
+                }
+                void this._replicatorInstance?.replicateFromCommand(false);
+            },
+        });
+        this.plugin
+            .addRibbonIcon("waypoints", "P2P Replicator", async () => {
+                await this.openPane();
+            })
+            .addClass("livesync-ribbon-replicate-p2p");
+
+        return await Promise.resolve(true);
+    }
+    $everyAfterResumeProcess(): Promise<boolean> {
+        if (this.settings.P2P_Enabled && this.settings.P2P_AutoStart) {
+            setTimeout(() => void this.open(), 100);
+        }
+        return Promise.resolve(true);
+    }
+}

src/features/P2PSync/CmdP2PSync.ts

@@ -1,222 +0,0 @@
-import type { IObsidianModule } from "../../modules/AbstractObsidianModule";
-import { P2PReplicatorPaneView, VIEW_TYPE_P2P } from "./P2PReplicator/P2PReplicatorPaneView.ts";
-import { TrysteroReplicator } from "../../lib/src/replication/trystero/TrysteroReplicator.ts";
-import {
-    AutoAccepting,
-    DEFAULT_SETTINGS,
-    LOG_LEVEL_INFO,
-    LOG_LEVEL_NOTICE,
-    LOG_LEVEL_VERBOSE,
-    REMOTE_P2P,
-    type EntryDoc,
-    type RemoteDBSettings,
-} from "../../lib/src/common/types.ts";
-import { LiveSyncCommands } from "../LiveSyncCommands.ts";
-import {
-    LiveSyncTrysteroReplicator,
-    setReplicatorFunc,
-} from "../../lib/src/replication/trystero/LiveSyncTrysteroReplicator.ts";
-import {
-    EVENT_DATABASE_REBUILT,
-    EVENT_PLUGIN_UNLOADED,
-    EVENT_REQUEST_OPEN_P2P,
-    eventHub,
-} from "../../common/events.ts";
-import {
-    EVENT_ADVERTISEMENT_RECEIVED,
-    EVENT_DEVICE_LEAVED,
-    EVENT_P2P_REQUEST_FORCE_OPEN,
-    EVENT_REQUEST_STATUS,
-} from "../../lib/src/replication/trystero/TrysteroReplicatorP2PServer.ts";
-import type { LiveSyncAbstractReplicator } from "../../lib/src/replication/LiveSyncAbstractReplicator.ts";
-import { Logger } from "octagonal-wheels/common/logger";
-import { $msg } from "../../lib/src/common/i18n.ts";
-
-export class P2PReplicator extends LiveSyncCommands implements IObsidianModule {
-    $anyNewReplicator(settingOverride: Partial<RemoteDBSettings> = {}): Promise<LiveSyncAbstractReplicator> {
-        const settings = { ...this.settings, ...settingOverride };
-        if (settings.remoteType == REMOTE_P2P) {
-            return Promise.resolve(new LiveSyncTrysteroReplicator(this.plugin));
-        }
-        return undefined!;
-    }
-
-    _replicatorInstance?: TrysteroReplicator;
-    onunload(): void {
-        setReplicatorFunc(() => undefined);
-        void this.close();
-    }
-
-    onload(): void | Promise<void> {
-        setReplicatorFunc(() => this._replicatorInstance);
-        eventHub.onEvent(EVENT_ADVERTISEMENT_RECEIVED, (peerId) => this._replicatorInstance?.onNewPeer(peerId));
-        eventHub.onEvent(EVENT_DEVICE_LEAVED, (info) => this._replicatorInstance?.onPeerLeaved(info));
-        eventHub.onEvent(EVENT_REQUEST_STATUS, () => {
-            this._replicatorInstance?.requestStatus();
-        });
-        eventHub.onEvent(EVENT_P2P_REQUEST_FORCE_OPEN, () => {
-            void this.open();
-        });
-        eventHub.onEvent(EVENT_REQUEST_OPEN_P2P, () => {
-            void this.openPane();
-        });
-        eventHub.onEvent(EVENT_DATABASE_REBUILT, async () => {
-            await this.initialiseP2PReplicator();
-        });
-        eventHub.onEvent(EVENT_PLUGIN_UNLOADED, () => {
-            void this.close();
-        });
-        // throw new Error("Method not implemented.");
-    }
-    async $everyOnInitializeDatabase(): Promise<boolean> {
-        await this.initialiseP2PReplicator();
-        return Promise.resolve(true);
-    }
-
-    async $allSuspendExtraSync() {
-        this.plugin.settings.P2P_Enabled = false;
-        this.plugin.settings.P2P_AutoAccepting = AutoAccepting.NONE;
-        this.plugin.settings.P2P_AutoBroadcast = false;
-        this.plugin.settings.P2P_AutoStart = false;
-        this.plugin.settings.P2P_AutoSyncPeers = "";
-        this.plugin.settings.P2P_AutoWatchPeers = "";
-        return await Promise.resolve(true);
-    }
-    async $everyOnLoadStart() {
-        return await Promise.resolve();
-    }
-
-    async openPane() {
-        await this.plugin.$$showView(VIEW_TYPE_P2P);
-    }
-
-    async $everyOnloadStart(): Promise<boolean> {
-        this.plugin.registerView(VIEW_TYPE_P2P, (leaf) => new P2PReplicatorPaneView(leaf, this.plugin));
-        this.plugin.addCommand({
-            id: "open-p2p-replicator",
-            name: "P2P Sync : Open P2P Replicator",
-            callback: async () => {
-                await this.openPane();
-            },
-        });
-        this.plugin.addCommand({
-            id: "p2p-establish-connection",
-            name: "P2P Sync : Connect to the Signalling Server",
-            checkCallback: (isChecking) => {
-                if (isChecking) {
-                    return !(this._replicatorInstance?.server?.isServing ?? false);
-                }
-                void this.open();
-            },
-        });
-        this.plugin.addCommand({
-            id: "p2p-close-connection",
-            name: "P2P Sync : Disconnect from the Signalling Server",
-            checkCallback: (isChecking) => {
-                if (isChecking) {
-                    return this._replicatorInstance?.server?.isServing ?? false;
-                }
-                Logger(`Closing P2P Connection`, LOG_LEVEL_NOTICE);
-                void this.close();
-            },
-        });
-        this.plugin.addCommand({
-            id: "replicate-now-by-p2p",
-            name: "Replicate now by P2P",
-            checkCallback: (isChecking) => {
-                if (isChecking) {
-                    if (this.settings.remoteType == REMOTE_P2P) return false;
-                    if (!this._replicatorInstance?.server?.isServing) return false;
-                    return true;
-                }
-                void this._replicatorInstance?.replicateFromCommand(false);
-            },
-        });
-        this.plugin
-            .addRibbonIcon("waypoints", "P2P Replicator", async () => {
-                await this.openPane();
-            })
-            .addClass("livesync-ribbon-replicate-p2p");
-
-        return await Promise.resolve(true);
-    }
-    $everyAfterResumeProcess(): Promise<boolean> {
-        if (this.settings.P2P_Enabled && this.settings.P2P_AutoStart) {
-            setTimeout(() => void this.open(), 100);
-        }
-        return Promise.resolve(true);
-    }
-    async open() {
-        if (!this.settings.P2P_Enabled) {
-            this._notice($msg("P2P.NotEnabled"));
-            return;
-        }
-
-        if (!this._replicatorInstance) {
-            await this.initialiseP2PReplicator();
-        }
-        await this._replicatorInstance?.open();
-    }
-    async close() {
-        await this._replicatorInstance?.close();
-        this._replicatorInstance = undefined;
-    }
-    getConfig(key: string) {
-        const vaultName = this.plugin.$$getVaultName();
-        const dbKey = `${vaultName}-${key}`;
-        return localStorage.getItem(dbKey);
-    }
-    setConfig(key: string, value: string) {
-        const vaultName = this.plugin.$$getVaultName();
-        const dbKey = `${vaultName}-${key}`;
-        localStorage.setItem(dbKey, value);
-    }
-
-    async initialiseP2PReplicator(): Promise<TrysteroReplicator> {
-        const getPlugin = () => this.plugin;
-        try {
-            // const plugin = this.plugin;
-            if (this._replicatorInstance) {
-                await this._replicatorInstance.close();
-                this._replicatorInstance = undefined;
-            }
-
-            if (!this.settings.P2P_AppID) {
-                this.settings.P2P_AppID = DEFAULT_SETTINGS.P2P_AppID;
-            }
-
-            const initialDeviceName = this.getConfig("p2p_device_name") || this.plugin.$$getDeviceAndVaultName();
-            const env = {
-                get db() {
-                    return getPlugin().localDatabase.localDatabase;
-                },
-                get confirm() {
-                    return getPlugin().confirm;
-                },
-                get deviceName() {
-                    return initialDeviceName;
-                },
-                platform: "wip",
-                get settings() {
-                    return getPlugin().settings;
-                },
-                async processReplicatedDocs(docs: EntryDoc[]): Promise<void> {
-                    return await getPlugin().$$parseReplicationResult(
-                        docs as PouchDB.Core.ExistingDocument<EntryDoc>[]
-                    );
-                },
-                simpleStore: getPlugin().$$getSimpleStore("p2p-sync"),
-            };
-            this._replicatorInstance = new TrysteroReplicator(env);
-            // p2p_replicator.set(this.p2pReplicator);
-            return this._replicatorInstance;
-        } catch (e) {
-            this._log(
-                e instanceof Error ? e.message : "Something occurred on Initialising P2P Replicator",
-                LOG_LEVEL_INFO
-            );
-            this._log(e, LOG_LEVEL_VERBOSE);
-            throw e;
-        }
-    }
-}

src/features/P2PSync/P2PReplicator/P2PReplicatorPane.svelte

@@ -1,16 +1,15 @@
 <script lang="ts">
     import { onMount, setContext } from "svelte";
+    import { AutoAccepting, DEFAULT_SETTINGS, type P2PSyncSetting } from "../../../lib/src/common/types";
     import {
-        AutoAccepting,
-        DEFAULT_SETTINGS,
-        type ObsidianLiveSyncSettings,
-        type P2PSyncSetting,
-    } from "../../../lib/src/common/types";
-    import { type P2PReplicator } from "../CmdP2PSync";
-    import { AcceptedStatus, ConnectionStatus, type PeerStatus } from "./P2PReplicatorPaneView";
+        AcceptedStatus,
+        ConnectionStatus,
+        type CommandShim,
+        type PeerStatus,
+        type PluginShim,
+    } from "../../../lib/src/replication/trystero/P2PReplicatorPaneCommon";
     import PeerStatusRow from "../P2PReplicator/PeerStatusRow.svelte";
     import { EVENT_LAYOUT_READY, eventHub } from "../../../common/events";
-    import type ObsidianLiveSyncPlugin from "../../../main";
     import {
         type PeerInfo,
         type P2PServerInfo,
@@ -22,11 +21,12 @@
     import { $msg as _msg } from "../../../lib/src/common/i18n";
 
     interface Props {
-        plugin: ObsidianLiveSyncPlugin;
+        plugin: PluginShim;
+        cmdSync: CommandShim;
     }
 
-    let { plugin }: Props = $props();
-    const cmdSync = plugin.getAddOn<P2PReplicator>("P2PReplicator")!;
+    let { plugin, cmdSync }: Props = $props();
+    // const cmdSync = plugin.getAddOn<P2PReplicator>("P2PReplicator")!;
     setContext("getReplicator", () => cmdSync);
 
     const initialSettings = { ...plugin.settings };
@@ -34,6 +34,7 @@
     let settings = $state<P2PSyncSetting>(initialSettings);
     // const vaultName = plugin.$$getVaultName();
     // const dbKey = `${vaultName}-p2p-device-name`;
+
     const initialDeviceName = cmdSync.getConfig("p2p_device_name") ?? plugin.$$getVaultName();
     let deviceName = $state<string>(initialDeviceName);
 
@@ -100,7 +101,7 @@
 
     let serverInfo = $state<P2PServerInfo | undefined>(undefined);
     let replicatorInfo = $state<P2PReplicatorStatus | undefined>(undefined);
-    const applyLoadSettings = (d: ObsidianLiveSyncSettings, force: boolean) => {
+    const applyLoadSettings = (d: P2PSyncSetting, force: boolean) => {
         const { P2P_relays, P2P_roomID, P2P_passphrase, P2P_AppID, P2P_AutoAccepting } = d;
         if (force || !isP2PEnabledModified) eP2PEnabled = d.P2P_Enabled;
         if (force || !isRelayModified) eRelay = P2P_relays;
@@ -221,10 +222,10 @@
         await cmdSync.close();
     }
     function startBroadcasting() {
-        cmdSync._replicatorInstance?.enableBroadcastChanges();
+        void cmdSync.enableBroadcastCastings();
     }
     function stopBroadcasting() {
-        cmdSync._replicatorInstance?.disableBroadcastChanges();
+        void cmdSync.disableBroadcastCastings();
     }
 
     const initialDialogStatusKey = `p2p-dialog-status`;
@@ -283,6 +284,7 @@
                                 type="text"
                                 placeholder="wss://exp-relay.vrtmrz.net, wss://xxxxx"
                                 bind:value={eRelay}
+                                autocomplete="off"
                             />
                             <button onclick={() => useDefaultRelay()}> Use vrtmrz's relay </button>
                         </label>
@@ -292,7 +294,14 @@
                     <th> Room ID </th>
                     <td>
                         <label class={{ "is-dirty": isRoomIdModified }}>
-                            <input type="text" placeholder="anything-you-like" bind:value={eRoomId} />
+                            <input
+                                type="text"
+                                placeholder="anything-you-like"
+                                bind:value={eRoomId}
+                                autocomplete="off"
+                                spellcheck="false"
+                                autocorrect="off"
+                            />
                             <button onclick={() => chooseRandom()}> Use Random Number </button>
                         </label>
                         <span>
@@ -318,8 +327,14 @@
                     <th> This device name </th>
                     <td>
                         <label class={{ "is-dirty": isDeviceNameModified }}>
-                            <input type="text" placeholder="iphone-16" bind:value={eDeviceName} />
+                            <input type="text" placeholder="iphone-16" bind:value={eDeviceName} autocomplete="off" />
                         </label>
+                        <span>
+                            <small>
+                                Device name to identify the device. Please use shorter one for the stable peer
+                                detection, i.e., "iphone-16" or "macbook-2021".
+                            </small>
+                        </span>
                     </td>
                 </tr>
                 <tr>

src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.ts

@@ -1,35 +1,37 @@
-import { WorkspaceLeaf } from "obsidian";
+import { Menu, WorkspaceLeaf } from "obsidian";
 import ReplicatorPaneComponent from "./P2PReplicatorPane.svelte";
 import type ObsidianLiveSyncPlugin from "../../../main.ts";
 import { mount } from "svelte";
 import { SvelteItemView } from "../../../common/SvelteItemView.ts";
+import { eventHub } from "../../../common/events.ts";
+
+import { unique } from "octagonal-wheels/collection";
+import { LOG_LEVEL_NOTICE, REMOTE_P2P } from "../../../lib/src/common/types.ts";
+import { Logger } from "../../../lib/src/common/logger.ts";
+import { P2PReplicator } from "../CmdP2PReplicator.ts";
+import {
+    EVENT_P2P_PEER_SHOW_EXTRA_MENU,
+    type PeerStatus,
+} from "../../../lib/src/replication/trystero/P2PReplicatorPaneCommon.ts";
 export const VIEW_TYPE_P2P = "p2p-replicator";
 
-export enum AcceptedStatus {
-    UNKNOWN = "Unknown",
-    ACCEPTED = "Accepted",
-    DENIED = "Denied",
-    ACCEPTED_IN_SESSION = "Accepted in session",
-    DENIED_IN_SESSION = "Denied in session",
+function addToList(item: string, list: string) {
+    return unique(
+        list
+            .split(",")
+            .map((e) => e.trim())
+            .concat(item)
+            .filter((p) => p)
+    ).join(",");
 }
-
-export enum ConnectionStatus {
-    CONNECTED = "Connected",
-    CONNECTED_LIVE = "Connected(live)",
-    DISCONNECTED = "Disconnected",
+function removeFromList(item: string, list: string) {
+    return list
+        .split(",")
+        .map((e) => e.trim())
+        .filter((p) => p !== item)
+        .filter((p) => p)
+        .join(",");
 }
-export type PeerStatus = {
-    name: string;
-    peerId: string;
-    syncOnConnect: boolean;
-    watchOnConnect: boolean;
-    syncOnReplicationCommand: boolean;
-    accepted: AcceptedStatus;
-    status: ConnectionStatus;
-    isFetching: boolean;
-    isSending: boolean;
-    isWatching: boolean;
-};
 
 export class P2PReplicatorPaneView extends SvelteItemView {
     plugin: ObsidianLiveSyncPlugin;
@@ -40,10 +42,130 @@ export class P2PReplicatorPaneView extends SvelteItemView {
     getIcon(): string {
         return "waypoints";
     }
+    get replicator() {
+        const r = this.plugin.getAddOn<P2PReplicator>(P2PReplicator.name);
+        if (!r || !r._replicatorInstance) {
+            throw new Error("Replicator not found");
+        }
+        return r._replicatorInstance;
+    }
+    async replicateFrom(peer: PeerStatus) {
+        await this.replicator.replicateFrom(peer.peerId);
+    }
+    async replicateTo(peer: PeerStatus) {
+        await this.replicator.requestSynchroniseToPeer(peer.peerId);
+    }
+    async getRemoteConfig(peer: PeerStatus) {
+        Logger(
+            `Requesting remote config for ${peer.name}. Please input the passphrase on the remote device`,
+            LOG_LEVEL_NOTICE
+        );
+        const remoteConfig = await this.replicator.getRemoteConfig(peer.peerId);
+        if (remoteConfig) {
+            Logger(`Remote config for ${peer.name} is retrieved successfully`);
+            const DROP = "Yes, and drop local database";
+            const KEEP = "Yes, but keep local database";
+            const CANCEL = "No, cancel";
+            const yn = await this.plugin.confirm.askSelectStringDialogue(
+                `Do you really want to apply the remote config? This will overwrite your current config immediately and restart.
+And you can also drop the local database to rebuild from the remote device.`,
+                [DROP, KEEP, CANCEL] as const,
+                {
+                    defaultAction: CANCEL,
+                    title: "Apply Remote Config ",
+                }
+            );
+            if (yn === DROP || yn === KEEP) {
+                if (yn === DROP) {
+                    if (remoteConfig.remoteType !== REMOTE_P2P) {
+                        const yn2 = await this.plugin.confirm.askYesNoDialog(
+                            `Do you want to set the remote type to "P2P Sync" to rebuild by "P2P replication"?`,
+                            {
+                                title: "Rebuild from remote device",
+                            }
+                        );
+                        if (yn2 === "yes") {
+                            remoteConfig.remoteType = REMOTE_P2P;
+                            remoteConfig.P2P_RebuildFrom = peer.name;
+                        }
+                    }
+                }
+                this.plugin.settings = remoteConfig;
+                await this.plugin.saveSettings();
+                if (yn === DROP) {
+                    await this.plugin.rebuilder.scheduleFetch();
+                } else {
+                    await this.plugin.$$scheduleAppReload();
+                }
+            } else {
+                Logger(`Cancelled\nRemote config for ${peer.name} is not applied`, LOG_LEVEL_NOTICE);
+            }
+        } else {
+            Logger(`Cannot retrieve remote config for ${peer.peerId}`);
+        }
+    }
 
+    async toggleProp(peer: PeerStatus, prop: "syncOnConnect" | "watchOnConnect" | "syncOnReplicationCommand") {
+        const settingMap = {
+            syncOnConnect: "P2P_AutoSyncPeers",
+            watchOnConnect: "P2P_AutoWatchPeers",
+            syncOnReplicationCommand: "P2P_SyncOnReplication",
+        } as const;
+
+        const targetSetting = settingMap[prop];
+        if (peer[prop]) {
+            this.plugin.settings[targetSetting] = removeFromList(peer.name, this.plugin.settings[targetSetting]);
+            await this.plugin.saveSettings();
+        } else {
+            this.plugin.settings[targetSetting] = addToList(peer.name, this.plugin.settings[targetSetting]);
+            await this.plugin.saveSettings();
+        }
+        await this.plugin.saveSettings();
+    }
+    m?: Menu;
     constructor(leaf: WorkspaceLeaf, plugin: ObsidianLiveSyncPlugin) {
         super(leaf);
         this.plugin = plugin;
+        eventHub.onEvent(EVENT_P2P_PEER_SHOW_EXTRA_MENU, ({ peer, event }) => {
+            if (this.m) {
+                this.m.hide();
+            }
+            this.m = new Menu()
+                .addItem((item) => item.setTitle("📥 Only Fetch").onClick(() => this.replicateFrom(peer)))
+                .addItem((item) => item.setTitle("📤 Only Send").onClick(() => this.replicateTo(peer)))
+                .addSeparator()
+                .addItem((item) => {
+                    item.setTitle("🔧 Get Configuration").onClick(async () => {
+                        await this.getRemoteConfig(peer);
+                    });
+                })
+                .addSeparator()
+                .addItem((item) => {
+                    const mark = peer.syncOnConnect ? "checkmark" : null;
+                    item.setTitle("Toggle Sync on connect")
+                        .onClick(async () => {
+                            await this.toggleProp(peer, "syncOnConnect");
+                        })
+                        .setIcon(mark);
+                })
+                .addItem((item) => {
+                    const mark = peer.watchOnConnect ? "checkmark" : null;
+                    item.setTitle("Toggle Watch on connect")
+                        .onClick(async () => {
+                            await this.toggleProp(peer, "watchOnConnect");
+                        })
+                        .setIcon(mark);
+                })
+                .addItem((item) => {
+                    const mark = peer.syncOnReplicationCommand ? "checkmark" : null;
+                    item.setTitle("Toggle Sync on `Replicate now` command")
+                        .onClick(async () => {
+                            await this.toggleProp(peer, "syncOnReplicationCommand");
+                        })
+                        .setIcon(mark);
+                });
+            this.m.showAtPosition({ x: event.x, y: event.y });
+        });
     }
 
     getViewType() {
@@ -54,11 +176,22 @@ export class P2PReplicatorPaneView extends SvelteItemView {
         return "Peer-to-Peer Replicator";
     }
 
+    override async onClose(): Promise<void> {
+        await super.onClose();
+        if (this.m) {
+            this.m.hide();
+        }
+    }
     instantiateComponent(target: HTMLElement) {
+        const cmdSync = this.plugin.getAddOn<P2PReplicator>(P2PReplicator.name);
+        if (!cmdSync) {
+            throw new Error("Replicator not found");
+        }
         return mount(ReplicatorPaneComponent, {
             target: target,
             props: {
-                plugin: this.plugin,
+                plugin: cmdSync.plugin,
+                cmdSync: cmdSync,
             },
         });
     }

src/features/P2PSync/P2PReplicator/PeerStatusRow.svelte

@@ -1,11 +1,9 @@
 <script lang="ts">
     import { getContext } from "svelte";
-    import { AcceptedStatus, ConnectionStatus, type PeerStatus } from "./P2PReplicatorPaneView";
-    import { Menu, Setting } from "obsidian";
-    import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, Logger } from "octagonal-wheels/common/logger";
-    import type { P2PReplicator } from "../CmdP2PSync";
-    import { unique } from "../../../lib/src/common/utils";
-    import { REMOTE_P2P } from "src/lib/src/common/types";
+    import { AcceptedStatus, type PeerStatus } from "../../../lib/src/replication/trystero/P2PReplicatorPaneCommon";
+    import type { P2PReplicator } from "../CmdP2PReplicator";
+    import { eventHub } from "../../../common/events";
+    import { EVENT_P2P_PEER_SHOW_EXTRA_MENU } from "../../../lib/src/replication/trystero/P2PReplicatorPaneCommon";
 
     interface Props {
         peerStatus: PeerStatus;
@@ -94,154 +92,13 @@
     function stopWatching() {
         replicator.unwatchPeer(peer.peerId);
     }
-    function replicateFrom() {
-        replicator.replicateFrom(peer.peerId);
-    }
-    function replicateTo() {
-        replicator.requestSynchroniseToPeer(peer.peerId);
-    }
+
     function sync() {
         replicator.sync(peer.peerId, false);
     }
-    function addToList(item: string, list: string) {
-        return unique(
-            list
-                .split(",")
-                .map((e) => e.trim())
-                .concat(item)
-                .filter((p) => p)
-        ).join(",");
-    }
-    function removeFromList(item: string, list: string) {
-        return list
-            .split(",")
-            .map((e) => e.trim())
-            .filter((p) => p !== item)
-            .filter((p) => p)
-            .join(",");
-    }
+
     function moreMenu(evt: MouseEvent) {
-        const m = new Menu()
-            .addItem((item) => item.setTitle("📥 Only Fetch").onClick(() => replicateFrom()))
-            .addItem((item) => item.setTitle("📤 Only Send").onClick(() => replicateTo()))
-            .addSeparator()
-            .addItem((item) => {
-                item.setTitle("🔧 Get Configuration").onClick(async () => {
-                    Logger(
-                        `Requesting remote config for ${peer.name}. Please input the passphrase on the remote device`,
-                        LOG_LEVEL_NOTICE
-                    );
-                    const remoteConfig = await replicator.getRemoteConfig(peer.peerId);
-                    if (remoteConfig) {
-                        Logger(`Remote config for ${peer.name} is retrieved successfully`);
-                        const DROP = "Yes, and drop local database";
-                        const KEEP = "Yes, but keep local database";
-                        const CANCEL = "No, cancel";
-                        const yn = await replicator.confirm.askSelectStringDialogue(
-                            `Do you really want to apply the remote config? This will overwrite your current config immediately and restart.
-And you can also drop the local database to rebuild from the remote device.`,
-                            [DROP, KEEP, CANCEL] as const,
-                            {
-                                defaultAction: CANCEL,
-                                title: "Apply Remote Config ",
-                            }
-                        );
-                        if (yn === DROP || yn === KEEP) {
-                            if (yn === DROP) {
-                                if (remoteConfig.remoteType !== REMOTE_P2P) {
-                                    const yn2 = await replicator.confirm.askYesNoDialog(
-                                        `Do you want to set the remote type to "P2P Sync" to rebuild by "P2P replication"?`,
-                                        {
-                                            title: "Rebuild from remote device",
-                                        }
-                                    );
-                                    if (yn2 === "yes") {
-                                        remoteConfig.remoteType = REMOTE_P2P;
-                                        remoteConfig.P2P_RebuildFrom = peer.name;
-                                    }
-                                }
-                            }
-                            cmdReplicator.plugin.settings = remoteConfig;
-                            await cmdReplicator.plugin.saveSettings();
-                            // await cmdReplicator.setConfig("rebuildFrom", peer.name);
-                            if (yn === DROP) {
-                                await cmdReplicator.plugin.rebuilder.scheduleFetch();
-                            } else {
-                                await cmdReplicator.plugin.$$scheduleAppReload();
-                            }
-                        } else {
-                            Logger(`Cancelled\nRemote config for ${peer.name} is not applied`, LOG_LEVEL_NOTICE);
-                        }
-                    } else {
-                        Logger(`Cannot retrieve remote config for ${peer.peerId}`);
-                    }
-                });
-            })
-            .addSeparator()
-            .addItem((item) => {
-                const mark = peer.syncOnConnect ? "checkmark" : null;
-                item.setTitle("Toggle Sync on connect")
-                    .onClick(async () => {
-                        // TODO: Fix to prevent writing to settings directly
-                        if (peer.syncOnConnect) {
-                            cmdReplicator.settings.P2P_AutoSyncPeers = removeFromList(
-                                peer.name,
-                                cmdReplicator.settings.P2P_AutoSyncPeers
-                            );
-                            await cmdReplicator.plugin.saveSettings();
-                        } else {
-                            cmdReplicator.settings.P2P_AutoSyncPeers = addToList(
-                                peer.name,
-                                cmdReplicator.settings.P2P_AutoSyncPeers
-                            );
-                            await cmdReplicator.plugin.saveSettings();
-                        }
-                    })
-                    .setIcon(mark);
-            })
-            .addItem((item) => {
-                const mark = peer.watchOnConnect ? "checkmark" : null;
-                item.setTitle("Toggle Watch on connect")
-                    .onClick(async () => {
-                        // TODO: Fix to prevent writing to settings directly
-                        if (peer.watchOnConnect) {
-                            cmdReplicator.settings.P2P_AutoWatchPeers = removeFromList(
-                                peer.name,
-                                cmdReplicator.settings.P2P_AutoWatchPeers
-                            );
-                            await cmdReplicator.plugin.saveSettings();
-                        } else {
-                            cmdReplicator.settings.P2P_AutoWatchPeers = addToList(
-                                peer.name,
-                                cmdReplicator.settings.P2P_AutoWatchPeers
-                            );
-                            await cmdReplicator.plugin.saveSettings();
-                        }
-                    })
-                    .setIcon(mark);
-            })
-            .addItem((item) => {
-                const mark = peer.syncOnReplicationCommand ? "checkmark" : null;
-                item.setTitle("Toggle Sync on `Replicate now` command")
-                    .onClick(async () => {
-                        // TODO: Fix to prevent writing to settings directly
-                        if (peer.syncOnReplicationCommand) {
-                            cmdReplicator.settings.P2P_SyncOnReplication = removeFromList(
-                                peer.name,
-                                cmdReplicator.settings.P2P_SyncOnReplication
-                            );
-                            await cmdReplicator.plugin.saveSettings();
-                        } else {
-                            cmdReplicator.settings.P2P_SyncOnReplication = addToList(
-                                peer.name,
-                                cmdReplicator.settings.P2P_SyncOnReplication
-                            );
-                            await cmdReplicator.plugin.saveSettings();
-                        }
-                    })
-                    .setIcon(mark);
-            });
-        m.showAtPosition({ x: evt.x, y: evt.y });
+        eventHub.emitEvent(EVENT_P2P_PEER_SHOW_EXTRA_MENU, { peer, event: evt });
     }
 </script>
 

src/main.ts

@@ -82,7 +82,7 @@ import { ModuleReplicateTest } from "./modules/extras/ModuleReplicateTest.ts";
 import { ModuleLiveSyncMain } from "./modules/main/ModuleLiveSyncMain.ts";
 import { ModuleExtraSyncObsidian } from "./modules/extraFeaturesObsidian/ModuleExtraSyncObsidian.ts";
 import { LocalDatabaseMaintenance } from "./features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts";
-import { P2PReplicator } from "./features/P2PSync/CmdP2PSync.ts";
+import { P2PReplicator } from "./features/P2PSync/CmdP2PReplicator.ts";
 
 function throwShouldBeOverridden(): never {
     throw new Error("This function should be overridden by the module.");
@@ -570,6 +570,9 @@ export default class ObsidianLiveSyncPlugin
     $$replicate(showMessage: boolean = false): Promise<boolean | void> {
         throwShouldBeOverridden();
     }
+    $$replicateByEvent(showMessage: boolean = false): Promise<boolean | void> {
+        throwShouldBeOverridden();
+    }
 
     $everyOnDatabaseInitialized(showingNotice: boolean): Promise<boolean> {
         throwShouldBeOverridden();
@@ -636,10 +639,6 @@ export default class ObsidianLiveSyncPlugin
         throwShouldBeOverridden();
     }
 
-    $$waitForReplicationOnce(): Promise<boolean | void> {
-        throwShouldBeOverridden();
-    }
-
     $$resetLocalDatabase(): Promise<void> {
         throwShouldBeOverridden();
     }

src/modules/core/ModuleDatabaseFileAccess.ts

@@ -313,13 +313,7 @@ export class ModuleDatabaseFileAccess extends AbstractModule implements IObsidia
         if (skipCheck && !(await this.checkIsTargetFile(meta.path))) {
             return false;
         }
-        const doc = await this.localDatabase.getDBEntryFromMeta(
-            meta as LoadedEntry,
-            undefined,
-            false,
-            waitForReady,
-            true
-        );
+        const doc = await this.localDatabase.getDBEntryFromMeta(meta as LoadedEntry, false, waitForReady);
         if (doc === false) {
             return false;
         }

src/modules/core/ModuleFileHandler.ts

@@ -297,7 +297,7 @@ export class ModuleFileHandler extends AbstractModule implements ICoreModule {
         }
         await this.storage.ensureDir(path);
         const ret = await this.storage.writeFileAuto(path, docData, { ctime: docRead.ctime, mtime: docRead.mtime });
-        this.storage.touched(path);
+        await this.storage.touched(path);
         this.storage.triggerFileEvent(mode, path);
         return ret;
     }

src/modules/core/ModuleRebuilder.ts

@@ -176,7 +176,7 @@ export class ModuleRebuilder extends AbstractModule implements ICoreModule, Rebu
             }
         }
     }
-    async fetchLocal(makeLocalChunkBeforeSync?: boolean) {
+    async fetchLocal(makeLocalChunkBeforeSync?: boolean, preventMakeLocalFilesBeforeSync?: boolean) {
         await this.core.$allSuspendExtraSync();
         await this.askUseNewAdapter();
         this.core.settings.isConfigured = true;
@@ -189,6 +189,10 @@ export class ModuleRebuilder extends AbstractModule implements ICoreModule, Rebu
         this.core.$$markIsReady();
         if (makeLocalChunkBeforeSync) {
             await this.core.fileHandler.createAllChunks(true);
+        } else if (!preventMakeLocalFilesBeforeSync) {
+            await this.core.$$initializeDatabase(true);
+        } else {
+            // Do not create local file entries before sync (Means use remote information)
         }
         await this.core.$$markRemoteResolved();
         await delay(500);

src/modules/core/ModuleReplicator.ts

@@ -18,17 +18,27 @@ import {
     type MetaEntry,
 } from "../../lib/src/common/types";
 import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
-import { getPath, isChunk, isValidPath, scheduleTask } from "../../common/utils";
+import {
+    getPath,
+    isChunk,
+    isValidPath,
+    rateLimitedSharedExecution,
+    scheduleTask,
+    updatePreviousExecutionTime,
+} from "../../common/utils";
 import { isAnyNote } from "../../lib/src/common/utils";
 import { EVENT_FILE_SAVED, eventHub } from "../../common/events";
 import type { LiveSyncAbstractReplicator } from "../../lib/src/replication/LiveSyncAbstractReplicator";
 import { globalSlipBoard } from "../../lib/src/bureau/bureau";
+import { $msg } from "../../lib/src/common/i18n";
 
+const KEY_REPLICATION_ON_EVENT = "replicationOnEvent";
+const REPLICATION_ON_EVENT_FORECASTED_TIME = 5000;
 export class ModuleReplicator extends AbstractModule implements ICoreModule {
     $everyOnloadAfterLoadSettings(): Promise<boolean> {
         eventHub.onEvent(EVENT_FILE_SAVED, () => {
             if (this.settings.syncOnSave && !this.core.$$isSuspended()) {
-                scheduleTask("perform-replicate-after-save", 250, () => this.core.$$waitForReplicationOnce());
+                scheduleTask("perform-replicate-after-save", 250, () => this.core.$$replicateByEvent());
             }
         });
         return Promise.resolve(true);
@@ -37,7 +47,7 @@ export class ModuleReplicator extends AbstractModule implements ICoreModule {
     async setReplicator() {
         const replicator = await this.core.$anyNewReplicator();
         if (!replicator) {
-            this._log("No replicator is available, this is the fatal error.", LOG_LEVEL_NOTICE);
+            this._log($msg("Replicator.Message.InitialiseFatalError"), LOG_LEVEL_NOTICE);
             return false;
         }
         this.core.replicator = replicator;
@@ -61,23 +71,91 @@ export class ModuleReplicator extends AbstractModule implements ICoreModule {
         await this.loadQueuedFiles();
         return true;
     }
+
     async $$replicate(showMessage: boolean = false): Promise<boolean | void> {
+        try {
+            updatePreviousExecutionTime(KEY_REPLICATION_ON_EVENT, REPLICATION_ON_EVENT_FORECASTED_TIME);
+            return await this.$$_replicate(showMessage);
+        } finally {
+            updatePreviousExecutionTime(KEY_REPLICATION_ON_EVENT);
+        }
+    }
+
+    /**
+     * obsolete method. No longer maintained and will be removed in the future.
+     * @deprecated v0.24.17
+     * @param showMessage If true, show message to the user.
+     */
+    async cleaned(showMessage: boolean) {
+        Logger(`The remote database has been cleaned.`, showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO);
+        await skipIfDuplicated("cleanup", async () => {
+            const count = await purgeUnreferencedChunks(this.localDatabase.localDatabase, true);
+            const message = `The remote database has been cleaned up.
+To synchronize, this device must be also cleaned up. ${count} chunk(s) will be erased from this device.
+However, If there are many chunks to be deleted, maybe fetching again is faster.
+We will lose the history of this device if we fetch the remote database again.
+Even if you choose to clean up, you will see this option again if you exit Obsidian and then synchronise again.`;
+            const CHOICE_FETCH = "Fetch again";
+            const CHOICE_CLEAN = "Cleanup";
+            const CHOICE_DISMISS = "Dismiss";
+            const ret = await this.core.confirm.confirmWithMessage(
+                "Cleaned",
+                message,
+                [CHOICE_FETCH, CHOICE_CLEAN, CHOICE_DISMISS],
+                CHOICE_DISMISS,
+                30
+            );
+            if (ret == CHOICE_FETCH) {
+                await this.core.rebuilder.$performRebuildDB("localOnly");
+            }
+            if (ret == CHOICE_CLEAN) {
+                const replicator = this.core.$$getReplicator();
+                if (!(replicator instanceof LiveSyncCouchDBReplicator)) return;
+                const remoteDB = await replicator.connectRemoteCouchDBWithSetting(
+                    this.settings,
+                    this.core.$$isMobile(),
+                    true
+                );
+                if (typeof remoteDB == "string") {
+                    Logger(remoteDB, LOG_LEVEL_NOTICE);
+                    return false;
+                }
+
+                await purgeUnreferencedChunks(this.localDatabase.localDatabase, false);
+                this.localDatabase.hashCaches.clear();
+                // Perform the synchronisation once.
+                if (await this.core.replicator.openReplication(this.settings, false, showMessage, true)) {
+                    await balanceChunkPurgedDBs(this.localDatabase.localDatabase, remoteDB.db);
+                    await purgeUnreferencedChunks(this.localDatabase.localDatabase, false);
+                    this.localDatabase.hashCaches.clear();
+                    await this.core.$$getReplicator().markRemoteResolved(this.settings);
+                    Logger("The local database has been cleaned up.", showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO);
+                } else {
+                    Logger(
+                        "Replication has been cancelled. Please try it again.",
+                        showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO
+                    );
+                }
+            }
+        });
+    }
+    async $$_replicate(showMessage: boolean = false): Promise<boolean | void> {
         //--?
         if (!this.core.$$isReady()) return;
         if (isLockAcquired("cleanup")) {
-            Logger("Database cleaning up is in process. replication has been cancelled", LOG_LEVEL_NOTICE);
+            Logger($msg("Replicator.Message.Cleaned"), LOG_LEVEL_NOTICE);
             return;
         }
         if (this.settings.versionUpFlash != "") {
-            Logger("Open settings and check message, please. replication has been cancelled.", LOG_LEVEL_NOTICE);
+            Logger($msg("Replicator.Message.VersionUpFlash"), LOG_LEVEL_NOTICE);
             return;
         }
         if (!(await this.core.$everyCommitPendingFileEvent())) {
-            Logger("Some file events are pending. Replication has been cancelled.", LOG_LEVEL_NOTICE);
+            Logger($msg("Replicator.Message.Pending"), LOG_LEVEL_NOTICE);
             return false;
         }
         if (!(await this.core.$everyBeforeReplicate(showMessage))) {
-            Logger(`Replication has been cancelled by some module failure`, LOG_LEVEL_NOTICE);
+            Logger($msg("Replicator.Message.SomeModuleFailed"), LOG_LEVEL_NOTICE);
             return false;
         }
 
@@ -89,109 +167,47 @@ export class ModuleReplicator extends AbstractModule implements ICoreModule {
             } else {
                 if (this.core.replicator?.remoteLockedAndDeviceNotAccepted) {
                     if (this.core.replicator.remoteCleaned && this.settings.useIndexedDBAdapter) {
-                        Logger(
-                            `The remote database has been cleaned.`,
-                            showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO
-                        );
-                        await skipIfDuplicated("cleanup", async () => {
-                            const count = await purgeUnreferencedChunks(this.localDatabase.localDatabase, true);
-                            const message = `The remote database has been cleaned up.
-To synchronize, this device must be also cleaned up. ${count} chunk(s) will be erased from this device.
-However, If there are many chunks to be deleted, maybe fetching again is faster.
-We will lose the history of this device if we fetch the remote database again.
-Even if you choose to clean up, you will see this option again if you exit Obsidian and then synchronise again.`;
-                            const CHOICE_FETCH = "Fetch again";
-                            const CHOICE_CLEAN = "Cleanup";
-                            const CHOICE_DISMISS = "Dismiss";
-                            const ret = await this.core.confirm.confirmWithMessage(
-                                "Cleaned",
-                                message,
-                                [CHOICE_FETCH, CHOICE_CLEAN, CHOICE_DISMISS],
-                                CHOICE_DISMISS,
-                                30
-                            );
-                            if (ret == CHOICE_FETCH) {
-                                await this.core.rebuilder.$performRebuildDB("localOnly");
-                            }
-                            if (ret == CHOICE_CLEAN) {
-                                const replicator = this.core.$$getReplicator();
-                                if (!(replicator instanceof LiveSyncCouchDBReplicator)) return;
-                                const remoteDB = await replicator.connectRemoteCouchDBWithSetting(
-                                    this.settings,
-                                    this.core.$$isMobile(),
-                                    true
-                                );
-                                if (typeof remoteDB == "string") {
-                                    Logger(remoteDB, LOG_LEVEL_NOTICE);
-                                    return false;
-                                }
-
-                                await purgeUnreferencedChunks(this.localDatabase.localDatabase, false);
-                                this.localDatabase.hashCaches.clear();
-                                // Perform the synchronisation once.
-                                if (
-                                    await this.core.replicator.openReplication(this.settings, false, showMessage, true)
-                                ) {
-                                    await balanceChunkPurgedDBs(this.localDatabase.localDatabase, remoteDB.db);
-                                    await purgeUnreferencedChunks(this.localDatabase.localDatabase, false);
-                                    this.localDatabase.hashCaches.clear();
-                                    await this.core.$$getReplicator().markRemoteResolved(this.settings);
-                                    Logger(
-                                        "The local database has been cleaned up.",
-                                        showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO
-                                    );
-                                } else {
-                                    Logger(
-                                        "Replication has been cancelled. Please try it again.",
-                                        showMessage ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO
-                                    );
-                                }
-                            }
-                        });
+                        await this.cleaned(showMessage);
                     } else {
-                        const message = `
-The remote database has been rebuilt.
-To synchronize, this device must fetch everything again once.
-Or if you are sure know what had been happened, we can unlock the database from the setting dialog.
-                    `;
-                        const CHOICE_FETCH = "Fetch again";
-                        const CHOICE_DISMISS = "Dismiss";
-                        const ret = await this.core.confirm.confirmWithMessage(
-                            "Locked",
+                        const message = $msg("Replicator.Dialogue.Locked.Message");
+                        const CHOICE_FETCH = $msg("Replicator.Dialogue.Locked.Action.Fetch");
+                        const CHOICE_DISMISS = $msg("Replicator.Dialogue.Locked.Action.Dismiss");
+                        const CHOICE_UNLOCK = $msg("Replicator.Dialogue.Locked.Action.Unlock");
+                        const ret = await this.core.confirm.askSelectStringDialogue(
                             message,
-                            [CHOICE_FETCH, CHOICE_DISMISS],
-                            CHOICE_DISMISS,
-                            10
+                            [CHOICE_FETCH, CHOICE_UNLOCK, CHOICE_DISMISS],
+                            {
+                                title: $msg("Replicator.Dialogue.Locked.Title"),
+                                defaultAction: CHOICE_DISMISS,
+                                timeout: 60,
+                            }
                         );
                         if (ret == CHOICE_FETCH) {
-                            const CHOICE_RESTART = "Restart";
-                            const CHOICE_WITHOUT_RESTART = "Without restart";
-                            if (
-                                (await this.core.confirm.askSelectStringDialogue(
-                                    "Self-hosted LiveSync restarts Obsidian to fetch everything safely. However, you can do it without restarting. Please choose one.",
-                                    [CHOICE_RESTART, CHOICE_WITHOUT_RESTART],
-                                    {
-                                        title: "Fetch again",
-                                        defaultAction: CHOICE_RESTART,
-                                        timeout: 30,
-                                    }
-                                )) == CHOICE_RESTART
-                            ) {
-                                await this.core.rebuilder.scheduleFetch();
-                                // await this.core.$$scheduleAppReload();
-                                return;
-                            } else {
-                                await this.core.rebuilder.$performRebuildDB("localOnly");
-                            }
+                            this._log($msg("Replicator.Dialogue.Locked.Message.Fetch"), LOG_LEVEL_NOTICE);
+                            await this.core.rebuilder.scheduleFetch();
+                            this.core.$$scheduleAppReload();
+                            return;
+                        } else if (ret == CHOICE_UNLOCK) {
+                            await this.core.replicator.markRemoteResolved(this.settings);
+                            this._log($msg("Replicator.Dialogue.Locked.Message.Unlocked"), LOG_LEVEL_NOTICE);
+                            return;
                         }
                     }
                 }
             }
         }
-
         return ret;
     }
 
+    async $$replicateByEvent(): Promise<boolean | void> {
+        const least = this.settings.syncMinimumInterval;
+        if (least > 0) {
+            return rateLimitedSharedExecution(KEY_REPLICATION_ON_EVENT, least, async () => {
+                return await this.$$replicate();
+            });
+        }
+        return await shareRunningResult(`replication`, () => this.core.$$replicate());
+    }
     $$parseReplicationResult(docs: Array<PouchDB.Core.ExistingDocument<EntryDoc>>): void {
         if (this.settings.suspendParseReplicationResult && !this.replicationResultProcessor.isSuspended) {
             this.replicationResultProcessor.suspend();
@@ -322,7 +338,7 @@ Or if you are sure know what had been happened, we can unlock the database from
 
             // If `Read chunks online` is disabled, chunks should be transferred before here.
             // However, in some cases, chunks are after that. So, if missing chunks exist, we have to wait for them.
-            const doc = await this.localDatabase.getDBEntryFromMeta({ ...dbDoc }, {}, false, true, true);
+            const doc = await this.localDatabase.getDBEntryFromMeta({ ...dbDoc }, false, true);
             if (!doc) {
                 Logger(
                     `Something went wrong while gathering content of ${path} (${dbDoc._id.substring(0, 8)}, ${dbDoc._rev?.substring(0, 10)}) `,
@@ -387,7 +403,7 @@ Or if you are sure know what had been happened, we can unlock the database from
     ): Promise<boolean> {
         if (!this.core.$$isReady()) return false;
         if (!(await this.core.$everyBeforeReplicate(showingNotice))) {
-            Logger(`Replication has been cancelled by some module failure`, LOG_LEVEL_NOTICE);
+            Logger($msg("Replicator.Message.SomeModuleFailed"), LOG_LEVEL_NOTICE);
             return false;
         }
         if (!sendChunksInBulkDisabled) {
@@ -416,8 +432,4 @@ Or if you are sure know what had been happened, we can unlock the database from
         if (checkResult == "CHECKAGAIN") return await this.core.$$replicateAllFromServer(showingNotice);
         return !checkResult;
     }
-
-    async $$waitForReplicationOnce(): Promise<boolean | void> {
-        return await shareRunningResult(`replication`, () => this.core.$$replicate());
-    }
 }

src/modules/coreFeatures/ModuleConflictResolver.ts

@@ -44,13 +44,16 @@ export class ModuleConflictResolver extends AbstractModule implements ICoreModul
             return MISSING_OR_ERROR;
         }
         eventHub.emitEvent("conflict-cancelled", path);
-        this._log(`${title} Conflicted revision deleted ${displayRev(deleteRevision)} ${path}`, LOG_LEVEL_INFO);
+        this._log(
+            `${title} Conflicted revision has been deleted ${displayRev(deleteRevision)} ${path}`,
+            LOG_LEVEL_INFO
+        );
         if ((await this.core.databaseFileAccess.getConflictedRevs(path)).length != 0) {
             this._log(`${title} some conflicts are left in ${path}`, LOG_LEVEL_INFO);
             return AUTO_MERGED;
         }
-        this._log(`${title} ${path} is a plugin metadata file, no need to write to storage`, LOG_LEVEL_INFO);
         if (isPluginMetadata(path) || isCustomisationSyncMetadata(path)) {
+            this._log(`${title} ${path} is a plugin metadata file, no need to write to storage`, LOG_LEVEL_INFO);
             return AUTO_MERGED;
         }
         // If no conflicts were found, write the resolved content to the storage.
@@ -58,7 +61,8 @@ export class ModuleConflictResolver extends AbstractModule implements ICoreModul
             this._log(`Could not write the resolved content to the storage: ${path}`, LOG_LEVEL_NOTICE);
             return MISSING_OR_ERROR;
         }
-        this._log(`${path} Has been merged automatically`, LOG_LEVEL_NOTICE);
+        const level = subTitle.indexOf("same") !== -1 ? LOG_LEVEL_INFO : LOG_LEVEL_NOTICE;
+        this._log(`${path} has been merged automatically`, level);
         return AUTO_MERGED;
     }
 
@@ -108,7 +112,9 @@ export class ModuleConflictResolver extends AbstractModule implements ICoreModul
                 `${isSame ? "same" : ""}`,
                 `${isBinary ? "binary" : ""}`,
                 `${alwaysNewer ? "alwaysNewer" : ""}`,
-            ].join(",");
+            ]
+                .filter((e) => e.trim())
+                .join(",");
             return await this.core.$$resolveConflictByDeletingRev(path, loser.rev, subTitle);
         }
         // make diff.
@@ -140,7 +146,7 @@ export class ModuleConflictResolver extends AbstractModule implements ICoreModul
                 //auto resolved, but need check again;
                 if (this.settings.syncAfterMerge && !this.core.$$isSuspended()) {
                     //Wait for the running replication, if not running replication, run it once.
-                    await this.core.$$waitForReplicationOnce();
+                    await this.core.$$replicateByEvent();
                 }
                 this._log("[conflict] Automatically merged, but we have to check it again");
                 await this.core.$$queueConflictCheck(filename);

src/modules/coreFeatures/ModuleRedFlag.ts

@@ -9,6 +9,7 @@ import {
 } from "../../lib/src/common/types.ts";
 import { AbstractModule } from "../AbstractModule.ts";
 import type { ICoreModule } from "../ModuleTypes.ts";
+import { $msg } from "../../lib/src/common/i18n.ts";
 
 export class ModuleRedFlag extends AbstractModule implements ICoreModule {
     async isFlagFileExist(path: string) {
@@ -105,16 +106,35 @@ export class ModuleRedFlag extends AbstractModule implements ICoreModule {
                         `${FLAGMD_REDFLAG3} or ${FLAGMD_REDFLAG3_HR} has been detected! Self-hosted LiveSync will discard the local database and fetch everything from the remote once again.`,
                         LOG_LEVEL_NOTICE
                     );
-                    const makeLocalChunkBeforeSync =
-                        (await this.core.confirm.askYesNoDialog(
-                            `Do you want to create local chunks before fetching? 
-> [!MORE]-
-> If creating local chunks before fetching, only the difference between the local and remote will be fetched.
+                    const method1 = $msg("RedFlag.Fetch.Method.FetchSafer");
+                    const method2 = $msg("RedFlag.Fetch.Method.FetchSmoother");
+                    const method3 = $msg("RedFlag.Fetch.Method.FetchTraditional");
+
+                    const methods = [method1, method2, method3] as const;
+                    const chunkMode = await this.core.confirm.askSelectStringDialogue(
+                        $msg("RedFlag.Fetch.Method.Desc"),
+                        methods,
+                        {
+                            defaultAction: method1,
+                            timeout: 0,
+                            title: $msg("RedFlag.Fetch.Method.Title"),
+                        }
+                    );
+                    let makeLocalChunkBeforeSync = false;
+                    let preventMakeLocalFilesBeforeSync = false;
+                    if (chunkMode === method1) {
+                        preventMakeLocalFilesBeforeSync = true;
+                    } else if (chunkMode === method2) {
+                        makeLocalChunkBeforeSync = true;
+                    } else if (chunkMode === method3) {
+                        // Do nothing.
+                    } else {
+                        this._log("Cancelled the fetch operation", LOG_LEVEL_NOTICE);
+                        return false;
+                    }
+
+                    await this.core.rebuilder.$fetchLocal(makeLocalChunkBeforeSync, preventMakeLocalFilesBeforeSync);
 
-`,
-                            { defaultOption: "Yes", title: "Trick to transfer efficiently" }
-                        )) == "yes";
-                    await this.core.rebuilder.$fetchLocal(makeLocalChunkBeforeSync);
                     await this.deleteRedFlag3();
                     if (this.settings.suspendFileWatching) {
                         if (

src/modules/coreFeatures/ModuleResolveMismatchedTweaks.ts

@@ -2,14 +2,17 @@ import { Logger, LOG_LEVEL_NOTICE } from "octagonal-wheels/common/logger";
 import { extractObject } from "octagonal-wheels/object";
 import {
     TweakValuesShouldMatchedTemplate,
-    CompatibilityBreakingTweakValues,
+    IncompatibleChanges,
     confName,
     type TweakValues,
     type RemoteDBSettings,
+    IncompatibleChangesInSpecificPattern,
+    CompatibleButLossyChanges,
 } from "../../lib/src/common/types.ts";
 import { escapeMarkdownValue } from "../../lib/src/common/utils.ts";
 import { AbstractModule } from "../AbstractModule.ts";
 import type { ICoreModule } from "../ModuleTypes.ts";
+import { $msg } from "../../lib/src/common/i18n.ts";
 
 export class ModuleResolvingMismatchedTweaks extends AbstractModule implements ICoreModule {
     async $anyAfterConnectCheckFailed(): Promise<boolean | "CHECKAGAIN" | undefined> {
@@ -28,65 +31,100 @@ export class ModuleResolvingMismatchedTweaks extends AbstractModule implements I
         const mine = extractObject(TweakValuesShouldMatchedTemplate, this.settings);
         const items = Object.entries(TweakValuesShouldMatchedTemplate);
         let rebuildRequired = false;
-
+        let rebuildRecommended = false;
         // Making tables:
-        let table = `| Value name | This device | Configured | \n` + `|: --- |: --- :|: ---- :| \n`;
-
+        // let table = `| Value name | This device | Configured | \n` + `|: --- |: --- :|: ---- :| \n`;
+        const tableRows = [];
         // const items = [mine,preferred]
         for (const v of items) {
             const key = v[0] as keyof typeof TweakValuesShouldMatchedTemplate;
             const valueMine = escapeMarkdownValue(mine[key]);
             const valuePreferred = escapeMarkdownValue(preferred[key]);
             if (valueMine == valuePreferred) continue;
-            if (CompatibilityBreakingTweakValues.indexOf(key) !== -1) {
+            if (IncompatibleChanges.indexOf(key) !== -1) {
                 rebuildRequired = true;
             }
-            table += `| ${confName(key)} | ${valueMine} | ${valuePreferred} | \n`;
+            for (const pattern of IncompatibleChangesInSpecificPattern) {
+                if (pattern.key !== key) continue;
+                // if from value supplied, check if current value have been violated : in other words, if the current value is the same as the from value, it should require a rebuild.
+                const isFromConditionMet = "from" in pattern ? pattern.from === mine[key] : false;
+                // and, if to value supplied, same as above.
+                const isToConditionMet = "to" in pattern ? pattern.to === preferred[key] : false;
+                // if either of them is true, it should require a rebuild, if the pattern is not a recommendation.
+                if (isFromConditionMet || isToConditionMet) {
+                    if (pattern.isRecommendation) {
+                        rebuildRecommended = true;
+                    } else {
+                        rebuildRequired = true;
+                    }
+                }
+            }
+            if (CompatibleButLossyChanges.indexOf(key) !== -1) {
+                rebuildRecommended = true;
+            }
+
+            // table += `| ${confName(key)} | ${valueMine} | ${valuePreferred} | \n`;
+            tableRows.push(
+                $msg("TweakMismatchResolve.Table.Row", {
+                    name: confName(key),
+                    self: valueMine,
+                    remote: valuePreferred,
+                })
+            );
         }
 
-        const additionalMessage = rebuildRequired
-            ? `
+        const additionalMessage =
+            rebuildRequired && this.core.settings.isConfigured
+                ? $msg("TweakMismatchResolve.Message.WarningIncompatibleRebuildRequired")
+                : "";
+        const additionalMessage2 =
+            rebuildRecommended && this.core.settings.isConfigured
+                ? $msg("TweakMismatchResolve.Message.WarningIncompatibleRebuildRecommended")
+                : "";
 
-**Note**: We have detected that some of the values are different to make incompatible the local database with the remote database.
-If you choose to use the configured values, the local database will be rebuilt, and if you choose to use the values of this device, the remote database will be rebuilt. 
-Both of them takes a few minutes. Please choose after considering the situation.`
-            : "";
+        const table = $msg("TweakMismatchResolve.Table", { rows: tableRows.join("\n") });
 
-        const message = `
-Your configuration has not been matched with the one on the remote server.
-(Which you had decided once before, or set by initially synchronised device).
+        const message = $msg("TweakMismatchResolve.Message.MainTweakResolving", {
+            table: table,
+            additionalMessage: [additionalMessage, additionalMessage2].filter((v) => v).join("\n"),
+        });
 
-Configured values:
+        const CHOICE_USE_REMOTE = $msg("TweakMismatchResolve.Action.UseRemote");
+        const CHOICE_USE_REMOTE_WITH_REBUILD = $msg("TweakMismatchResolve.Action.UseRemoteWithRebuild");
+        const CHOICE_USE_REMOTE_PREVENT_REBUILD = $msg("TweakMismatchResolve.Action.UseRemoteAcceptIncompatible");
+        const CHOICE_USE_MINE = $msg("TweakMismatchResolve.Action.UseMine");
+        const CHOICE_USE_MINE_WITH_REBUILD = $msg("TweakMismatchResolve.Action.UseMineWithRebuild");
+        const CHOICE_USE_MINE_PREVENT_REBUILD = $msg("TweakMismatchResolve.Action.UseMineAcceptIncompatible");
+        const CHOICE_DISMISS = $msg("TweakMismatchResolve.Action.Dismiss");
 
-${table}
+        const CHOICE_AND_VALUES = [] as [string, [result: TweakValues | boolean, rebuild: boolean]][];
 
-Please select which one you want to use.
-
-- Use configured: Update settings of this device by configured one on the remote server.
-  You should select this if you have changed the settings on ** another device **.
-- Update with mine: Update settings on the remote server by the settings of this device.
-  You should select this if you have changed the settings on ** this device **.
-- Dismiss: Ignore this message and keep the current settings.
-  You cannot synchronise until you resolve this issue without enabling \`Do not check configuration mismatch before replication\`.${additionalMessage}`;
-
-        const CHOICE_USE_REMOTE = "Use configured";
-        const CHOICE_USR_MINE = "Update with mine";
-        const CHOICE_DISMISS = "Dismiss";
-        const CHOICE_AND_VALUES = [
-            [CHOICE_USE_REMOTE, preferred],
-            [CHOICE_USR_MINE, true],
-            [CHOICE_DISMISS, false],
-        ];
-        const CHOICES = Object.fromEntries(CHOICE_AND_VALUES) as Record<string, TweakValues | boolean>;
-        const retKey = await this.core.confirm.confirmWithMessage(
-            "Tweaks Mismatched or Changed",
-            message,
-            Object.keys(CHOICES),
-            CHOICE_DISMISS,
-            60
-        );
+        if (rebuildRequired) {
+            CHOICE_AND_VALUES.push([CHOICE_USE_REMOTE_WITH_REBUILD, [preferred, true]]);
+            CHOICE_AND_VALUES.push([CHOICE_USE_MINE_WITH_REBUILD, [true, true]]);
+            CHOICE_AND_VALUES.push([CHOICE_USE_REMOTE_PREVENT_REBUILD, [preferred, false]]);
+            CHOICE_AND_VALUES.push([CHOICE_USE_MINE_PREVENT_REBUILD, [true, false]]);
+        } else if (rebuildRecommended) {
+            CHOICE_AND_VALUES.push([CHOICE_USE_REMOTE, [preferred, false]]);
+            CHOICE_AND_VALUES.push([CHOICE_USE_MINE, [true, false]]);
+            CHOICE_AND_VALUES.push([CHOICE_USE_REMOTE_WITH_REBUILD, [true, true]]);
+            CHOICE_AND_VALUES.push([CHOICE_USE_MINE_WITH_REBUILD, [true, true]]);
+        } else {
+            CHOICE_AND_VALUES.push([CHOICE_USE_REMOTE, [preferred, false]]);
+            CHOICE_AND_VALUES.push([CHOICE_USE_MINE, [true, false]]);
+        }
+        CHOICE_AND_VALUES.push([CHOICE_DISMISS, [false, false]]);
+        const CHOICES = Object.fromEntries(CHOICE_AND_VALUES) as Record<
+            string,
+            [TweakValues | boolean, performRebuild: boolean]
+        >;
+        const retKey = await this.core.confirm.askSelectStringDialogue(message, Object.keys(CHOICES), {
+            title: $msg("TweakMismatchResolve.Title.TweakResolving"),
+            timeout: 60,
+            defaultAction: CHOICE_DISMISS,
+        });
         if (!retKey) return [false, false];
-        return [CHOICES[retKey], rebuildRequired];
+        return CHOICES[retKey];
     }
 
     async $$askResolvingMismatchedTweaks(): Promise<"OK" | "CHECKAGAIN" | "IGNORE"> {
@@ -143,28 +181,56 @@ Please select which one you want to use.
             return { result: false, requireFetch: false };
         }
     }
+
     async $$askUseRemoteConfiguration(
         trialSetting: RemoteDBSettings,
         preferred: TweakValues
     ): Promise<{ result: false | TweakValues; requireFetch: boolean }> {
         const items = Object.entries(TweakValuesShouldMatchedTemplate);
         let rebuildRequired = false;
+        let rebuildRecommended = false;
         // Making tables:
-        let table = `| Value name | This device | Stored | \n` + `|: --- |: ---- :|: ---- :| \n`;
+        // let table = `| Value name | This device | On Remote | \n` + `|: --- |: ---- :|: ---- :| \n`;
         let differenceCount = 0;
+        const tableRows = [] as string[];
         // const items = [mine,preferred]
         for (const v of items) {
             const key = v[0] as keyof typeof TweakValuesShouldMatchedTemplate;
-            const valuePreferred = escapeMarkdownValue(preferred[key]);
-            const currentDisp = `${escapeMarkdownValue((trialSetting as TweakValues)?.[key])} |`;
+            const remoteValueForDisplay = escapeMarkdownValue(preferred[key]);
+            const currentValueForDisplay = `${escapeMarkdownValue((trialSetting as TweakValues)?.[key])}`;
             if ((trialSetting as TweakValues)?.[key] !== preferred[key]) {
-                if (CompatibilityBreakingTweakValues.indexOf(key) !== -1) {
+                if (IncompatibleChanges.indexOf(key) !== -1) {
                     rebuildRequired = true;
                 }
+                for (const pattern of IncompatibleChangesInSpecificPattern) {
+                    if (pattern.key !== key) continue;
+                    // if from value supplied, check if current value have been violated : in other words, if the current value is the same as the from value, it should require a rebuild.
+                    const isFromConditionMet =
+                        "from" in pattern ? pattern.from === (trialSetting as TweakValues)?.[key] : false;
+                    // and, if to value supplied, same as above.
+                    const isToConditionMet = "to" in pattern ? pattern.to === preferred[key] : false;
+                    // if either of them is true, it should require a rebuild, if the pattern is not a recommendation.
+                    if (isFromConditionMet || isToConditionMet) {
+                        if (pattern.isRecommendation) {
+                            rebuildRecommended = true;
+                        } else {
+                            rebuildRequired = true;
+                        }
+                    }
+                }
+                if (CompatibleButLossyChanges.indexOf(key) !== -1) {
+                    rebuildRecommended = true;
+                }
             } else {
                 continue;
             }
-            table += `| ${confName(key)} | ${currentDisp} ${valuePreferred} | \n`;
+            tableRows.push(
+                $msg("TweakMismatchResolve.Table.Row", {
+                    name: confName(key),
+                    self: currentValueForDisplay,
+                    remote: remoteValueForDisplay,
+                })
+            );
             differenceCount++;
         }
 
@@ -174,33 +240,28 @@ Please select which one you want to use.
         }
         const additionalMessage =
             rebuildRequired && this.core.settings.isConfigured
-                ? `
-
->[!WARNING]
-> Some remote configurations are not compatible with the local database of this device. Rebuilding the local database will be required.
-***Please ensure that you have time and are connected to a stable network to apply!***`
+                ? $msg("TweakMismatchResolve.Message.UseRemote.WarningRebuildRequired")
+                : "";
+        const additionalMessage2 =
+            rebuildRecommended && this.core.settings.isConfigured
+                ? $msg("TweakMismatchResolve.Message.UseRemote.WarningRebuildRecommended")
                 : "";
 
-        const message = `
-The settings in the remote database are as follows.
-If you want to use these settings, please select "Use configured".
-If you want to keep the settings of this device, please select "Dismiss".
+        const table = $msg("TweakMismatchResolve.Table", { rows: tableRows.join("\n") });
 
-${table}
+        const message = $msg("TweakMismatchResolve.Message.Main", {
+            table: table,
+            additionalMessage: [additionalMessage, additionalMessage2].filter((v) => v).join("\n"),
+        });
 
->[!TIP]
-> If you want to synchronise all settings, please use \`Sync settings via markdown\` after applying minimal configuration with this feature.
-
-${additionalMessage}`;
-
-        const CHOICE_USE_REMOTE = "Use configured";
-        const CHOICE_DISMISS = "Dismiss";
+        const CHOICE_USE_REMOTE = $msg("TweakMismatchResolve.Action.UseConfigured");
+        const CHOICE_DISMISS = $msg("TweakMismatchResolve.Action.Dismiss");
         // const CHOICE_AND_VALUES = [
         //     [CHOICE_USE_REMOTE, preferred],
         //     [CHOICE_DISMISS, false]]
         const CHOICES = [CHOICE_USE_REMOTE, CHOICE_DISMISS];
         const retKey = await this.core.confirm.askSelectStringDialogue(message, CHOICES, {
-            title: "Use Remote Configuration",
+            title: $msg("TweakMismatchResolve.Title.UseRemoteConfig"),
             timeout: 0,
             defaultAction: CHOICE_DISMISS,
         });

src/modules/coreObsidian/ModuleFileAccessObsidian.ts

@@ -1,4 +1,4 @@
-import { normalizePath, TFile, TFolder, type ListedFiles } from "obsidian";
+import { TFile, TFolder, type ListedFiles } from "obsidian";
 import { SerializedFileAccess } from "./storageLib/SerializedFileAccess";
 import { AbstractObsidianModule, type IObsidianModule } from "../AbstractObsidianModule.ts";
 import { LOG_LEVEL_INFO, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
@@ -60,7 +60,23 @@ export class ModuleFileAccessObsidian extends AbstractObsidianModule implements
         if (file instanceof TFile) {
             return this.vaultAccess.vaultModify(file, data, opt);
         } else if (file === null) {
-            return (await this.vaultAccess.vaultCreate(path, data, opt)) instanceof TFile;
+            if (!path.endsWith(".md")) {
+                // Very rare case, we encountered this case with `writing-goals-history.csv` file.
+                // Indeed, that file not appears in the File Explorer, but it exists in the vault.
+                // Hence, we cannot retrieve the file from the vault by getAbstractFileByPath, and we cannot write it via vaultModify.
+                // It makes `File already exists` error.
+                // Therefore, we need to write it via adapterWrite.
+                // Maybe there are others like this, so I will write it via adapterWrite.
+                // This is a workaround for the issue, but I don't know if this is the right solution.
+                // (So limits to non-md files).
+                // Has Obsidian been patched?, anyway, writing directly might be a safer approach.
+                // However, does changes of that file trigger file-change event?
+                await this.vaultAccess.adapterWrite(path, data, opt);
+                // For safety, check existence
+                return await this.vaultAccess.adapterExists(path);
+            } else {
+                return (await this.vaultAccess.vaultCreate(path, data, opt)) instanceof TFile;
+            }
         } else {
             this._log(`Could not write file (Possibly already exists as a folder): ${path}`, LOG_LEVEL_VERBOSE);
             return false;
@@ -158,8 +174,9 @@ export class ModuleFileAccessObsidian extends AbstractObsidianModule implements
         }
     }
     triggerFileEvent(event: string, path: string): void {
-        // this.app.vault.trigger("file-change", path);
-        this.vaultAccess.trigger(event, this.vaultAccess.getAbstractFileByPath(normalizePath(path)));
+        const file = this.vaultAccess.getAbstractFileByPath(path);
+        if (file === null) return;
+        this.vaultAccess.trigger(event, file);
     }
     async triggerHiddenFile(path: string): Promise<void> {
         //@ts-ignore internal function
@@ -258,9 +275,9 @@ export class ModuleFileAccessObsidian extends AbstractObsidianModule implements
         }
         return files as FilePath[];
     }
-    touched(file: UXFileInfoStub | FilePathWithPrefix): void {
+    async touched(file: UXFileInfoStub | FilePathWithPrefix): Promise<void> {
         const path = typeof file === "string" ? file : file.path;
-        this.vaultAccess.touch(path as FilePath);
+        await this.vaultAccess.touch(path as FilePath);
     }
     recentlyTouched(file: UXFileInfoStub | FilePathWithPrefix): boolean {
         const xFile = typeof file === "string" ? (this.vaultAccess.getAbstractFileByPath(file) as TFile) : file;

src/modules/coreObsidian/storageLib/SerializedFileAccess.ts

@@ -199,9 +199,15 @@ export class SerializedFileAccess {
 
     touchedFiles: string[] = [];
 
-    touch(file: TFile | FilePath) {
-        const f = file instanceof TFile ? file : (this.getAbstractFileByPath(file) as TFile);
-        const key = `${f.path}-${f.stat.mtime}-${f.stat.size}`;
+    _statInternal(file: FilePath) {
+        return this.app.vault.adapter.stat(file);
+    }
+
+    async touch(file: TFile | FilePath) {
+        const path = file instanceof TFile ? (file.path as FilePath) : file;
+        const statOrg = file instanceof TFile ? file.stat : await this._statInternal(path);
+        const stat = statOrg || { mtime: 0, size: 0 };
+        const key = `${path}-${stat.mtime}-${stat.size}`;
         this.touchedFiles.unshift(key);
         this.touchedFiles = this.touchedFiles.slice(0, 100);
     }

src/modules/essential/ModuleInitializerFile.ts

@@ -180,7 +180,7 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
         };
         initProcess.push(
             runAll("UPDATE DATABASE", filesExistOnlyInStorage, async (e) => {
-                // console.warn("UPDATE DATABASE", e);
+                // Exists in storage but not in database.
                 const file = storageFileNameMap[storageFileNameCI2CS[e]];
                 if (!this.core.$$isFileSizeExceeded(file.stat.size)) {
                     const path = file.path;
@@ -195,9 +195,16 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
         initProcess.push(
             runAll("UPDATE STORAGE", filesExistOnlyInDatabase, async (e) => {
                 const w = databaseFileNameMap[databaseFileNameCI2CS[e]];
+                // Exists in database but not in storage.
                 const path = getPath(w) ?? e;
                 if (w && !(w.deleted || w._deleted)) {
                     if (!this.core.$$isFileSizeExceeded(w.size)) {
+                        // Prevent applying the conflicted state to the storage.
+                        const conflicted = await this.core.databaseFileAccess.getConflictedRevs(path);
+                        if (conflicted.length > 0) {
+                            this._log(`UPDATE STORAGE: ${path} has conflicts. skipped`, LOG_LEVEL_INFO);
+                            return;
+                        }
                         // await this.pullFile(path, undefined, false, undefined, false);
                         // Memo: No need to force
                         await this.core.fileHandler.dbToStorage(path, null, true);
@@ -229,6 +236,12 @@ export class ModuleInitializerFile extends AbstractModule implements ICoreModule
         initProcess.push(
             runAll("SYNC DATABASE AND STORAGE", fileMap, async (e) => {
                 const { file, doc } = e;
+                // Prevent applying the conflicted state to the storage.
+                const conflicted = await this.core.databaseFileAccess.getConflictedRevs(file.path);
+                if (conflicted.length > 0) {
+                    this._log(`SYNC DATABASE AND STORAGE: ${file.path} has conflicts. skipped`, LOG_LEVEL_INFO);
+                    return;
+                }
                 if (!this.core.$$isFileSizeExceeded(file.stat.size) && !this.core.$$isFileSizeExceeded(doc.size)) {
                     await this.syncFileBetweenDBandStorage(file, doc);
                 } else {

src/modules/essential/ModuleMigration.ts

@@ -1,17 +1,144 @@
 import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger.js";
-import { SETTING_VERSION_SUPPORT_CASE_INSENSITIVE } from "../../lib/src/common/types.js";
+import { type ObsidianLiveSyncSettings } from "../../lib/src/common/types.js";
 import {
     EVENT_REQUEST_OPEN_P2P,
     EVENT_REQUEST_OPEN_SETTING_WIZARD,
     EVENT_REQUEST_OPEN_SETTINGS,
     EVENT_REQUEST_OPEN_SETUP_URI,
+    EVENT_REQUEST_RUN_DOCTOR,
     eventHub,
 } from "../../common/events.ts";
 import { AbstractModule } from "../AbstractModule.ts";
 import type { ICoreModule } from "../ModuleTypes.ts";
 import { $msg } from "src/lib/src/common/i18n.ts";
+import { checkUnsuitableValues, RuleLevel, type RuleForType } from "../../lib/src/common/configForDoc.ts";
+import { getConfName, type AllSettingItemKey } from "../features/SettingDialogue/settingConstants.ts";
 
 export class ModuleMigration extends AbstractModule implements ICoreModule {
+    async migrateUsingDoctor(skipRebuild: boolean = false, activateReason = "updated", forceRescan = false) {
+        const r = checkUnsuitableValues(this.core.settings);
+        if (!forceRescan && r.version == this.settings.doctorProcessedVersion) {
+            const isIssueFound = Object.keys(r.rules).length > 0;
+            const msg = isIssueFound ? "Issues found" : "No issues found";
+            this._log(`${msg} but marked as to be silent`, LOG_LEVEL_VERBOSE);
+            return;
+        }
+        const issues = Object.entries(r.rules);
+        if (issues.length == 0) {
+            this._log(
+                $msg("Doctor.Message.NoIssues"),
+                activateReason !== "updated" ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO
+            );
+            return;
+        } else {
+            const OPT_YES = `${$msg("Doctor.Button.Yes")}` as const;
+            const OPT_NO = `${$msg("Doctor.Button.No")}` as const;
+            const OPT_DISMISS = `${$msg("Doctor.Button.DismissThisVersion")}` as const;
+            // this._log(`Issues found in ${key}`, LOG_LEVEL_VERBOSE);
+            const issues = Object.keys(r.rules)
+                .map((key) => `- ${getConfName(key as AllSettingItemKey)}`)
+                .join("\n");
+            const msg = await this.core.confirm.askSelectStringDialogue(
+                $msg("Doctor.Dialogue.Main", { activateReason, issues }),
+                [OPT_YES, OPT_NO, OPT_DISMISS],
+                {
+                    title: $msg("Doctor.Dialogue.Title"),
+                    defaultAction: OPT_YES,
+                }
+            );
+            if (msg == OPT_DISMISS) {
+                this.settings.doctorProcessedVersion = r.version;
+                await this.core.saveSettings();
+                this._log("Marked as to be silent", LOG_LEVEL_VERBOSE);
+                return;
+            }
+            if (msg != OPT_YES) return;
+            let shouldRebuild = false;
+            let shouldRebuildLocal = false;
+            const issueItems = Object.entries(r.rules) as [keyof ObsidianLiveSyncSettings, RuleForType<any>][];
+            this._log(`${issueItems.length} Issue(s) found `, LOG_LEVEL_VERBOSE);
+            let idx = 0;
+            const applySettings = {} as Partial<ObsidianLiveSyncSettings>;
+            const OPT_FIX = `${$msg("Doctor.Button.Fix")}` as const;
+            const OPT_SKIP = `${$msg("Doctor.Button.Skip")}` as const;
+            const OPT_FIXBUTNOREBUILD = `${$msg("Doctor.Button.FixButNoRebuild")}` as const;
+            let skipped = 0;
+            for (const [key, value] of issueItems) {
+                const levelMap = {
+                    [RuleLevel.Necessary]: $msg("Doctor.Level.Necessary"),
+                    [RuleLevel.Recommended]: $msg("Doctor.Level.Recommended"),
+                    [RuleLevel.Optional]: $msg("Doctor.Level.Optional"),
+                    [RuleLevel.Must]: $msg("Doctor.Level.Must"),
+                };
+                const level = value.level ? levelMap[value.level] : "Unknown";
+                const options = [OPT_FIX] as [typeof OPT_FIX | typeof OPT_SKIP | typeof OPT_FIXBUTNOREBUILD];
+                if ((!skipRebuild && value.requireRebuild) || value.requireRebuildLocal) {
+                    options.push(OPT_FIXBUTNOREBUILD);
+                }
+                options.push(OPT_SKIP);
+                const note = skipRebuild
+                    ? ""
+                    : `${value.requireRebuild ? $msg("Doctor.Message.RebuildRequired") : ""}${value.requireRebuildLocal ? $msg("Doctor.Message.RebuildLocalRequired") : ""}`;
+
+                const ret = await this.core.confirm.askSelectStringDialogue(
+                    $msg("Doctor.Dialogue.MainFix", {
+                        name: getConfName(key as AllSettingItemKey),
+                        current: `${this.settings[key]}`,
+                        reason: value.reason ?? " N/A ",
+                        ideal: `${value.value}`,
+                        level: `${level}`,
+                        note: note,
+                    }),
+                    options,
+                    {
+                        title: $msg("Doctor.Dialogue.TitleFix", { current: `${++idx}`, total: `${issueItems.length}` }),
+                        defaultAction: OPT_FIX,
+                    }
+                );
+
+                if (ret == OPT_FIX || ret == OPT_FIXBUTNOREBUILD) {
+                    //@ts-ignore
+                    applySettings[key] = value.value;
+                    if (ret == OPT_FIX) {
+                        shouldRebuild = shouldRebuild || value.requireRebuild || false;
+                        shouldRebuildLocal = shouldRebuildLocal || value.requireRebuildLocal || false;
+                    }
+                } else {
+                    skipped++;
+                }
+            }
+            if (Object.keys(applySettings).length > 0) {
+                this.settings = {
+                    ...this.settings,
+                    ...applySettings,
+                };
+            }
+            if (skipped == 0) {
+                this.settings.doctorProcessedVersion = r.version;
+            } else {
+                if (
+                    (await this.core.confirm.askYesNoDialog($msg("Doctor.Message.SomeSkipped"), {
+                        title: $msg("Doctor.Dialogue.TitleAlmostDone"),
+                        defaultOption: "No",
+                    })) == "no"
+                ) {
+                    // Some skipped, and user wants
+                    this.settings.doctorProcessedVersion = r.version;
+                }
+            }
+            await this.core.saveSettings();
+            if (!skipRebuild) {
+                if (shouldRebuild) {
+                    await this.core.rebuilder.scheduleRebuild();
+                    await this.core.$$performRestart();
+                } else if (shouldRebuildLocal) {
+                    await this.core.rebuilder.scheduleFetch();
+                    await this.core.$$performRestart();
+                }
+            }
+        }
+    }
+
     async migrateDisableBulkSend() {
         if (this.settings.sendChunksBulk) {
             this._log($msg("moduleMigration.logBulkSendCorrupted"), LOG_LEVEL_NOTICE);
@@ -20,157 +147,157 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
             await this.saveSettings();
         }
     }
-    async migrationCheck() {
-        const old = this.settings.settingVersion;
-        const current = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
-        // Check each migrations(old -> current)
-        if (!(await this.migrateToCaseInsensitive(old, current))) {
-            this._log(
-                $msg("moduleMigration.logMigrationFailed", {
-                    old: old.toString(),
-                    current: current.toString(),
-                }),
-                LOG_LEVEL_NOTICE
-            );
-            return;
-        }
-    }
-    async migrateToCaseInsensitive(old: number, current: number) {
-        if (
-            this.settings.handleFilenameCaseSensitive !== undefined &&
-            this.settings.doNotUseFixedRevisionForChunks !== undefined
-        ) {
-            if (current < SETTING_VERSION_SUPPORT_CASE_INSENSITIVE) {
-                this.settings.settingVersion = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
-                await this.saveSettings();
-            }
-            return true;
-        }
-        if (
-            old >= SETTING_VERSION_SUPPORT_CASE_INSENSITIVE &&
-            this.settings.handleFilenameCaseSensitive !== undefined &&
-            this.settings.doNotUseFixedRevisionForChunks !== undefined
-        ) {
-            return true;
-        }
+    // async migrationCheck() {
+    //     const old = this.settings.settingVersion;
+    //     const current = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
+    //     // Check each migrations(old -> current)
+    //     if (!(await this.migrateToCaseInsensitive(old, current))) {
+    //         this._log(
+    //             $msg("moduleMigration.logMigrationFailed", {
+    //                 old: old.toString(),
+    //                 current: current.toString(),
+    //             }),
+    //             LOG_LEVEL_NOTICE
+    //         );
+    //         return;
+    //     }
+    // }
+    // async migrateToCaseInsensitive(old: number, current: number) {
+    //     if (
+    //         this.settings.handleFilenameCaseSensitive !== undefined &&
+    //         this.settings.doNotUseFixedRevisionForChunks !== undefined
+    //     ) {
+    //         if (current < SETTING_VERSION_SUPPORT_CASE_INSENSITIVE) {
+    //             this.settings.settingVersion = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
+    //             await this.saveSettings();
+    //         }
+    //         return true;
+    //     }
+    //     if (
+    //         old >= SETTING_VERSION_SUPPORT_CASE_INSENSITIVE &&
+    //         this.settings.handleFilenameCaseSensitive !== undefined &&
+    //         this.settings.doNotUseFixedRevisionForChunks !== undefined
+    //     ) {
+    //         return true;
+    //     }
 
-        let remoteHandleFilenameCaseSensitive: undefined | boolean = undefined;
-        let remoteDoNotUseFixedRevisionForChunks: undefined | boolean = undefined;
-        let remoteChecked = false;
-        try {
-            const remoteInfo = await this.core.replicator.getRemotePreferredTweakValues(this.settings);
-            if (remoteInfo) {
-                remoteHandleFilenameCaseSensitive =
-                    "handleFilenameCaseSensitive" in remoteInfo ? remoteInfo.handleFilenameCaseSensitive : false;
-                remoteDoNotUseFixedRevisionForChunks =
-                    "doNotUseFixedRevisionForChunks" in remoteInfo ? remoteInfo.doNotUseFixedRevisionForChunks : false;
-                if (
-                    remoteHandleFilenameCaseSensitive !== undefined ||
-                    remoteDoNotUseFixedRevisionForChunks !== undefined
-                ) {
-                    remoteChecked = true;
-                }
-            } else {
-                this._log($msg("moduleMigration.logFetchRemoteTweakFailed"), LOG_LEVEL_INFO);
-            }
-        } catch (ex) {
-            this._log($msg("moduleMigration.logRemoteTweakUnavailable"), LOG_LEVEL_INFO);
-            this._log(ex, LOG_LEVEL_VERBOSE);
-        }
+    //     let remoteHandleFilenameCaseSensitive: undefined | boolean = undefined;
+    //     let remoteDoNotUseFixedRevisionForChunks: undefined | boolean = undefined;
+    //     let remoteChecked = false;
+    //     try {
+    //         const remoteInfo = await this.core.replicator.getRemotePreferredTweakValues(this.settings);
+    //         if (remoteInfo) {
+    //             remoteHandleFilenameCaseSensitive =
+    //                 "handleFilenameCaseSensitive" in remoteInfo ? remoteInfo.handleFilenameCaseSensitive : false;
+    //             remoteDoNotUseFixedRevisionForChunks =
+    //                 "doNotUseFixedRevisionForChunks" in remoteInfo ? remoteInfo.doNotUseFixedRevisionForChunks : false;
+    //             if (
+    //                 remoteHandleFilenameCaseSensitive !== undefined ||
+    //                 remoteDoNotUseFixedRevisionForChunks !== undefined
+    //             ) {
+    //                 remoteChecked = true;
+    //             }
+    //         } else {
+    //             this._log($msg("moduleMigration.logFetchRemoteTweakFailed"), LOG_LEVEL_INFO);
+    //         }
+    //     } catch (ex) {
+    //         this._log($msg("moduleMigration.logRemoteTweakUnavailable"), LOG_LEVEL_INFO);
+    //         this._log(ex, LOG_LEVEL_VERBOSE);
+    //     }
 
-        if (remoteChecked) {
-            // The case that the remote could be checked.
-            if (remoteHandleFilenameCaseSensitive && remoteDoNotUseFixedRevisionForChunks) {
-                // Migrated, but configured as same as old behaviour.
-                this.settings.handleFilenameCaseSensitive = true;
-                this.settings.doNotUseFixedRevisionForChunks = true;
-                this.settings.settingVersion = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
-                this._log(
-                    $msg("moduleMigration.logMigratedSameBehaviour", {
-                        current: current.toString(),
-                    }),
-                    LOG_LEVEL_INFO
-                );
-                await this.saveSettings();
-                return true;
-            }
-            const message = $msg("moduleMigration.msgFetchRemoteAgain");
-            const OPTION_FETCH = $msg("moduleMigration.optionYesFetchAgain");
-            const DISMISS = $msg("moduleMigration.optionNoAskAgain");
-            const options = [OPTION_FETCH, DISMISS];
-            const ret = await this.core.confirm.confirmWithMessage(
-                $msg("moduleMigration.titleCaseSensitivity"),
-                message,
-                options,
-                DISMISS,
-                40
-            );
-            if (ret == OPTION_FETCH) {
-                this.settings.handleFilenameCaseSensitive = remoteHandleFilenameCaseSensitive || false;
-                this.settings.doNotUseFixedRevisionForChunks = remoteDoNotUseFixedRevisionForChunks || false;
-                this.settings.settingVersion = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
-                await this.saveSettings();
-                try {
-                    await this.core.rebuilder.scheduleFetch();
-                    return;
-                } catch (ex) {
-                    this._log($msg("moduleMigration.logRedflag2CreationFail"), LOG_LEVEL_VERBOSE);
-                    this._log(ex, LOG_LEVEL_VERBOSE);
-                }
-                return false;
-            } else {
-                return false;
-            }
-        }
+    //     if (remoteChecked) {
+    //         // The case that the remote could be checked.
+    //         if (remoteHandleFilenameCaseSensitive && remoteDoNotUseFixedRevisionForChunks) {
+    //             // Migrated, but configured as same as old behaviour.
+    //             this.settings.handleFilenameCaseSensitive = true;
+    //             this.settings.doNotUseFixedRevisionForChunks = true;
+    //             this.settings.settingVersion = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
+    //             this._log(
+    //                 $msg("moduleMigration.logMigratedSameBehaviour", {
+    //                     current: current.toString(),
+    //                 }),
+    //                 LOG_LEVEL_INFO
+    //             );
+    //             await this.saveSettings();
+    //             return true;
+    //         }
+    //         const message = $msg("moduleMigration.msgFetchRemoteAgain");
+    //         const OPTION_FETCH = $msg("moduleMigration.optionYesFetchAgain");
+    //         const DISMISS = $msg("moduleMigration.optionNoAskAgain");
+    //         const options = [OPTION_FETCH, DISMISS];
+    //         const ret = await this.core.confirm.confirmWithMessage(
+    //             $msg("moduleMigration.titleCaseSensitivity"),
+    //             message,
+    //             options,
+    //             DISMISS,
+    //             40
+    //         );
+    //         if (ret == OPTION_FETCH) {
+    //             this.settings.handleFilenameCaseSensitive = remoteHandleFilenameCaseSensitive || false;
+    //             this.settings.doNotUseFixedRevisionForChunks = remoteDoNotUseFixedRevisionForChunks || false;
+    //             this.settings.settingVersion = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
+    //             await this.saveSettings();
+    //             try {
+    //                 await this.core.rebuilder.scheduleFetch();
+    //                 return;
+    //             } catch (ex) {
+    //                 this._log($msg("moduleMigration.logRedflag2CreationFail"), LOG_LEVEL_VERBOSE);
+    //                 this._log(ex, LOG_LEVEL_VERBOSE);
+    //             }
+    //             return false;
+    //         } else {
+    //             return false;
+    //         }
+    //     }
 
-        const ENABLE_BOTH = $msg("moduleMigration.optionEnableBoth");
-        const ENABLE_FILENAME_CASE_INSENSITIVE = $msg("moduleMigration.optionEnableFilenameCaseInsensitive");
-        const ENABLE_FIXED_REVISION_FOR_CHUNKS = $msg("moduleMigration.optionEnableFixedRevisionForChunks");
-        const ADJUST_TO_REMOTE = $msg("moduleMigration.optionAdjustRemote");
-        const KEEP = $msg("moduleMigration.optionKeepPreviousBehaviour");
-        const DISMISS = $msg("moduleMigration.optionDecideLater");
-        const message = $msg("moduleMigration.msgSinceV02321");
-        const options = [ENABLE_BOTH, ENABLE_FILENAME_CASE_INSENSITIVE, ENABLE_FIXED_REVISION_FOR_CHUNKS];
-        if (remoteChecked) {
-            options.push(ADJUST_TO_REMOTE);
-        }
-        options.push(KEEP, DISMISS);
-        const ret = await this.core.confirm.confirmWithMessage(
-            $msg("moduleMigration.titleCaseSensitivity"),
-            message,
-            options,
-            DISMISS,
-            40
-        );
-        console.dir(ret);
-        switch (ret) {
-            case ENABLE_BOTH:
-                this.settings.handleFilenameCaseSensitive = false;
-                this.settings.doNotUseFixedRevisionForChunks = false;
-                break;
-            case ENABLE_FILENAME_CASE_INSENSITIVE:
-                this.settings.handleFilenameCaseSensitive = false;
-                this.settings.doNotUseFixedRevisionForChunks = true;
-                break;
-            case ENABLE_FIXED_REVISION_FOR_CHUNKS:
-                this.settings.doNotUseFixedRevisionForChunks = false;
-                this.settings.handleFilenameCaseSensitive = true;
-                break;
-            case KEEP:
-                this.settings.handleFilenameCaseSensitive = true;
-                this.settings.doNotUseFixedRevisionForChunks = true;
-                this.settings.settingVersion = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
-                await this.saveSettings();
-                return true;
-            case DISMISS:
-            default:
-                return false;
-        }
-        this.settings.settingVersion = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
-        await this.saveSettings();
-        await this.core.rebuilder.scheduleRebuild();
-        await this.core.$$performRestart();
-    }
+    //     const ENABLE_BOTH = $msg("moduleMigration.optionEnableBoth");
+    //     const ENABLE_FILENAME_CASE_INSENSITIVE = $msg("moduleMigration.optionEnableFilenameCaseInsensitive");
+    //     const ENABLE_FIXED_REVISION_FOR_CHUNKS = $msg("moduleMigration.optionEnableFixedRevisionForChunks");
+    //     const ADJUST_TO_REMOTE = $msg("moduleMigration.optionAdjustRemote");
+    //     const KEEP = $msg("moduleMigration.optionKeepPreviousBehaviour");
+    //     const DISMISS = $msg("moduleMigration.optionDecideLater");
+    //     const message = $msg("moduleMigration.msgSinceV02321");
+    //     const options = [ENABLE_BOTH, ENABLE_FILENAME_CASE_INSENSITIVE, ENABLE_FIXED_REVISION_FOR_CHUNKS];
+    //     if (remoteChecked) {
+    //         options.push(ADJUST_TO_REMOTE);
+    //     }
+    //     options.push(KEEP, DISMISS);
+    //     const ret = await this.core.confirm.confirmWithMessage(
+    //         $msg("moduleMigration.titleCaseSensitivity"),
+    //         message,
+    //         options,
+    //         DISMISS,
+    //         40
+    //     );
+    //     console.dir(ret);
+    //     switch (ret) {
+    //         case ENABLE_BOTH:
+    //             this.settings.handleFilenameCaseSensitive = false;
+    //             this.settings.doNotUseFixedRevisionForChunks = false;
+    //             break;
+    //         case ENABLE_FILENAME_CASE_INSENSITIVE:
+    //             this.settings.handleFilenameCaseSensitive = false;
+    //             this.settings.doNotUseFixedRevisionForChunks = true;
+    //             break;
+    //         case ENABLE_FIXED_REVISION_FOR_CHUNKS:
+    //             this.settings.doNotUseFixedRevisionForChunks = false;
+    //             this.settings.handleFilenameCaseSensitive = true;
+    //             break;
+    //         case KEEP:
+    //             this.settings.handleFilenameCaseSensitive = true;
+    //             this.settings.doNotUseFixedRevisionForChunks = true;
+    //             this.settings.settingVersion = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
+    //             await this.saveSettings();
+    //             return true;
+    //         case DISMISS:
+    //         default:
+    //             return false;
+    //     }
+    //     this.settings.settingVersion = SETTING_VERSION_SUPPORT_CASE_INSENSITIVE;
+    //     await this.saveSettings();
+    //     await this.core.rebuilder.scheduleRebuild();
+    //     await this.core.$$performRestart();
+    // }
 
     async initialMessage() {
         const message = $msg("moduleMigration.msgInitialSetup", {
@@ -226,7 +353,8 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
             return false;
         }
         if (this.settings.isConfigured) {
-            await this.migrationCheck();
+            await this.migrateUsingDoctor(false);
+            // await this.migrationCheck();
             await this.migrateDisableBulkSend();
         }
         if (!this.settings.isConfigured) {
@@ -235,7 +363,14 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
                 this._log($msg("moduleMigration.logSetupCancelled"), LOG_LEVEL_NOTICE);
                 return false;
             }
+            await this.migrateUsingDoctor(true);
         }
         return true;
     }
+    $everyOnLayoutReady(): Promise<boolean> {
+        eventHub.onEvent(EVENT_REQUEST_RUN_DOCTOR, async (reason) => {
+            await this.migrateUsingDoctor(false, reason, true);
+        });
+        return Promise.resolve(true);
+    }
 }

src/modules/essentialObsidian/ModuleObsidianAPI.ts

@@ -1,5 +1,5 @@
 import { AbstractObsidianModule, type IObsidianModule } from "../AbstractObsidianModule.ts";
-import { LOG_LEVEL_DEBUG, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
+import { LOG_LEVEL_DEBUG, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
 import { Notice, requestUrl, type RequestUrlParam, type RequestUrlResponse } from "../../deps.ts";
 import { type EntryDoc, type FilePathWithPrefix } from "../../lib/src/common/types.ts";
 import { getPathFromTFile } from "../../common/utils.ts";
@@ -47,6 +47,58 @@ export class ModuleObsidianAPI extends AbstractObsidianModule implements IObsidi
         return !this.last_successful_post;
     }
 
+    async fetchByAPI(
+        url: string,
+        localURL: string,
+        method: string,
+        authHeader: string,
+        opts?: RequestInit
+    ): Promise<Response> {
+        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,
+            method: opts?.method,
+            body: body,
+            headers: transformedHeaders,
+            contentType: "application/json",
+            // contentType: opts.headers,
+        };
+        const size = body ? ` (${body.length})` : "";
+        try {
+            this.plugin.requestCount.value = this.plugin.requestCount.value + 1;
+            const r = await fetchByAPI(requestParam);
+            if (method == "POST" || method == "PUT") {
+                this.last_successful_post = r.status - (r.status % 100) == 200;
+            } else {
+                this.last_successful_post = true;
+            }
+            this._log(`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) {
+            this._log(`HTTP:${method}${size} to:${localURL} -> failed`, LOG_LEVEL_VERBOSE);
+            // limit only in bulk_docs.
+            if (url.toString().indexOf("_bulk_docs") !== -1) {
+                this.last_successful_post = false;
+            }
+            this._log(ex);
+            throw ex;
+        } finally {
+            this.plugin.responseCount.value = this.plugin.responseCount.value + 1;
+        }
+    }
+
     async $$connectRemoteCouchDB(
         uri: string,
         auth: { username: string; password: string },
@@ -87,88 +139,74 @@ export class ModuleObsidianAPI extends AbstractObsidianModule implements IObsidi
                     }
                     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,
-                        method: opts?.method,
-                        body: body,
-                        headers: transformedHeaders,
-                        contentType: "application/json",
-                        // contentType: opts.headers,
-                    };
+                try {
+                    if (!disableRequestURI && typeof url == "string" && typeof (opts?.body ?? "") == "string") {
+                        return await this.fetchByAPI(url, localURL, method, authHeader, opts);
+                    }
+                    // --> native Fetch API.
 
                     try {
+                        if (this.settings.enableDebugTools) {
+                            // Issue #407
+                            (opts!.headers as Headers).append("ngrok-skip-browser-warning", "123");
+                        }
                         this.plugin.requestCount.value = this.plugin.requestCount.value + 1;
-                        const r = await fetchByAPI(requestParam);
+                        const response: Response = await fetch(url, opts);
                         if (method == "POST" || method == "PUT") {
-                            this.last_successful_post = r.status - (r.status % 100) == 200;
+                            this.last_successful_post = response.ok;
                         } else {
                             this.last_successful_post = true;
                         }
-                        this._log(`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) {
-                        this._log(`HTTP:${method}${size} to:${localURL} -> failed`, LOG_LEVEL_VERBOSE);
-                        // limit only in bulk_docs.
-                        if (url.toString().indexOf("_bulk_docs") !== -1) {
-                            this.last_successful_post = false;
-                        }
-                        this._log(ex);
-                        throw ex;
-                    } finally {
-                        this.plugin.responseCount.value = this.plugin.responseCount.value + 1;
-                    }
-                }
-
-                try {
-                    if (this.settings.enableDebugTools) {
-                        // Issue #407
-                        (opts!.headers as Headers).append("ngrok-skip-browser-warning", "123");
-                    }
-                    this.plugin.requestCount.value = this.plugin.requestCount.value + 1;
-                    const response: Response = await fetch(url, opts);
-                    if (method == "POST" || method == "PUT") {
-                        this.last_successful_post = response.ok;
-                    } else {
-                        this.last_successful_post = true;
-                    }
-                    this._log(`HTTP:${method}${size} to:${localURL} -> ${response.status}`, LOG_LEVEL_DEBUG);
-                    if (Math.floor(response.status / 100) !== 2) {
-                        if (method != "GET" && localURL.indexOf("/_local/") === -1 && !localURL.endsWith("/")) {
-                            const r = response.clone();
-                            this._log(
-                                `The request may have failed. The reason sent by the server: ${r.status}: ${r.statusText}`
-                            );
-
-                            try {
-                                this._log(await (await r.blob()).text(), LOG_LEVEL_VERBOSE);
-                            } catch (_) {
-                                this._log("Cloud not parse response", LOG_LEVEL_VERBOSE);
-                                this._log(_, LOG_LEVEL_VERBOSE);
+                        this._log(`HTTP:${method}${size} to:${localURL} -> ${response.status}`, LOG_LEVEL_DEBUG);
+                        if (Math.floor(response.status / 100) !== 2) {
+                            if (response.status == 404) {
+                                if (method === "GET" && localURL.indexOf("/_local/") === -1) {
+                                    this._log(
+                                        `Just checkpoint or some server information has been missing. The 404 error shown above is not an error.`,
+                                        LOG_LEVEL_VERBOSE
+                                    );
+                                }
+                            } else {
+                                const r = response.clone();
+                                this._log(
+                                    `The request may have failed. The reason sent by the server: ${r.status}: ${r.statusText}`,
+                                    LOG_LEVEL_NOTICE
+                                );
+                                try {
+                                    const result = await r.text();
+                                    this._log(result, LOG_LEVEL_VERBOSE);
+                                } catch (_) {
+                                    this._log("Cloud not fetch response body", LOG_LEVEL_VERBOSE);
+                                    this._log(_, LOG_LEVEL_VERBOSE);
+                                }
                             }
-                        } else {
-                            this._log(
-                                `Just checkpoint or some server information has been missing. The 404 error shown above is not an error.`,
-                                LOG_LEVEL_VERBOSE
-                            );
                         }
+                        return response;
+                    } catch (ex) {
+                        if (ex instanceof TypeError) {
+                            this._log(
+                                "Failed to fetch by native fetch API. Trying to fetch by API to get more information."
+                            );
+                            const resp2 = await this.fetchByAPI(url.toString(), localURL, method, authHeader, opts);
+                            if (resp2.status / 100 == 2) {
+                                this._log(
+                                    "The request was successful by API. But the native fetch API failed! Please check CORS settings on the remote database!. While this condition, you cannot enable LiveSync",
+                                    LOG_LEVEL_NOTICE
+                                );
+                                return resp2;
+                            }
+                            const r2 = resp2.clone();
+                            const msg = await r2.text();
+                            this._log(`Failed to fetch by API. ${resp2.status}: ${msg}`, LOG_LEVEL_NOTICE);
+                            return resp2;
+                        }
+                        throw ex;
                     }
-                    return response;
-                } catch (ex) {
+                } catch (ex: any) {
                     this._log(`HTTP:${method}${size} to:${localURL} -> failed`, LOG_LEVEL_VERBOSE);
+                    const msg = ex instanceof Error ? `${ex?.name}:${ex?.message}` : ex?.toString();
+                    this._log(`Failed to fetch: ${msg}`, LOG_LEVEL_NOTICE);
+                    this._log(ex, LOG_LEVEL_VERBOSE);
                     // limit only in bulk_docs.
                     if (url.toString().indexOf("_bulk_docs") !== -1) {
                         this.last_successful_post = false;
@@ -178,6 +216,7 @@ export class ModuleObsidianAPI extends AbstractObsidianModule implements IObsidi
                 } finally {
                     this.plugin.responseCount.value = this.plugin.responseCount.value + 1;
                 }
+
                 // return await fetch(url, opts);
             },
         };
@@ -195,11 +234,7 @@ export class ModuleObsidianAPI extends AbstractObsidianModule implements IObsidi
             const info = await db.info();
             return { db: db, info: info };
         } catch (ex: any) {
-            let msg = `${ex?.name}:${ex?.message}`;
-            if (ex?.name == "TypeError" && ex?.message == "Failed to fetch") {
-                msg +=
-                    "\n**Note** This error caused by many reasons. The only sure thing is you didn't touch the server.\nTo check details, open inspector.";
-            }
+            const msg = `${ex?.name}:${ex?.message}`;
             this._log(ex, LOG_LEVEL_VERBOSE);
             return msg;
         }

src/modules/essentialObsidian/ModuleObsidianEvents.ts

@@ -56,7 +56,7 @@ export class ModuleObsidianEvents extends AbstractObsidianModule implements IObs
                     } else {
                         if (this.settings.syncOnEditorSave) {
                             this._log("Sync on Editor Save.", LOG_LEVEL_VERBOSE);
-                            fireAndForget(() => this.core.$$replicate());
+                            fireAndForget(() => this.core.$$replicateByEvent());
                         }
                     }
                 });
@@ -155,7 +155,7 @@ export class ModuleObsidianEvents extends AbstractObsidianModule implements IObs
             return;
         }
         if (this.settings.syncOnFileOpen && !this.core.$$isSuspended()) {
-            await this.core.$$replicate();
+            await this.core.$$replicateByEvent();
         }
         await this.core.$$queueConflictCheckIfOpen(file.path as FilePathWithPrefix);
     }

src/modules/essentialObsidian/ModuleObsidianMenu.ts

@@ -106,7 +106,6 @@ export class ModuleObsidianMenu extends AbstractObsidianModule implements IObsid
     }
     $everyOnload(): Promise<boolean> {
         this.app.workspace.onLayoutReady(this.core.$$onLiveSyncReady.bind(this.core));
-        // eslint-disable-next-line no-unused-labels
         return Promise.resolve(true);
     }
 

src/modules/extras/ModuleDev.ts

@@ -36,7 +36,6 @@ export class ModuleDev extends AbstractObsidianModule implements IObsidianModule
 
     $everyOnloadAfterLoadSettings(): Promise<boolean> {
         if (!this.settings.enableDebugTools) return Promise.resolve(true);
-        // eslint-disable-next-line no-unused-labels
         this.onMissingTranslation = this.onMissingTranslation.bind(this);
         __onMissingTranslation((key) => {
             void this.onMissingTranslation(key);

src/modules/extras/devUtil/TestPaneView.ts

@@ -30,7 +30,6 @@ export class TestPaneView extends ItemView {
         return "Self-hosted LiveSync Test and Results";
     }
 
-    // eslint-disable-next-line require-await
     async onOpen() {
         this.component = new TestPaneComponent({
             target: this.contentEl,
@@ -42,7 +41,6 @@ export class TestPaneView extends ItemView {
         await Promise.resolve();
     }
 
-    // eslint-disable-next-line require-await
     async onClose() {
         this.component?.$destroy();
         await Promise.resolve();

src/modules/features/ModuleInteractiveConflictResolver.ts

@@ -90,7 +90,7 @@ export class ModuleInteractiveConflictResolver extends AbstractObsidianModule im
         // So we have to run replication if configured.
         // TODO: Make this is as a event request
         if (this.settings.syncAfterMerge && !this.core.$$isSuspended()) {
-            await this.core.$$waitForReplicationOnce();
+            await this.core.$$replicateByEvent();
         }
         // And, check it again.
         await this.core.$$queueConflictCheck(filename);

src/modules/features/ModuleLog.ts

@@ -27,14 +27,7 @@ import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
 import { LogPaneView, VIEW_TYPE_LOG } from "./Log/LogPaneView.ts";
 import { serialized } from "octagonal-wheels/concurrency/lock";
 import { $msg } from "src/lib/src/common/i18n.ts";
-import type { P2PReplicationProgress } from "../../lib/src/replication/trystero/TrysteroReplicator.ts";
-import {
-    EVENT_ADVERTISEMENT_RECEIVED,
-    EVENT_DEVICE_LEAVED,
-    EVENT_P2P_CONNECTED,
-    EVENT_P2P_DISCONNECTED,
-    EVENT_P2P_REPLICATOR_PROGRESS,
-} from "src/lib/src/replication/trystero/TrysteroReplicatorP2PServer.ts";
+import { P2PLogCollector } from "../../lib/src/replication/trystero/P2PReplicatorCore.ts";
 
 // This module cannot be a core module because it depends on the Obsidian UI.
 
@@ -71,6 +64,7 @@ export class ModuleLog extends AbstractObsidianModule implements IObsidianModule
     statusBarLabels!: ReactiveValue<{ message: string; status: string }>;
     statusLog = reactiveSource("");
     notifies: { [key: string]: { notice: Notice; count: number } } = {};
+    p2pLogCollector = new P2PLogCollector();
 
     observeForLogs() {
         const padSpaces = `\u{2007}`.repeat(10);
@@ -176,7 +170,7 @@ export class ModuleLog extends AbstractObsidianModule implements IObsidianModule
             const queued = queueCountLabel();
             const waiting = waitingLabel();
             const networkActivity = requestingStatLabel();
-            const p2p = this.p2pReplicationLine.value;
+            const p2p = this.p2pLogCollector.p2pReplicationLine.value;
             return {
                 message: `${networkActivity}Sync: ${w} ↑ ${sent}${pushLast} ↓ ${arrived}${pullLast}${waiting}${queued}${p2p == "" ? "" : "\n" + p2p}`,
             };
@@ -203,90 +197,10 @@ export class ModuleLog extends AbstractObsidianModule implements IObsidianModule
         statusBarLabels.onChanged((label) => applyToDisplay(label.value));
     }
 
-    p2pReplicationResult = new Map<string, P2PReplicationProgress>();
-    updateP2PReplicationLine() {
-        const p2pReplicationResultX = [...this.p2pReplicationResult.values()].sort((a, b) =>
-            a.peerId.localeCompare(b.peerId)
-        );
-        const renderProgress = (current: number, max: number) => {
-            if (current == max) return `${current}`;
-            return `${current} (${max})`;
-        };
-        const line = p2pReplicationResultX
-            .map(
-                (e) =>
-                    `${e.fetching.isActive || e.sending.isActive ? "⚡" : "💤"} ${e.peerName} ↑ ${renderProgress(e.sending.current, e.sending.max)} ↓ ${renderProgress(e.fetching.current, e.fetching.max)} `
-            )
-            .join("\n");
-        this.p2pReplicationLine.value = line;
-    }
-    // p2pReplicationResultX = reactiveSource([] as P2PReplicationProgress[]);
-    p2pReplicationLine = reactiveSource("");
-
     $everyOnload(): Promise<boolean> {
         eventHub.onEvent(EVENT_LEAF_ACTIVE_CHANGED, () => this.onActiveLeafChange());
         eventHub.onceEvent(EVENT_LAYOUT_READY, () => this.onActiveLeafChange());
-        eventHub.onEvent(EVENT_ADVERTISEMENT_RECEIVED, (data) => {
-            this.p2pReplicationResult.set(data.peerId, {
-                peerId: data.peerId,
-                peerName: data.name,
-                fetching: {
-                    current: 0,
-                    max: 0,
-                    isActive: false,
-                },
-                sending: {
-                    current: 0,
-                    max: 0,
-                    isActive: false,
-                },
-            });
-            this.updateP2PReplicationLine();
-        });
-        eventHub.onEvent(EVENT_P2P_CONNECTED, () => {
-            this.p2pReplicationResult.clear();
-            this.updateP2PReplicationLine();
-        });
-        eventHub.onEvent(EVENT_P2P_DISCONNECTED, () => {
-            this.p2pReplicationResult.clear();
-            this.updateP2PReplicationLine();
-        });
-        eventHub.onEvent(EVENT_DEVICE_LEAVED, (peerId) => {
-            this.p2pReplicationResult.delete(peerId);
-            this.updateP2PReplicationLine();
-        });
-        eventHub.onEvent(EVENT_P2P_REPLICATOR_PROGRESS, (data) => {
-            const prev = this.p2pReplicationResult.get(data.peerId) || {
-                peerId: data.peerId,
-                peerName: data.peerName,
-                fetching: {
-                    current: 0,
-                    max: 0,
-                    isActive: false,
-                },
-                sending: {
-                    current: 0,
-                    max: 0,
-                    isActive: false,
-                },
-            };
-            if ("fetching" in data) {
-                if (data.fetching.isActive) {
-                    prev.fetching = data.fetching;
-                } else {
-                    prev.fetching.isActive = false;
-                }
-            }
-            if ("sending" in data) {
-                if (data.sending.isActive) {
-                    prev.sending = data.sending;
-                } else {
-                    prev.sending.isActive = false;
-                }
-            }
-            this.p2pReplicationResult.set(data.peerId, prev);
-            this.updateP2PReplicationLine();
-        });
+
         return Promise.resolve(true);
     }
     adjustStatusDivPosition() {

src/modules/features/ModuleSetupObsidian.ts

@@ -1,22 +1,34 @@
 import {
     type ObsidianLiveSyncSettings,
     DEFAULT_SETTINGS,
+    KeyIndexOfSettings,
     LOG_LEVEL_NOTICE,
     LOG_LEVEL_VERBOSE,
 } from "../../lib/src/common/types.ts";
-import { configURIBase } from "../../common/types.ts";
+import { configURIBase, configURIBaseQR } from "../../common/types.ts";
 // import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser.js";
 import { decrypt, encrypt } from "../../lib/src/encryption/e2ee_v2.ts";
 import { fireAndForget } from "../../lib/src/common/utils.ts";
 import { EVENT_REQUEST_COPY_SETUP_URI, EVENT_REQUEST_OPEN_SETUP_URI, eventHub } from "../../common/events.ts";
 import { AbstractObsidianModule, type IObsidianModule } from "../AbstractObsidianModule.ts";
+import { decodeAnyArray, encodeAnyArray } from "../../common/utils.ts";
+import qrcode from "qrcode-generator";
+import { $msg } from "../../lib/src/common/i18n.ts";
 
 export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsidianModule {
     $everyOnload(): Promise<boolean> {
-        this.registerObsidianProtocolHandler(
-            "setuplivesync",
-            async (conf: any) => await this.setupWizard(conf.settings)
-        );
+        this.registerObsidianProtocolHandler("setuplivesync", async (conf: any) => {
+            if (conf.settings) {
+                await this.setupWizard(conf.settings);
+            } else if (conf.settingsQR) {
+                await this.decodeQR(conf.settingsQR);
+            }
+        });
+        this.addCommand({
+            id: "livesync-setting-qr",
+            name: "Show settings as a QR code",
+            callback: () => fireAndForget(this.encodeQR()),
+        });
 
         this.addCommand({
             id: "livesync-copysetupuri",
@@ -44,7 +56,45 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
         eventHub.onEvent(EVENT_REQUEST_COPY_SETUP_URI, () => fireAndForget(() => this.command_copySetupURI()));
         return Promise.resolve(true);
     }
-
+    async encodeQR() {
+        const settingArr = [];
+        const fullIndexes = Object.entries(KeyIndexOfSettings) as [keyof ObsidianLiveSyncSettings, number][];
+        for (const [settingKey, index] of fullIndexes) {
+            const settingValue = this.settings[settingKey];
+            settingArr[index] = settingValue;
+        }
+        const w = encodeAnyArray(settingArr);
+        // console.warn(w.length)
+        // console.warn(w);
+        // const j = decodeAnyArray(w);
+        // console.warn(j);
+        // console.warn(`is equal: ${isObjectDifferent(settingArr, j)}`);
+        const qr = qrcode(0, "L");
+        const uri = `${configURIBaseQR}${encodeURIComponent(w)}`;
+        qr.addData(uri);
+        qr.make();
+        const img = qr.createSvgTag(3);
+        const msg = $msg("Setup.QRCode", { qr_image: img });
+        await this.core.confirm.confirmWithMessage("Settings QR Code", msg, ["OK"], "OK");
+        return await Promise.resolve(w);
+    }
+    async decodeQR(qr: string) {
+        const settingArr = decodeAnyArray(qr);
+        // console.warn(settingArr);
+        const fullIndexes = Object.entries(KeyIndexOfSettings) as [keyof ObsidianLiveSyncSettings, number][];
+        const newSettings = { ...DEFAULT_SETTINGS } as ObsidianLiveSyncSettings;
+        for (const [settingKey, index] of fullIndexes) {
+            if (index >= settingArr.length) {
+                // Possibly a new setting added.
+                continue;
+            }
+            const settingValue = settingArr[index];
+            //@ts-ignore
+            newSettings[settingKey] = settingValue;
+        }
+        console.warn(newSettings);
+        await this.applySettingWizard(this.settings, newSettings, "QR Code");
+    }
     async command_copySetupURI(stripExtra = true) {
         const encryptingPassphrase = await this.core.confirm.askString(
             "Encrypt your settings",
@@ -74,7 +124,7 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
         const encryptedSetting = encodeURIComponent(
             await encrypt(JSON.stringify(setting), encryptingPassphrase, false)
         );
-        const uri = `${configURIBase}${encryptedSetting}`;
+        const uri = `${configURIBase}${encryptedSetting} `;
         await navigator.clipboard.writeText(uri);
         this._log("Setup URI copied to clipboard", LOG_LEVEL_NOTICE);
     }
@@ -95,7 +145,7 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
         const encryptedSetting = encodeURIComponent(
             await encrypt(JSON.stringify(setting), encryptingPassphrase, false)
         );
-        const uri = `${configURIBase}${encryptedSetting}`;
+        const uri = `${configURIBase}${encryptedSetting} `;
         await navigator.clipboard.writeText(uri);
         this._log("Setup URI copied to clipboard", LOG_LEVEL_NOTICE);
     }
@@ -103,16 +153,155 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
         await this.command_copySetupURI(false);
     }
     async command_openSetupURI() {
-        const setupURI = await this.core.confirm.askString("Easy setup", "Set up URI", `${configURIBase}aaaaa`);
+        const setupURI = await this.core.confirm.askString("Easy setup", "Set up URI", `${configURIBase} aaaaa`);
         if (setupURI === false) return;
         if (!setupURI.startsWith(`${configURIBase}`)) {
             this._log("Set up URI looks wrong.", LOG_LEVEL_NOTICE);
             return;
         }
         const config = decodeURIComponent(setupURI.substring(configURIBase.length));
-        console.dir(config);
         await this.setupWizard(config);
     }
+    async applySettingWizard(
+        oldConf: ObsidianLiveSyncSettings,
+        newConf: ObsidianLiveSyncSettings,
+        method = "Setup URI"
+    ) {
+        const result = await this.core.confirm.askYesNoDialog(
+            "Importing Configuration from the " + method + ". Are you sure to proceed ? ",
+            {}
+        );
+        if (result == "yes") {
+            const newSettingW = Object.assign({}, DEFAULT_SETTINGS, newConf) as ObsidianLiveSyncSettings;
+            this.core.replicator.closeReplication();
+            this.settings.suspendFileWatching = true;
+            console.dir(newSettingW);
+            // Back into the default method once.
+            newSettingW.configPassphraseStore = "";
+            newSettingW.encryptedPassphrase = "";
+            newSettingW.encryptedCouchDBConnection = "";
+            newSettingW.additionalSuffixOfDatabaseName = `${"appId" in this.app ? this.app.appId : ""} `;
+            const setupJustImport = "Don't sync anything, just apply the settings.";
+            const setupAsNew = "This is a new client - sync everything from the remote server.";
+            const setupAsMerge = "This is an existing client - merge existing files with the server.";
+            const setupAgain = "Initialise new server data - ideal for new or broken servers.";
+            const setupManually = "Continue and configure manually.";
+            newSettingW.syncInternalFiles = false;
+            newSettingW.usePluginSync = false;
+            newSettingW.isConfigured = true;
+            // Migrate completely obsoleted configuration.
+            if (!newSettingW.useIndexedDBAdapter) {
+                newSettingW.useIndexedDBAdapter = true;
+            }
+
+            const setupType = await this.core.confirm.askSelectStringDialogue(
+                "How would you like to set it up?",
+                [setupAsNew, setupAgain, setupAsMerge, setupJustImport, setupManually],
+                { defaultAction: setupAsNew }
+            );
+            if (setupType == setupJustImport) {
+                this.core.settings = newSettingW;
+                this.core.$$clearUsedPassphrase();
+                await this.core.saveSettings();
+            } else if (setupType == setupAsNew) {
+                this.core.settings = newSettingW;
+                this.core.$$clearUsedPassphrase();
+                await this.core.saveSettings();
+                await this.core.rebuilder.$fetchLocal();
+            } else if (setupType == setupAsMerge) {
+                this.core.settings = newSettingW;
+                this.core.$$clearUsedPassphrase();
+                await this.core.saveSettings();
+                await this.core.rebuilder.$fetchLocal(true);
+            } else if (setupType == setupAgain) {
+                const confirm =
+                    "This operation will rebuild all databases with files on this device. Any files on the remote database not synced here will be lost.";
+                if (
+                    (await this.core.confirm.askSelectStringDialogue(
+                        "Are you sure you want to do this?",
+                        ["Cancel", confirm],
+                        { defaultAction: "Cancel" }
+                    )) != confirm
+                ) {
+                    return;
+                }
+                this.core.settings = newSettingW;
+                await this.core.saveSettings();
+                this.core.$$clearUsedPassphrase();
+                await this.core.rebuilder.$rebuildEverything();
+            } else if (setupType == setupManually) {
+                const keepLocalDB = await this.core.confirm.askYesNoDialog("Keep local DB?", {
+                    defaultOption: "No",
+                });
+                const keepRemoteDB = await this.core.confirm.askYesNoDialog("Keep remote DB?", {
+                    defaultOption: "No",
+                });
+                if (keepLocalDB == "yes" && keepRemoteDB == "yes") {
+                    // nothing to do. so peaceful.
+                    this.core.settings = newSettingW;
+                    this.core.$$clearUsedPassphrase();
+                    await this.core.$allSuspendAllSync();
+                    await this.core.$allSuspendExtraSync();
+                    await this.core.saveSettings();
+                    const replicate = await this.core.confirm.askYesNoDialog("Unlock and replicate?", {
+                        defaultOption: "Yes",
+                    });
+                    if (replicate == "yes") {
+                        await this.core.$$replicate(true);
+                        await this.core.$$markRemoteUnlocked();
+                    }
+                    this._log("Configuration loaded.", LOG_LEVEL_NOTICE);
+                    return;
+                }
+                if (keepLocalDB == "no" && keepRemoteDB == "no") {
+                    const reset = await this.core.confirm.askYesNoDialog("Drop everything?", {
+                        defaultOption: "No",
+                    });
+                    if (reset != "yes") {
+                        this._log("Cancelled", LOG_LEVEL_NOTICE);
+                        this.core.settings = oldConf;
+                        return;
+                    }
+                }
+                let initDB;
+                this.core.settings = newSettingW;
+                this.core.$$clearUsedPassphrase();
+                await this.core.saveSettings();
+                if (keepLocalDB == "no") {
+                    await this.core.$$resetLocalDatabase();
+                    await this.core.localDatabase.initializeDatabase();
+                    const rebuild = await this.core.confirm.askYesNoDialog("Rebuild the database?", {
+                        defaultOption: "Yes",
+                    });
+                    if (rebuild == "yes") {
+                        initDB = this.core.$$initializeDatabase(true);
+                    } else {
+                        await this.core.$$markRemoteResolved();
+                    }
+                }
+                if (keepRemoteDB == "no") {
+                    await this.core.$$tryResetRemoteDatabase();
+                    await this.core.$$markRemoteLocked();
+                }
+                if (keepLocalDB == "no" || keepRemoteDB == "no") {
+                    const replicate = await this.core.confirm.askYesNoDialog("Replicate once?", {
+                        defaultOption: "Yes",
+                    });
+                    if (replicate == "yes") {
+                        if (initDB != null) {
+                            await initDB;
+                        }
+                        await this.core.$$replicate(true);
+                    }
+                }
+            }
+            this._log("Configuration loaded.", LOG_LEVEL_NOTICE);
+        } else {
+            this._log("Cancelled", LOG_LEVEL_NOTICE);
+            this.core.settings = oldConf;
+            return;
+        }
+    }
     async setupWizard(confString: string) {
         try {
             const oldConf = JSON.parse(JSON.stringify(this.settings));
@@ -125,133 +314,7 @@ export class ModuleSetupObsidian extends AbstractObsidianModule implements IObsi
             if (encryptingPassphrase === false) return;
             const newConf = await JSON.parse(await decrypt(confString, encryptingPassphrase, false));
             if (newConf) {
-                const result = await this.core.confirm.askYesNoDialog(
-                    "Importing Configuration from the Setup-URI. Are you sure to proceed?",
-                    {}
-                );
-                if (result == "yes") {
-                    const newSettingW = Object.assign({}, DEFAULT_SETTINGS, newConf) as ObsidianLiveSyncSettings;
-                    this.core.replicator.closeReplication();
-                    this.settings.suspendFileWatching = true;
-                    console.dir(newSettingW);
-                    // Back into the default method once.
-                    newSettingW.configPassphraseStore = "";
-                    newSettingW.encryptedPassphrase = "";
-                    newSettingW.encryptedCouchDBConnection = "";
-                    newSettingW.additionalSuffixOfDatabaseName = `${"appId" in this.app ? this.app.appId : ""}`;
-                    const setupJustImport = "Don't sync anything, just apply the settings.";
-                    const setupAsNew = "This is a new client - sync everything from the remote server.";
-                    const setupAsMerge = "This is an existing client - merge existing files with the server.";
-                    const setupAgain = "Initialise new server data - ideal for new or broken servers.";
-                    const setupManually = "Continue and configure manually.";
-                    newSettingW.syncInternalFiles = false;
-                    newSettingW.usePluginSync = false;
-                    newSettingW.isConfigured = true;
-                    // Migrate completely obsoleted configuration.
-                    if (!newSettingW.useIndexedDBAdapter) {
-                        newSettingW.useIndexedDBAdapter = true;
-                    }
-
-                    const setupType = await this.core.confirm.askSelectStringDialogue(
-                        "How would you like to set it up?",
-                        [setupAsNew, setupAgain, setupAsMerge, setupJustImport, setupManually],
-                        { defaultAction: setupAsNew }
-                    );
-                    if (setupType == setupJustImport) {
-                        this.core.settings = newSettingW;
-                        this.core.$$clearUsedPassphrase();
-                        await this.core.saveSettings();
-                    } else if (setupType == setupAsNew) {
-                        this.core.settings = newSettingW;
-                        this.core.$$clearUsedPassphrase();
-                        await this.core.rebuilder.$fetchLocal();
-                    } else if (setupType == setupAsMerge) {
-                        this.core.settings = newSettingW;
-                        this.core.$$clearUsedPassphrase();
-                        await this.core.rebuilder.$fetchLocal(true);
-                    } else if (setupType == setupAgain) {
-                        const confirm =
-                            "This operation will rebuild all databases with files on this device. Any files on the remote database not synced here will be lost.";
-                        if (
-                            (await this.core.confirm.askSelectStringDialogue(
-                                "Are you sure you want to do this?",
-                                ["Cancel", confirm],
-                                { defaultAction: "Cancel" }
-                            )) != confirm
-                        ) {
-                            return;
-                        }
-                        this.core.settings = newSettingW;
-                        this.core.$$clearUsedPassphrase();
-                        await this.core.rebuilder.$rebuildEverything();
-                    } else if (setupType == setupManually) {
-                        const keepLocalDB = await this.core.confirm.askYesNoDialog("Keep local DB?", {
-                            defaultOption: "No",
-                        });
-                        const keepRemoteDB = await this.core.confirm.askYesNoDialog("Keep remote DB?", {
-                            defaultOption: "No",
-                        });
-                        if (keepLocalDB == "yes" && keepRemoteDB == "yes") {
-                            // nothing to do. so peaceful.
-                            this.core.settings = newSettingW;
-                            this.core.$$clearUsedPassphrase();
-                            await this.core.$allSuspendAllSync();
-                            await this.core.$allSuspendExtraSync();
-                            await this.core.saveSettings();
-                            const replicate = await this.core.confirm.askYesNoDialog("Unlock and replicate?", {
-                                defaultOption: "Yes",
-                            });
-                            if (replicate == "yes") {
-                                await this.core.$$replicate(true);
-                                await this.core.$$markRemoteUnlocked();
-                            }
-                            this._log("Configuration loaded.", LOG_LEVEL_NOTICE);
-                            return;
-                        }
-                        if (keepLocalDB == "no" && keepRemoteDB == "no") {
-                            const reset = await this.core.confirm.askYesNoDialog("Drop everything?", {
-                                defaultOption: "No",
-                            });
-                            if (reset != "yes") {
-                                this._log("Cancelled", LOG_LEVEL_NOTICE);
-                                this.core.settings = oldConf;
-                                return;
-                            }
-                        }
-                        let initDB;
-                        this.core.settings = newSettingW;
-                        this.core.$$clearUsedPassphrase();
-                        await this.core.saveSettings();
-                        if (keepLocalDB == "no") {
-                            await this.core.$$resetLocalDatabase();
-                            await this.core.localDatabase.initializeDatabase();
-                            const rebuild = await this.core.confirm.askYesNoDialog("Rebuild the database?", {
-                                defaultOption: "Yes",
-                            });
-                            if (rebuild == "yes") {
-                                initDB = this.core.$$initializeDatabase(true);
-                            } else {
-                                await this.core.$$markRemoteResolved();
-                            }
-                        }
-                        if (keepRemoteDB == "no") {
-                            await this.core.$$tryResetRemoteDatabase();
-                            await this.core.$$markRemoteLocked();
-                        }
-                        if (keepLocalDB == "no" || keepRemoteDB == "no") {
-                            const replicate = await this.core.confirm.askYesNoDialog("Replicate once?", {
-                                defaultOption: "Yes",
-                            });
-                            if (replicate == "yes") {
-                                if (initDB != null) {
-                                    await initDB;
-                                }
-                                await this.core.$$replicate(true);
-                            }
-                        }
-                    }
-                }
-
+                await this.applySettingWizard(oldConf, newConf);
                 this._log("Configuration loaded.", LOG_LEVEL_NOTICE);
             } else {
                 this._log("Cancelled.", LOG_LEVEL_NOTICE);

src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts

@@ -71,6 +71,7 @@ import {
     EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG,
     EVENT_REQUEST_OPEN_SETUP_URI,
     EVENT_REQUEST_RELOAD_SETTING_TAB,
+    EVENT_REQUEST_RUN_DOCTOR,
     eventHub,
 } from "../../../common/events.ts";
 import { skipIfDuplicated } from "octagonal-wheels/concurrency/lock";
@@ -1613,8 +1614,33 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal
                                     const newTweaks =
                                         await this.plugin.$$checkAndAskUseRemoteConfiguration(trialSetting);
                                     if (newTweaks.result !== false) {
-                                        this.editingSettings = { ...this.editingSettings, ...newTweaks.result };
-                                        this.requestUpdate();
+                                        if (this.inWizard) {
+                                            this.editingSettings = { ...this.editingSettings, ...newTweaks.result };
+                                            this.requestUpdate();
+                                            return;
+                                        } else {
+                                            this.closeSetting();
+                                            this.plugin.settings = { ...this.plugin.settings, ...newTweaks.result };
+                                            if (newTweaks.requireFetch) {
+                                                if (
+                                                    (await this.plugin.confirm.askYesNoDialog(
+                                                        $msg("SettingTab.Message.AskRebuild"),
+                                                        {
+                                                            defaultOption: "Yes",
+                                                        }
+                                                    )) == "no"
+                                                ) {
+                                                    await this.plugin.$$saveSettingData();
+                                                    return;
+                                                }
+                                                await this.plugin.$$saveSettingData();
+                                                await this.plugin.rebuilder.scheduleFetch();
+                                                await this.plugin.$$scheduleAppReload();
+                                                return;
+                                            } else {
+                                                await this.plugin.$$saveSettingData();
+                                            }
+                                        }
                                     }
                                 })
                         );
@@ -1890,6 +1916,9 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal
                         })
                         .setClass("wizardHidden");
 
+                    new Setting(paneEl).autoWireNumeric("syncMinimumInterval", {
+                        onUpdate: onlyOnNonLiveSync,
+                    });
                     new Setting(paneEl)
                         .setClass("wizardHidden")
                         .autoWireToggle("syncOnSave", { onUpdate: onlyOnNonLiveSync });
@@ -2226,10 +2255,23 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal
         void addPane(containerEl, "Hatch", "🧰", 50, true).then((paneEl) => {
             // const hatchWarn = this.createEl(paneEl, "div", { text: `To stop the boot up sequence for fixing problems on databases, you can put redflag.md on top of your vault (Rebooting obsidian is required).` });
             // hatchWarn.addClass("op-warn-info");
-            void addPanel(paneEl, "Reporting Issue").then((paneEl) => {
-                new Setting(paneEl).setName("Make report to inform the issue").addButton((button) =>
+            void addPanel(paneEl, $msg("Setting.TroubleShooting")).then((paneEl) => {
+                new Setting(paneEl)
+                    .setName($msg("Setting.TroubleShooting.Doctor"))
+                    .setDesc($msg("Setting.TroubleShooting.Doctor.Desc"))
+                    .addButton((button) =>
+                        button
+                            .setButtonText("Run Doctor")
+                            .setCta()
+                            .setDisabled(false)
+                            .onClick(() => {
+                                this.closeSetting();
+                                eventHub.emitEvent(EVENT_REQUEST_RUN_DOCTOR, "you wanted(Thank you)!");
+                            })
+                    );
+                new Setting(paneEl).setName("Prepare the 'report' to create an issue").addButton((button) =>
                     button
-                        .setButtonText("Make report")
+                        .setButtonText("Copy Report to clipboard")
                         .setCta()
                         .setDisabled(false)
                         .onClick(async () => {
@@ -2310,7 +2352,10 @@ version:${manifestVersion}
 ${stringifyYaml(pluginConfig)}`;
                             console.log(msgConfig);
                             await navigator.clipboard.writeText(msgConfig);
-                            Logger(`Information has been copied to clipboard`, LOG_LEVEL_NOTICE);
+                            Logger(
+                                `Generated report has been copied to clipboard. Please report the issue with this! Thank you for your cooperation!`,
+                                LOG_LEVEL_NOTICE
+                            );
                         })
                 );
                 new Setting(paneEl).autoWireToggle("writeLogToTheFile");

src/modules/features/SettingDialogue/settingConstants.ts

@@ -346,8 +346,8 @@ export const SettingInformation: Partial<Record<keyof AllSettings, Configuration
         desc: "If this enabled, All files are handled as case-Sensitive (Previous behaviour).",
     },
     doNotUseFixedRevisionForChunks: {
-        name: "Compute revisions for chunks (Previous behaviour)",
-        desc: "If this enabled, all chunks will be stored with the revision made from its content. (Previous behaviour)",
+        name: "Compute revisions for chunks",
+        desc: "If this enabled, all chunks will be stored with the revision made from its content.",
     },
     sendChunksBulkMaxSize: {
         name: "Maximum size of chunks to send in one request",
@@ -373,6 +373,10 @@ export const SettingInformation: Partial<Record<keyof AllSettings, Configuration
         name: "Suppress notification of hidden files change",
         desc: "If enabled, the notification of hidden files change will be suppressed.",
     },
+    syncMinimumInterval: {
+        name: "Minimum interval for syncing",
+        desc: "The minimum interval for automatic synchronisation on event.",
+    },
 };
 function translateInfo(infoSrc: ConfigurationItem | undefined | false) {
     if (!infoSrc) return false;

src/modules/interfaces/DatabaseRebuilder.ts

@@ -4,7 +4,7 @@ export interface Rebuilder {
     ): Promise<void>;
     $rebuildRemote(): Promise<void>;
     $rebuildEverything(): Promise<void>;
-    $fetchLocal(makeLocalChunkBeforeSync?: boolean): Promise<void>;
+    $fetchLocal(makeLocalChunkBeforeSync?: boolean, preventMakeLocalFilesBeforeSync?: boolean): Promise<void>;
 
     scheduleRebuild(): Promise<void>;
     scheduleFetch(): Promise<void>;

src/modules/interfaces/StorageAccess.ts

@@ -38,7 +38,7 @@ export interface StorageAccess {
     getFiles(): UXFileInfoStub[];
     getFileNames(): FilePathWithPrefix[];
 
-    touched(file: UXFileInfoStub | FilePathWithPrefix): void;
+    touched(file: UXFileInfoStub | FilePathWithPrefix): Promise<void>;
     recentlyTouched(file: UXFileInfoStub | FilePathWithPrefix): boolean;
     clearTouched(): void;
 

src/modules/main/ModuleLiveSyncMain.ts

@@ -14,7 +14,7 @@ import { cancelAllPeriodicTask, cancelAllTasks } from "octagonal-wheels/concurre
 import { stopAllRunningProcessors } from "octagonal-wheels/concurrency/processor";
 import { AbstractModule } from "../AbstractModule.ts";
 import type { ICoreModule } from "../ModuleTypes.ts";
-import { EVENT_PLATFORM_UNLOADED } from "../../lib/src/PlatformAPIs/APIBase.ts";
+import { EVENT_PLATFORM_UNLOADED } from "../../lib/src/PlatformAPIs/base/APIBase.ts";
 
 export class ModuleLiveSyncMain extends AbstractModule implements ICoreModule {
     async $$onLiveSyncReady() {

styles.css

@@ -436,4 +436,11 @@ span.ls-mark-cr::after {
 
 .sls-dialogue-note-countdown {
     font-size: 0.8em;
+}
+
+.sls-qr {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    max-width: max-content;
 }

tsconfig.json

@@ -16,7 +16,11 @@
         "noEmit": true,
         "lib": ["es2018", "DOM", "ES5", "ES6", "ES7", "es2019.array", "ES2021.WeakRef", "ES2020.BigInt", "ESNext.Intl"],
         "strictBindCallApply": true,
-        "strictFunctionTypes": true
+        "strictFunctionTypes": true,
+        "paths": {
+            "@/*": ["src/*"],
+            "@lib/*": ["src/lib/src/*"]
+        }
     },
     "include": ["**/*.ts"],
     "exclude": ["pouchdb-browser-webpack", "utils"]

updates.md

@@ -1,6 +1,5 @@
 ## 0.24.11
 
-
 Peer-to-peer synchronisation has been implemented!
 
 Until now, I have not provided a synchronisation server. More people may not even know that I have shut down the test server. I confess that this is a bit repetitive, but I confess it is a cautionary tale. This is out of a sense of self-discipline that someone has occurred who could see your data. Even if the 'someone' is me. I should not be unaware of its superiority, even though well-meaning and am a servant of all. (Half joking, but also serious).
@@ -10,82 +9,119 @@ Also, this signalling server is just a Nostr relay, not my implementation. You c
 Nevertheless, that being said, to be more honest, I still have not decided what to do with this signalling server if too much traffic comes in.
 
 Note: Already you have noticed this, but let me mention it again, this is a significantly large update. If you have noticed anything, please let me know. I will try to fix it as soon as possible (Some address is on my [profile](https://github.com/vrtmrz)).
----
 
-## 0.24.11
+## 0.24.22 ~~0.24.21~~
+
+(Really sorry for the confusion. I have got a miss at releasing...).
+
+### Fixed
+
+- No longer conflicted files are handled in the boot-up process. No more unexpected overwriting.
+    - It ignores `Always overwrite with a newer file`, and always be prevented for the safety. Please pick it manually or open the file.
+- Some log messages on conflict resolution has been corrected.
+- Automatic merge notifications, displayed on the grounds of `same`, have been degraded to logs.
 
 ### Improved
 
-- New Translation: `es` (Spanish) by @zeedif (Thank you so much)!
-- Now all of messages can be selectable and copyable, also on the iPhone, iPad, and Android devices. Now we can copy or share the messages easily.
+- Now we can fetch the remote database with keeping local files completely intact.
+    - In new option, all files are stored into the local database before the fetching, and will be merged automatically or detected as conflicts.
+- The dialogue presenting options when performing `Fetch` are now more informative.
+
+### Refactored
+
+- Some class methods have been fixed its arguments to be more consistent.
+- Types have been defined for some conditional results.
+
+## 0.24.20
+
+### Improved
+
+- Now we can see the detail of `TypeError` using Obsidian API during remote database access.
+
+## 0.24.19
 
 ### New Feature
 
-- Peer-to-Peer Synchronisation has been implemented!
-    - This feature is still in early beta, and it is recommended to use it with caution.
-    - However, it is a significant step towards the self-hosting concept. It is now possible to synchronise your data without using any remote database or storage. It is a direct connection between your devices.
-    - Note: We should keep the device online to synchronise the data. It is not a background synchronisation. Also it needs a signalling server to establish the connection. But, the signalling server is used only for establishing the connection, and it does not store any data.
+- Now we can generate a QR Code for transferring the configuration to another device.
+    - This QR Code can be scanned by the camera app or something QR Code Reader of another device, and via Obsidian URL, the configuration will be transferred.
+    - Note: This QR Code is not encrypted. So, please be careful when transferring the configuration.
+
+## 0.24.18
 
 ### Fixed
 
-- No longer memory or resource leaks when the plug-in is disabled.
-- Now deleted chunks are correctly detected on conflict resolution, and we are guided to resurrect them.
-- Hanging issue during the initial synchronisation has been fixed.
-- Some unnecessary logs have been removed.
-- Now all modal dialogues are correctly closed when the plug-in is disabled.
-
-### Refactor
-
-- Several interfaces have been moved to the separated library.
-- Translations have been moved to each language file, and during the build, they are merged into one file.
-- Non-mobile friendly code has been removed and replaced with the safer code.
-    - (Now a days, mostly server-side engine can use webcrypto, so it will be rewritten in the future more).
-- Started writing Platform impedance-matching-layer.
-- Svelte has been updated to v5.
-- Some function have got more robust type definitions.
-- Terser optimisation has slightly improved.
-- During the build, analysis meta-file of the bundled codes will be generated.
-
-## 0.24.10
-
-### Fixed
-
-- Fixed the issue which the filename is shown as `undefined`.
-- Fixed the issue where files transferred at short intervals were not reflected.
+- Now no chunk creation errors will be raised after switching `Compute revisions for chunks`.
+- Some invisible file can be handled correctly (e.g., `writing-goals-history.csv`).
+- Fetching configuration from the server is now saves the configuration immediately (if we are not in the wizard).
 
 ### Improved
 
-- Add more translations: `ja-JP` (Japanese) by @kohki-shikata (Thank you so much)!
+- Mismatched configuration dialogue is now more informative, and rewritten to more user-friendly.
+- Applying configuration mismatch is now without rebuilding (at our own risks).
+- Now, rebuilding is decided more fine grained.
 
-### Internal
+### Improved internally
 
-- Some files have been prettified.
+- Translations can be nested. i.e., task:`Some procedure`, check: `%{task} checking`, checkfailed: `%{check} failed` produces `Some procedure checking failed`.
+    - Max to 10 levels of nesting
 
-## 0.24.9
+## 0.24.17
 
-Skipped.
+Confession. I got the default values wrong. So scary and sorry.
 
-## 0.24.8
+### Behaviour and default changed
 
-### Fixed
+- **NOW INDEED AND ACTUALLY** `Compute revisions for chunks` are backed into enabled again. it is necessary for garbage collection of chunks.
+    - As far as existing users are concerned, this will not automatically change, but the Doctor will inform us.
 
-- Some parallel-processing tasks are now performed more safely.
-- Some error messages has been fixed.
+## 0.24.16
 
 ### Improved
 
-- Synchronisation is now more efficient and faster.
-- Saving chunks is a bit more robust.
+#### Peer-to-Peer
 
-### New Feature
+- Now peer-to-peer synchronisation checks the settings are compatible with each other.
+    - No longer unexpected database broken, phew.
+- Peer-to-peer synchronisation now handles the platform and detects pseudo-clients.
+    - Pseudo clients will not decrypt/encrypt anything, just relay the data. Hence, always settings are not compatible. Therefore, we have to accept the incompatibility for pseudo clients.
 
-- We can remove orphaned chunks again, now!
-    - Without rebuilding the database!
-    - Note: Please synchronise devices completely before removing orphaned chunks.
-    - Note2: Deleted files are using chunks, if you want to remove them, please commit the deletion first. (`Commit File Deletion`)
-    - Note3: If you lost some chunks, do not worry. They will be resurrected if not so much time has passed. Try `Resurrect deleted chunks`.
-    - Note4: This feature is still beta. Please report any issues you encounter.
-    - Note5: Please disable `On demand chunk fetching`, and enable `Compute revisions for each chunk` before using this feature.
-        - These settings is going to be default in the future.
+#### General
+
+- New migration method has been implemented, that called `Doctor`.
+
+    - `Doctor` checks the difference between the ideal and actual values and encourages corrective action. To facilitate our decision, the reasons for this and the recommendations are also presented.
+    - This can be used not only during migration. We can invoke the doctor from the settings for trouble-shooting.
+
+- The minimum interval for replication to be caused when an event occurs can now be configurable.
+- Some detail note has been added and change nuance about the `Report` in the setting dialogue, which had less informative.
+
+### Behaviour and default changed
+
+- `Compute revisions for chunks` are backed into enabled again. it is necessary for garbage collection of chunks.
+    - As far as existing users are concerned, this will not automatically change, but the Doctor will inform us.
+
+### Refactored
+
+- Platform specific codes are more separated. No longer `node` modules were used in the browser and Obsidian.
+
+## 0.24.15
+
+### Fixed
+
+- Now, even without WeakRef, Polyfill is used and the whole thing works without error. However, if you can switch WebView Engine, it is recommended to switch to a WebView Engine that supports WeakRef.
+
+## 0.24.14
+
+### Fixed
+
+- Resolving conflicts of JSON files (and sensibly merging them) is now working fine, again!
+    - And, failure logs are more informative.
+- More robust to release the event listeners on unwatching the local database.
+
+### Refactored
+
+- JSON file conflict resolution dialogue has been rewritten into svelte v5.
+- Upgrade eslint.
+- Remove unnecessary pragma comments for eslint.
 
 Older notes are in [updates_old.md](https://github.com/vrtmrz/obsidian-livesync/blob/main/updates_old.md).

updates_old.md

@@ -14,6 +14,131 @@ Thank you, and I hope your troubles will be resolved!
 
 ---
 
+## 0.24.13
+
+Sorry for the lack of replies. The ones that were not good are popping up, so I am just going to go ahead and get this one... However, they realised that refactoring and restructuring is about clarifying the problem. Your patience and understanding is much appreciated.
+
+### Fixed
+
+#### General Replication
+
+- No longer unexpected errors occur when the replication is stopped during for some reason (e.g., network disconnection).
+
+#### Peer-to-Peer Synchronisation
+
+- Set-up process will not receive data from unexpected sources.
+- No longer resource leaks while enabling the `broadcasting changes`
+- Logs are less verbose.
+- Received data is now correctly dispatched to other devices.
+- `Timeout` error now more informative.
+- No longer timeout error occurs for reporting the progress to other devices.
+- Decision dialogues for the same thing are not shown multiply at the same time anymore.
+- Disconnection of the peer-to-peer synchronisation is now more robust and less error-prone.
+
+#### Webpeer
+
+- Now we can toggle Peers' configuration.
+
+### Refactored
+
+- Cross-platform compatibility layer has been improved.
+- Common events are moved to the common library.
+- Displaying replication status of the peer-to-peer synchronisation is separated from the main-log-logic.
+- Some file names have been changed to be more consistent.
+
+
+## 0.24.12
+
+I created a SPA called [webpeer](https://github.com/vrtmrz/livesync-commonlib/tree/main/apps/webpeer) (well, right... I will think of a name again), which replaces the server when using Peer-to-Peer synchronisation. This is a pseudo-client that appears to other devices as if it were one of the clients. . As with the client, it receives and sends data without storing it as a file.
+And, this is just a single web page, without any server-side code. It is a static web page that can be hosted on any static web server, such as GitHub Pages, Netlify, or Vercel. All you have to do is to open the page and enter several items, and leave it open.
+
+### Fixed
+
+- No longer unnecessary acknowledgements are sent when starting peer-to-peer synchronisation.
+
+### Refactored
+
+- Platform impedance-matching-layer has been improved.
+    - And you can see the actual usage of this on [webpeer](https://github.com/vrtmrz/livesync-commonlib/tree/main/apps/webpeer) that a pseudo client for peer-to-peer synchronisation.
+- Some UIs have been got isomorphic among Obsidian and web applications (for `webpeer`).
+
+
+## 0.24.11
+
+### Improved
+
+- New Translation: `es` (Spanish) by @zeedif (Thank you so much)!
+- Now all of messages can be selectable and copyable, also on the iPhone, iPad, and Android devices. Now we can copy or share the messages easily.
+
+### New Feature
+
+- Peer-to-Peer Synchronisation has been implemented!
+    - This feature is still in early beta, and it is recommended to use it with caution.
+    - However, it is a significant step towards the self-hosting concept. It is now possible to synchronise your data without using any remote database or storage. It is a direct connection between your devices.
+    - Note: We should keep the device online to synchronise the data. It is not a background synchronisation. Also it needs a signalling server to establish the connection. But, the signalling server is used only for establishing the connection, and it does not store any data.
+
+### Fixed
+
+- No longer memory or resource leaks when the plug-in is disabled.
+- Now deleted chunks are correctly detected on conflict resolution, and we are guided to resurrect them.
+- Hanging issue during the initial synchronisation has been fixed.
+- Some unnecessary logs have been removed.
+- Now all modal dialogues are correctly closed when the plug-in is disabled.
+
+### Refactor
+
+- Several interfaces have been moved to the separated library.
+- Translations have been moved to each language file, and during the build, they are merged into one file.
+- Non-mobile friendly code has been removed and replaced with the safer code.
+    - (Now a days, mostly server-side engine can use webcrypto, so it will be rewritten in the future more).
+- Started writing Platform impedance-matching-layer.
+- Svelte has been updated to v5.
+- Some function have got more robust type definitions.
+- Terser optimisation has slightly improved.
+- During the build, analysis meta-file of the bundled codes will be generated.
+
+## 0.24.10
+
+### Fixed
+
+- Fixed the issue which the filename is shown as `undefined`.
+- Fixed the issue where files transferred at short intervals were not reflected.
+
+### Improved
+
+- Add more translations: `ja-JP` (Japanese) by @kohki-shikata (Thank you so much)!
+
+### Internal
+
+- Some files have been prettified.
+
+## 0.24.9
+
+Skipped.
+
+## 0.24.8
+
+### Fixed
+
+- Some parallel-processing tasks are now performed more safely.
+- Some error messages has been fixed.
+
+### Improved
+
+- Synchronisation is now more efficient and faster.
+- Saving chunks is a bit more robust.
+
+### New Feature
+
+- We can remove orphaned chunks again, now!
+    - Without rebuilding the database!
+    - Note: Please synchronise devices completely before removing orphaned chunks.
+    - Note2: Deleted files are using chunks, if you want to remove them, please commit the deletion first. (`Commit File Deletion`)
+    - Note3: If you lost some chunks, do not worry. They will be resurrected if not so much time has passed. Try `Resurrect deleted chunks`.
+    - Note4: This feature is still beta. Please report any issues you encounter.
+    - Note5: Please disable `On demand chunk fetching`, and enable `Compute revisions for each chunk` before using this feature.
+        - These settings is going to be default in the future.
+
 ## 0.24.7
 
 ### Fixed (Security)