public/obsidian-livesync
1
0 Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-10-31 21:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(syncguard): isolate CouchDB catch-up from P2P activity

Browse Source
This commit is contained in:
Artem Ovchinnikov committed 2026-10-21 21:44:17 +03:00
1 parent ee0272a65f
commit bc185d8bd0
2 files changed
+39 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/serviceFeatures/syncGuard/index.ts
+4 -4
View File
@@ -73,14 +73,14 @@ export function useSyncGuardFeature(host: LiveSyncCore, createOverlay: SyncGuard
return;
}
if (guard.presentation.phase === "observing" &&
services.replicator.finiteReplicationActivityCount.value > 0) {
services.replicator.couchDbCatchUpActivityCount.value > 0) {
return;
}
guard.resume(Boolean(isEnabled()), settings.syncGuardMinimumFiles);
guard.finiteActivityChanged(services.replicator.finiteReplicationActivityCount.value > 0, readPendingCount(), Date.now());
guard.finiteActivityChanged(services.replicator.couchDbCatchUpActivityCount.value > 0, readPendingCount(), Date.now());
};
const onFiniteChanged = () => {
const active = services.replicator.finiteReplicationActivityCount.value > 0;
const active = services.replicator.couchDbCatchUpActivityCount.value > 0;
// Continuous replication can restart its finite pull following an internal reconnect,
// without an Obsidian onResumed notification. A new bounded transfer gets its own window.
if (active && guard.presentation.phase === "idle" && !guard.wasBypassed && isEnabled()) beginCatchUp();
@@ -101,7 +101,7 @@ export function useSyncGuardFeature(host: LiveSyncCore, createOverlay: SyncGuard
onSettingsChanged();
});
const finite = services.replicator.finiteReplicationActivityCount;
const finite = services.replicator.couchDbCatchUpActivityCount;
const replication = services.replicator.replicationStatics;
const pendingSources = [
services.replication.replicationResultCount,