bump

- `Resolve all conflicted files` has been implemented.
Fixed:
- Fixed a problem about reading chunks online when a file has more chunks than the concurrency limit.
Rollbacked:
- Logs are kept only for 100 lines, again.

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.17.22",
+    "version": "0.17.30",
     "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.17.22",
+    "version": "0.17.30",
     "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",
@@ -16,31 +16,31 @@
         "@types/diff-match-patch": "^1.0.32",
         "@types/pouchdb": "^6.4.0",
         "@types/pouchdb-browser": "^6.1.3",
-        "@typescript-eslint/eslint-plugin": "^5.44.0",
-        "@typescript-eslint/parser": "^5.44.0",
+        "@typescript-eslint/eslint-plugin": "^5.54.0",
+        "@typescript-eslint/parser": "^5.54.0",
         "builtin-modules": "^3.3.0",
         "esbuild": "0.15.15",
         "esbuild-svelte": "^0.7.3",
-        "eslint": "^8.28.0",
+        "eslint": "^8.35.0",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-import": "^2.27.5",
         "events": "^3.3.0",
-        "obsidian": "^0.16.3",
-        "postcss": "^8.4.19",
+        "obsidian": "^1.1.1",
+        "postcss": "^8.4.21",
         "postcss-load-config": "^4.0.1",
-        "pouchdb-adapter-http": "^8.0.0",
-        "pouchdb-adapter-idb": "^8.0.0",
-        "pouchdb-adapter-indexeddb": "^8.0.0",
-        "pouchdb-core": "^8.0.0",
-        "pouchdb-find": "^8.0.0",
-        "pouchdb-mapreduce": "^8.0.0",
-        "pouchdb-replication": "^8.0.0",
-        "pouchdb-utils": "file:src/lib/src/patches/pouchdb-utils",
-        "svelte": "^3.53.1",
-        "svelte-preprocess": "^4.10.7",
+        "pouchdb-adapter-http": "^8.0.1",
+        "pouchdb-adapter-idb": "^8.0.1",
+        "pouchdb-adapter-indexeddb": "^8.0.1",
+        "pouchdb-core": "^8.0.1",
+        "pouchdb-find": "^8.0.1",
+        "pouchdb-mapreduce": "^8.0.1",
+        "pouchdb-replication": "^8.0.1",
+        "pouchdb-utils": "^8.0.1",
+        "svelte": "^3.55.1",
+        "svelte-preprocess": "^5.0.1",
         "transform-pouch": "^2.0.0",
-        "tslib": "^2.4.1",
-        "typescript": "^4.9.3"
+        "tslib": "^2.5.0",
+        "typescript": "^4.9.5"
     },
     "dependencies": {
         "diff-match-patch": "^1.0.5",

src/ConflictResolveModal.ts

@@ -22,7 +22,7 @@ export class ConflictResolveModal extends Modal {
         contentEl.empty();
 
         contentEl.createEl("h2", { text: "This document has conflicted changes." });
-        contentEl.createEl("span", this.filename);
+        contentEl.createEl("span", { text: this.filename });
         const div = contentEl.createDiv("");
         div.addClass("op-scrollable");
         let diff = "";

src/DocumentHistoryModal.ts

@@ -1,7 +1,6 @@
 import { TFile, Modal, App } from "obsidian";
-import { path2id } from "./utils";
+import { isValidPath, path2id } from "./utils";
 import { base64ToArrayBuffer, base64ToString, escapeStringToHTML } from "./lib/src/strbin";
-import { isValidPath } from "./lib/src/path";
 import ObsidianLiveSyncPlugin from "./main";
 import { DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_patch } from "diff-match-patch";
 import { LoadedEntry, LOG_LEVEL } from "./lib/src/types";

src/JsonResolvePane.svelte

@@ -3,7 +3,7 @@
     import type { LoadedEntry } from "./lib/src/types";
     import { base64ToString } from "./lib/src/strbin";
     import { getDocData } from "./lib/src/utils";
-    import { mergeObject } from "./utils";
+    import { id2path, mergeObject } from "./utils";
 
     export let docs: LoadedEntry[] = [];
     export let callback: (keepRev: string, mergedStr?: string) => Promise<void> = async (_, __) => {
@@ -93,9 +93,11 @@
         diffs = getJsonDiff(objA, selectedObj);
         console.dir(selectedObj);
     }
+    $: filename = id2path(docA?._id ?? "");
 </script>
 
-<h1>File Conflicted</h1>
+<h1>Conflicted settings</h1>
+<div><span>{filename}</span></div>
 {#if !docA || !docB}
     <div class="message">Just for a minute, please!</div>
     <div class="buttons">

src/ObsidianLiveSyncSettingTab.ts

@@ -453,6 +453,9 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             this.plugin.settings.syncOnStart = false;
             this.plugin.settings.syncOnFileOpen = false;
             this.plugin.settings.syncAfterMerge = false;
+            this.plugin.settings.syncInternalFiles = false;
+            this.plugin.settings.usePluginSync = false;
+            Logger("Hidden files and plugin synchronization have been temporarily disabled. Please enable them after the fetching, if you need them.", LOG_LEVEL.NOTICE)
             await this.plugin.saveSettings();
 
             applyDisplayEnabled();
@@ -1291,8 +1294,71 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     })
                 return toggle;
             }
-        );
-
+            );
+        new Setting(containerSyncSettingEl)
+            .setName("A number of hashes to be cached")
+            .setDesc("")
+            .addText((text) => {
+                text.setPlaceholder("")
+                    .setValue(this.plugin.settings.hashCacheMaxCount + "")
+                    .onChange(async (value) => {
+                        let v = Number(value);
+                        if (isNaN(v) || v < 10) {
+                            v = 10;
+                        }
+                        this.plugin.settings.hashCacheMaxCount = v;
+                        await this.plugin.saveSettings();
+                    });
+                text.inputEl.setAttribute("type", "number");
+            });
+        new Setting(containerSyncSettingEl)
+            .setName("The total length of hashes to be cached")
+            .setDesc("(Mega chars)")
+            .addText((text) => {
+                text.setPlaceholder("")
+                    .setValue(this.plugin.settings.hashCacheMaxAmount + "")
+                    .onChange(async (value) => {
+                        let v = Number(value);
+                        if (isNaN(v) || v < 1) {
+                            v = 1;
+                        }
+                        this.plugin.settings.hashCacheMaxAmount = v;
+                        await this.plugin.saveSettings();
+                    });
+                text.inputEl.setAttribute("type", "number");
+            });
+        new Setting(containerSyncSettingEl)
+            .setName("The maximum number of reading chunks online concurrently")
+            .setDesc("")
+            .addText((text) => {
+                text.setPlaceholder("")
+                    .setValue(this.plugin.settings.concurrencyOfReadChunksOnline + "")
+                    .onChange(async (value) => {
+                        let v = Number(value);
+                        if (isNaN(v) || v < 10) {
+                            v = 10;
+                        }
+                        this.plugin.settings.concurrencyOfReadChunksOnline = v;
+                        await this.plugin.saveSettings();
+                    });
+                text.inputEl.setAttribute("type", "number");
+            });
+        new Setting(containerSyncSettingEl)
+            .setName("The minimum interval for reading chunks online")
+            .setDesc("")
+            .addText((text) => {
+                text.setPlaceholder("")
+                    .setValue(this.plugin.settings.minimumIntervalOfReadChunksOnline + "")
+                    .onChange(async (value) => {
+                        let v = Number(value);
+                        if (isNaN(v) || v < 10) {
+                            v = 10;
+                        }
+                        this.plugin.settings.minimumIntervalOfReadChunksOnline = v;
+                        await this.plugin.saveSettings();
+                    });
+                text.inputEl.setAttribute("type", "number");
+            });
         addScreenElement("30", containerSyncSettingEl);
         const containerMiscellaneousEl = containerEl.createDiv();
         containerMiscellaneousEl.createEl("h3", { text: "Miscellaneous" });
@@ -1538,6 +1604,15 @@ ${stringifyYaml(pluginConfig)}`;
                     await this.plugin.saveSettings();
                 })
             );
+        new Setting(containerHatchEl)
+            .setName("Write logs into the file")
+            .setDesc("Warning! This will have a serious impact on performance. And the logs will not be synchronised under the default name. Please be careful with logs; they often contain your confidential information.")
+            .addToggle((toggle) =>
+                toggle.setValue(this.plugin.settings.writeLogToTheFile).onChange(async (value) => {
+                    this.plugin.settings.writeLogToTheFile = value;
+                    await this.plugin.saveSettings();
+                })
+            );
 
         new Setting(containerHatchEl)
             .setName("Discard local database to reset or uninstall Self-hosted LiveSync")

src/utils.ts

@@ -1,6 +1,8 @@
-import { normalizePath } from "obsidian";
+import { DataWriteOptions, normalizePath, TFile, Platform } from "obsidian";
+import { path2id_base, id2path_base, isValidFilenameInLinux, isValidFilenameInDarwin, isValidFilenameInWidows, isValidFilenameInAndroid } from "./lib/src/path";
 
-import { path2id_base, id2path_base } from "./lib/src/path";
+import { Logger } from "./lib/src/logger";
+import { LOG_LEVEL } from "./lib/src/types";
 
 // For backward compatibility, using the path for determining id.
 // Only CouchDB unacceptable ID (that starts with an underscore) has been prefixed with "/".
@@ -259,4 +261,33 @@ export function flattenObject(obj: Record<string | number | symbol, any>, path:
         ret.push(...p);
     }
     return ret;
+}
+
+export function modifyFile(file: TFile, data: string | ArrayBuffer, options?: DataWriteOptions) {
+    if (typeof (data) === "string") {
+        return app.vault.modify(file, data, options);
+    } else {
+        return app.vault.modifyBinary(file, data, options);
+    }
+}
+export function createFile(path: string, data: string | ArrayBuffer, options?: DataWriteOptions): Promise<TFile> {
+    if (typeof (data) === "string") {
+        return app.vault.create(path, data, options);
+    } else {
+        return app.vault.createBinary(path, data, options);
+    }
+}
+
+export function isValidPath(filename: string) {
+    if (Platform.isDesktop) {
+        // if(Platform.isMacOS) return isValidFilenameInDarwin(filename);
+        if (process.platform == "darwin") return isValidFilenameInDarwin(filename);
+        if (process.platform == "linux") return isValidFilenameInLinux(filename);
+        return isValidFilenameInWidows(filename);
+    }
+    if (Platform.isAndroidApp) return isValidFilenameInAndroid(filename);
+    if (Platform.isIosApp) return isValidFilenameInDarwin(filename);
+    //Fallback
+    Logger("Could not determine platform for checking filename", LOG_LEVEL.VERBOSE);
+    return isValidFilenameInWidows(filename);
 }

updates.md

@@ -10,41 +10,38 @@
     - Chunk ID numbering rules
 
 #### Minors
-- __0.17.1 to 0.17.15 has been moved into `update_old.md`__
-
-- 0.17.16:
+- __0.17.1 to 0.17.25 has been moved into `update_old.md`__
+- 0.17.26
+  - Fixed(Urgent):
+    - The modified document will be reflected in the storage now.
+- 0.17.27
   - Improved:
-    - Plugins and their settings no longer need scanning if changes are monitored.
-    - Now synchronising plugins and their settings are performed parallelly and faster.
-    - We can place `redflag2.md` to rebuild the database automatically while the boot sequence.
-  - Experimental:
-    - We can use a new adapter on PouchDB. This will make us smoother. 
-      - Note: Not compatible with the older version. 
+    - Now, the filename of the conflicted settings will be shown on the merging dialogue
+    - The plugin data can be resolved when conflicted.
+    - The semaphore status display has been changed to count only.
+    - Applying to the storage will be concurrent with a few files.
+- 0.17.28
+  -Fixed:
+    - Some messages have been refined.
+    - Boot sequence has been speeded up.
+    - Opening the local database multiple times in a short duration has been suppressed.
+    - Older migration logic. 
+      - Note: If you have used 0.10.0 or lower and have not upgraded, you will need to run 0.17.27 or earlier once or reinstall Obsidian.
+- 0.17.29
   - Fixed:
-    - The default batch size is smaller again.
-    - Plugins and their setting can be synchronised again.
-    - Hidden files and plugins are correctly scanned while rebuilding.
-    - Files with the name started `_` are also being performed conflict-checking.
-- 0.17.17
-  - Fixed: Now we can merge JSON files even if we failed to compare items like null.
-- 0.17.18
-  - Fixed: Fixed lack of error handling.
-- 0.17.19 
-  - Fixed: Error reporting has been ensured.
-- 0.17.20
-  - Improved: Changes of hidden files will be notified to Obsidian.
-- 0.17.21
-  - Fixed: Skip patterns now handle capital letters.
-  - Improved
-    - New configuration to avoid exceeding throttle capacity.
-      - We have been grateful to @karasevm!
-    - The conflicted `data.json` is no longer merged automatically.
-      - This behaviour is not configurable, unlike the `Use newer file if conflicted` of normal files.
-- 0.17.22
+    - Requests of reading chunks online are now split into a reasonable(and configurable) size.
+    - No longer error message will be shown on Linux devices with hidden file synchronisation.
+  - Improved:
+    - The interval of reading chunks online is now configurable.
+    - Boot sequence has been speeded up, more.
+  - Misc:
+    - Messages on the boot sequence will now be more detailed. If you want to see them, please enable the verbose log.
+    - Logs became be kept for 1000 lines while the verbose log is enabled.
+- 0.17.30
+  - Implemented:
+    - `Resolve all conflicted files` has been implemented.
   - Fixed:
-    - Now hidden files will not be synchronised while we are not configured.
-    - Some processes could start without waiting for synchronisation to complete, but now they will wait for.
-  - Improved
-    - Now, by placing `redflag3.md`, we can discard the local database and fetch again.
-
+    - Fixed a problem about reading chunks online when a file has more chunks than the concurrency limit.
+  - Rollbacked:
+    - Logs are kept only for 100 lines, again.
 ... To continue on to `updates_old.md`.

updates_old.md

@@ -68,7 +68,60 @@
     - Hidden files have been synchronised again.
     - Rename of files has been fixed again.
   And, minor changes have been included.
-
+- 0.17.16:
+  - Improved:
+    - Plugins and their settings no longer need scanning if changes are monitored.
+    - Now synchronising plugins and their settings are performed parallelly and faster.
+    - We can place `redflag2.md` to rebuild the database automatically while the boot sequence.
+  - Experimental:
+    - We can use a new adapter on PouchDB. This will make us smoother. 
+      - Note: Not compatible with the older version. 
+  - Fixed:
+    - The default batch size is smaller again.
+    - Plugins and their setting can be synchronised again.
+    - Hidden files and plugins are correctly scanned while rebuilding.
+    - Files with the name started `_` are also being performed conflict-checking.
+- 0.17.17
+  - Fixed: Now we can merge JSON files even if we failed to compare items like null.
+- 0.17.18
+  - Fixed: Fixed lack of error handling.
+- 0.17.19 
+  - Fixed: Error reporting has been ensured.
+- 0.17.20
+  - Improved: Changes of hidden files will be notified to Obsidian.
+- 0.17.21
+  - Fixed: Skip patterns now handle capital letters.
+  - Improved
+    - New configuration to avoid exceeding throttle capacity.
+      - We have been grateful to @karasevm!
+    - The conflicted `data.json` is no longer merged automatically.
+      - This behaviour is not configurable, unlike the `Use newer file if conflicted` of normal files.
+- 0.17.22
+  - Fixed:
+    - Now hidden files will not be synchronised while we are not configured.
+    - Some processes could start without waiting for synchronisation to complete, but now they will wait for.
+  - Improved
+    - Now, by placing `redflag3.md`, we can discard the local database and fetch again.
+    - The document has been updated! Thanks to @hilsonp!
+- 0.17.23
+  - Improved:
+    - Now we can preserve the logs into the file.
+      - Note: This option will be enabled automatically also when we flagging a red flag.
+    - File names can now be made platform-appropriate.
+  - Refactored:
+    - Some redundant implementations have been sorted out.
+- 0.17.24
+  - New feature:
+    - If any conflicted files have been left, they will be reported.
+  - Fixed:
+    - Now the name of the conflicting file is shown on the conflict-resolving dialogue.
+    - Hidden files are now able to be merged again.
+    - No longer error caused at plug-in being loaded.
+  - Improved:
+    - Caching chunks are now limited in total size of cached chunks.
+- 0.17.25
+  - Fixed:
+    - Now reading error will be reported.
 ### 0.16.0
 - Now hidden files need not be scanned. Changes will be detected automatically.
   - If you want it to back to its previous behaviour, please disable `Monitor changes to internal files`.