andras/vault-link
andras/vault-link
Watch
1
0
Fork
You've already forked vault-link
 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 34

Fix cursor tracker

Browse source
This commit is contained in:
Andras Schmelczer 2026-09-19 22:22:18 +01:00
commit 9bb219734f
1 changed files with 90 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
frontend/sync-client/src/sync-operations/cursor-tracker.ts
View file

@ -72,21 +72,27 @@ export class CursorTracker {
}
);
this.fileChangeNotifier.onFileChanged.add(async (relativePath) =>
this.updateLock.withLock(async () => {
this.fileChangeNotifier.onFileChanged.add(async (relativePath) => {
const cursors = await this.updateLock.withLock(async () => {
for (const clientCursor of this.knownRemoteCursors) {
if (
clientCursor.documentsWithCursors.some(
(document) =>
document.relative_path === relativePath
document.relative_path === relativePath ||
this.database.getDocumentByDocumentId(
document.document_id
)?.relativePath === relativePath
)
) {
clientCursor.upToDateness =
await this.getDocumentsUpToDateness(clientCursor);
}
}
})
);
return this.getRelevantAndPruneKnownClientCursors();
});
this.onRemoteCursorsUpdated.trigger(cursors);
});
}
/// Update the local cursors for the given documents.
@ -166,13 +172,20 @@ export class CursorTracker {
const result: MaybeOutdatedClientCursors[] = [];
const included = new Set<string>();
const relevantCursors = [];
const retainedCursors = [];
const retainedFuture = new Set<string>();
for (const clientCursors of [...this.knownRemoteCursors].reverse()) {
if (included.has(clientCursors.deviceId)) {
if (clientCursors.upToDateness === DocumentUpToDateness.Later) {
// Retain the latest future position so it can become relevant
// after the corresponding content or manifest is applied.
if (!retainedFuture.has(clientCursors.deviceId)) {
retainedCursors.unshift(clientCursors);
retainedFuture.add(clientCursors.deviceId);
}
continue;
}
if (clientCursors.upToDateness === DocumentUpToDateness.Later) {
if (included.has(clientCursors.deviceId)) {
continue;
}
@ -192,10 +205,10 @@ export class CursorTracker {
});
included.add(clientCursors.deviceId);
relevantCursors.unshift(clientCursors); // to reverse order back to normal
retainedCursors.unshift(clientCursors); // to reverse order back to normal
}
this.knownRemoteCursors = relevantCursors;
this.knownRemoteCursors = retainedCursors;
return result;
}