andras/vault-link
1
0
Fork 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 1

Fix edge cases

Browse source
This commit is contained in:
Andras Schmelczer 2025-11-22 20:14:31 +00:00
parent c3c2cafde5
commit a57ed5c4ae
3 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frontend/sync-client/src/utils/data-structures/locks.ts
View file

@ -49,14 +49,17 @@ export class Locks<T> {
fn: () => R | Promise<R>
): Promise<R> {
const keys = Array.isArray(keyOrKeys) ? keyOrKeys : [keyOrKeys];
keys.sort((a, b) => String(a).localeCompare(String(b))); // Ensure consistent order to prevent deadlocks
await Promise.all(keys.map(async (key) => this.waitForLock(key)));
// Deduplicate keys to prevent deadlock from acquiring same lock twice
const uniqueKeys = Array.from(new Set(keys));
uniqueKeys.sort((a, b) => String(a).localeCompare(String(b))); // Ensure consistent order to prevent deadlocks
await Promise.all(uniqueKeys.map(async (key) => this.waitForLock(key)));
try {
return await fn();
} finally {
keys.forEach((key) => {
uniqueKeys.forEach((key) => {
this.unlock(key);
});
}