bump

- Improved connectivity for P2P connections
- The connection to the signalling server can now be disconnected while in the background or when explicitly disconnected.
  - These features use a patch that has not been incorporated upstream.

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.25.12",
+    "version": "0.25.16",
     "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.25.12",
+    "version": "0.25.16",
     "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",
@@ -92,10 +92,10 @@
         "fflate": "^0.8.2",
         "idb": "^8.0.3",
         "minimatch": "^10.0.1",
-        "octagonal-wheels": "^0.1.37",
+        "octagonal-wheels": "^0.1.38",
         "qrcode-generator": "^1.4.4",
         "svelte-check": "^4.1.7",
-        "trystero": "^0.21.5",
+        "trystero": "github:vrtmrz/trystero#9e892a93ec14eeb57ce806d272fbb7c3935256d8",
         "xxhash-wasm-102": "npm:xxhash-wasm@^1.0.2"
     }
 }

src/common/KeyValueDB.ts

@@ -8,8 +8,8 @@ export const OpenKeyValueDatabase = async (dbKey: string): Promise<KeyValueDatab
     }
     const storeKey = dbKey;
     const dbPromise = openDB(dbKey, 1, {
-        upgrade(db) {
-            db.createObjectStore(storeKey);
+        upgrade(db, _oldVersion, _newVersion, _transaction, _event) {
+            return db.createObjectStore(storeKey);
         },
     });
     const db = await dbPromise;

src/features/P2PSync/CmdP2PReplicator.ts

@@ -174,6 +174,13 @@ export class P2PReplicator
         if (this.settings.P2P_Enabled && this.settings.P2P_AutoStart) {
             setTimeout(() => void this.open(), 100);
         }
+        const rep = this._replicatorInstance;
+        rep?.allowReconnection();
+        return Promise.resolve(true);
+    }
+    $everyBeforeSuspendProcess(): Promise<boolean> {
+        const rep = this._replicatorInstance;
+        rep?.disconnectFromServer();
         return Promise.resolve(true);
     }
 }

src/modules/coreObsidian/storageLib/StorageEventManager.ts

@@ -207,6 +207,9 @@ export class StorageEventManagerObsidian extends StorageEventManager {
                 }
             }
             if (file instanceof TFolder) continue;
+            // TODO: Confirm why only the TFolder skipping
+            // Possibly following line is needed...
+            // if (file?.isFolder) continue;
             if (!(await this.core.$$isTargetFile(file.path))) continue;
 
             // Stop cache using to prevent the corruption;

src/modules/essential/ModuleMigration.ts

@@ -17,6 +17,15 @@ import { isMetaEntry } from "../../lib/src/common/types.ts";
 import { isDeletedEntry, isDocContentSame, isLoadedEntry, readAsBlob } from "../../lib/src/common/utils.ts";
 import { countCompromisedChunks } from "../../lib/src/pouchdb/negotiation.ts";
 
+type ErrorInfo = {
+    path: string;
+    recordedSize: number;
+    actualSize: number;
+    storageSize: number;
+    contentMatched: boolean;
+    isConflicted?: boolean;
+};
+
 export class ModuleMigration extends AbstractModule implements ICoreModule {
     async migrateUsingDoctor(skipRebuild: boolean = false, activateReason = "updated", forceRescan = false) {
         const { shouldRebuild, shouldRebuildLocal, isModified, settings } = await performDoctorConsultation(
@@ -112,7 +121,8 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
         }
 
         this._log("Checking for incomplete documents...", LOG_LEVEL_NOTICE, "check-incomplete");
-        const errorFiles = [];
+
+        const errorFiles = [] as ErrorInfo[];
         for await (const metaDoc of this.localDatabase.findAllNormalDocs({ conflicts: true })) {
             const path = getPath(metaDoc);
 
@@ -133,17 +143,38 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
             if (isDeletedEntry(doc)) {
                 continue;
             }
-            const storageFileContent = await this.core.storageAccess.readHiddenFileBinary(path);
+            const isConflicted = metaDoc?._conflicts && metaDoc._conflicts.length > 0;
+
+            let storageFileContent;
+            try {
+                storageFileContent = await this.core.storageAccess.readHiddenFileBinary(path);
+            } catch (e) {
+                Logger(`Failed to read file ${path}: Possibly unprocessed or missing`);
+                Logger(e, LOG_LEVEL_VERBOSE);
+                continue;
+            }
             // const storageFileBlob = createBlob(storageFileContent);
             const sizeOnStorage = storageFileContent.byteLength;
             const recordedSize = doc.size;
             const docBlob = readAsBlob(doc);
             const actualSize = docBlob.size;
-            if (recordedSize !== actualSize || sizeOnStorage !== actualSize || sizeOnStorage !== recordedSize) {
+            if (
+                recordedSize !== actualSize ||
+                sizeOnStorage !== actualSize ||
+                sizeOnStorage !== recordedSize ||
+                isConflicted
+            ) {
                 const contentMatched = await isDocContentSame(doc.data, storageFileContent);
-                errorFiles.push({ path, recordedSize, actualSize, storageSize: sizeOnStorage, contentMatched });
+                errorFiles.push({
+                    path,
+                    recordedSize,
+                    actualSize,
+                    storageSize: sizeOnStorage,
+                    contentMatched,
+                    isConflicted,
+                });
                 Logger(
-                    `Size mismatch for ${path}: ${recordedSize} (DB Recorded) , ${actualSize} (DB Stored) , ${sizeOnStorage} (Storage Stored), ${contentMatched ? "Content Matched" : "Content Mismatched"}`
+                    `Size mismatch for ${path}: ${recordedSize} (DB Recorded) , ${actualSize} (DB Stored) , ${sizeOnStorage} (Storage Stored), ${contentMatched ? "Content Matched" : "Content Mismatched"} ${isConflicted ? "Conflicted" : "Not Conflicted"}`
                 );
             }
         }
@@ -167,24 +198,23 @@ export class ModuleMigration extends AbstractModule implements ICoreModule {
         //   Probably restored by the user by resolving A or B on other device, We should overwrite the storage
         //   Also do not fix it automatically. It should be overwritten by replication.
         const recoverable = errorFiles.filter((e) => {
-            return e.recordedSize === e.storageSize;
+            return e.recordedSize === e.storageSize && !e.isConflicted;
         });
         const unrecoverable = errorFiles.filter((e) => {
-            return e.recordedSize !== e.storageSize;
+            return e.recordedSize !== e.storageSize || e.isConflicted;
         });
+        const fileInfo = (e: (typeof errorFiles)[0]) => {
+            return `${e.path} (M: ${e.recordedSize}, A: ${e.actualSize}, S: ${e.storageSize}) ${e.isConflicted ? "(Conflicted)" : ""}`;
+        };
         const messageUnrecoverable =
             unrecoverable.length > 0
                 ? $msg("moduleMigration.fix0256.messageUnrecoverable", {
-                      filesNotRecoverable: unrecoverable
-                          .map((e) => `- ${e.path} (M: ${e.recordedSize}, A: ${e.actualSize}, S: ${e.storageSize})`)
-                          .join("\n"),
+                      filesNotRecoverable: unrecoverable.map((e) => `- ${fileInfo(e)}`).join("\n"),
                   })
                 : "";
 
         const message = $msg("moduleMigration.fix0256.message", {
-            files: recoverable
-                .map((e) => `- ${e.path} (M: ${e.recordedSize}, A: ${e.actualSize}, S: ${e.storageSize})`)
-                .join("\n"),
+            files: recoverable.map((e) => `- ${fileInfo(e)}`).join("\n"),
             messageUnrecoverable,
         });
         const CHECK_IT_LATER = $msg("moduleMigration.fix0256.buttons.checkItLater");

src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts

@@ -25,8 +25,8 @@ export class ConflictResolveModal extends Modal {
     title: string = "Conflicting changes";
 
     pluginPickMode: boolean = false;
-    localName: string = "Use Base";
-    remoteName: string = "Use Conflicted";
+    localName: string = "Base";
+    remoteName: string = "Conflicted";
     offEvent?: ReturnType<typeof eventHub.onEvent>;
 
     constructor(app: App, filename: string, diff: diff_result, pluginPickMode?: boolean, remoteName?: string) {
@@ -36,8 +36,8 @@ export class ConflictResolveModal extends Modal {
         this.pluginPickMode = pluginPickMode || false;
         if (this.pluginPickMode) {
             this.title = "Pick a version";
-            this.remoteName = `Use ${remoteName || "Remote"}`;
-            this.localName = "Use Local";
+            this.remoteName = `${remoteName || "Remote"}`;
+            this.localName = "Local";
         }
         // Send cancel signal for the previous merge dialogue
         // if not there, simply be ignored.
@@ -93,12 +93,13 @@ export class ConflictResolveModal extends Modal {
         const date2 =
             new Date(this.result.right.mtime).toLocaleString() + (this.result.right.deleted ? " (Deleted)" : "");
         div2.innerHTML = `
-<span class='deleted'>A:${date1}</span><br /><span class='added'>B:${date2}</span><br> 
+<span class='deleted'><span class='conflict-dev-name'>${this.localName}</span>: ${date1}</span><br>
+<span class='added'><span class='conflict-dev-name'>${this.remoteName}</span>: ${date2}</span><br>
         `;
-        contentEl.createEl("button", { text: this.localName }, (e) =>
+        contentEl.createEl("button", { text: `Use ${this.localName}` }, (e) =>
             e.addEventListener("click", () => this.sendResponse(this.result.right.rev))
         ).style.marginRight = "4px";
-        contentEl.createEl("button", { text: this.remoteName }, (e) =>
+        contentEl.createEl("button", { text: `Use ${this.remoteName}` }, (e) =>
             e.addEventListener("click", () => this.sendResponse(this.result.left.rev))
         ).style.marginRight = "4px";
         if (!this.pluginPickMode) {

src/modules/features/ModuleObsidianSetting.ts

@@ -140,6 +140,7 @@ export class ModuleObsidianSettings extends AbstractObsidianModule implements IO
                     jwtSub: settings.jwtSub,
                     useRequestAPI: settings.useRequestAPI,
                     bucketPrefix: settings.bucketPrefix,
+                    forcePathStyle: settings.forcePathStyle,
                 };
                 settings.encryptedCouchDBConnection = await this.encryptConfigurationItem(
                     JSON.stringify(connectionSetting),

src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts

@@ -859,26 +859,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
     }
 
     getMinioJournalSyncClient() {
-        const id = this.plugin.settings.accessKey;
-        const key = this.plugin.settings.secretKey;
-        const bucket = this.plugin.settings.bucket;
-        const prefix = this.plugin.settings.bucketPrefix;
-        const region = this.plugin.settings.region;
-        const endpoint = this.plugin.settings.endpoint;
-        const useCustomRequestHandler = this.plugin.settings.useCustomRequestHandler;
-        const customHeaders = this.plugin.settings.bucketCustomHeaders;
-        return new JournalSyncMinio(
-            id,
-            key,
-            endpoint,
-            bucket,
-            prefix,
-            this.plugin.simpleStore,
-            this.plugin,
-            useCustomRequestHandler,
-            region,
-            customHeaders
-        );
+        return new JournalSyncMinio(this.plugin.settings, this.plugin.simpleStore, this.plugin);
     }
     async resetRemoteBucket() {
         const minioJournal = this.getMinioJournalSyncClient();

src/modules/features/SettingDialogue/PaneRemoteConfig.ts

@@ -320,6 +320,7 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal
                 syncWarnMinio.addClass("op-warn-info");
 
                 new Setting(paneEl).autoWireText("endpoint", { holdValue: true });
+                new Setting(paneEl).autoWireToggle("forcePathStyle", { holdValue: true });
                 new Setting(paneEl).autoWireText("accessKey", { holdValue: true });
 
                 new Setting(paneEl).autoWireText("secretKey", {

styles.css

@@ -12,6 +12,11 @@
     background-color: var(--text-muted);
 }
 
+.conflict-dev-name {
+    display: inline-block;
+    min-width: 5em;
+}
+
 .op-scrollable {
     overflow-y: scroll;
     /* min-height: 280px; */

updates.md

@@ -1,3 +1,41 @@
+## 0.25.16
+
+4th September, 2025
+
+### Improved
+- Improved connectivity for P2P connections
+- The connection to the signalling server can now be disconnected while in the background or when explicitly disconnected.
+  - These features use a patch that has not been incorporated upstream.
+  - This patch is available at [vrtmrz/trystero](https://github.com/vrtmrz/trystero).
+
+## 0.25.15
+
+3rd September, 2025
+
+### Improved
+
+- Now we can configure `forcePathStyle` for bucket synchronisation (#707).
+
+
+## 0.25.14
+
+2nd September, 2025
+
+### Fixed
+
+- Opening IndexedDB handling has been ensured.
+- Migration check of corrupted files detection has been fixed.
+    - Now informs us about conflicted files as non-recoverable, but noted so.
+    - No longer errors on not-found files.
+
+## 0.25.13
+
+1st September, 2025
+
+### Fixed
+
+- Conflict resolving dialogue now properly displays the changeset name instead of A or B (#691).
+
 ## 0.25.12
 
 29th August, 2025
@@ -35,26 +73,6 @@
 - Some files have been moved to better reflect their purpose and improve maintainability.
 - The extensive LiveSyncLocalDB has been split into separate files for each role.
 
-## 0.25.9
-
-20th August, 2025
-
-### Fixed
-
-- CORS Checking messages now use replacements.
-- Configuring CORS setting via the UI now respects the existing rules.
-- Now startup-checking works correctly again, performs migration check serially and then it will also fix starting LiveSync or start-up sync. (#696)
-- Statusline in editor now supported 'Bases'.
-
-## 0.25.8
-
-18th August, 2025
-
-### New feature
-
-- Insecure chunk detection has been implemented.
-    - A notification dialogue will be shown if any insecure chunks are detected; these may have been created by v0.25.6 due to its issue. If this dialogue appears, please ensure you rebuild the database after backing it up.
-
 ### Fixed
 
 - Unexpected `Failed to obtain PBKDF2 salt` or similar errors during bucket-synchronisation no longer occur.

updates_old.md

@@ -11,6 +11,25 @@ As a result, this is the first time in a while that forward compatibility has be
 
 ---
 
+## 0.25.9
+
+20th August, 2025
+
+### Fixed
+
+- CORS Checking messages now use replacements.
+- Configuring CORS setting via the UI now respects the existing rules.
+- Now startup-checking works correctly again, performs migration check serially and then it will also fix starting LiveSync or start-up sync. (#696)
+- Statusline in editor now supported 'Bases'.
+
+## 0.25.8
+
+18th August, 2025
+
+### New feature
+
+- Insecure chunk detection has been implemented.
+    - A notification dialogue will be shown if any insecure chunks are detected; these may have been created by v0.25.6 due to its issue. If this dialogue appears, please ensure you rebuild the database after backing it up.
 
 ## 0.25.7