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

Fix race condition of client-side path deconflicting

Browse source
This commit is contained in:
Andras Schmelczer 2025-11-29 17:28:03 +00:00
parent 952e89343a
commit 10bde4bc3a
4 changed files with 77 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

39
frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
View file

@ -73,9 +73,16 @@ export class SafeFileSystemOperations implements FileSystemOperations {
);
}
public async exists(path: RelativePath): Promise<boolean> {
public async exists(
path: RelativePath,
skipLock: boolean = false
): Promise<boolean> {
this.logger.debug(`Checking if file '${path}' exists`);
return this.locks.withLock(path, async () => this.fs.exists(path));
if (skipLock) {
return this.fs.exists(path);
} else {
return this.locks.withLock(path, async () => this.fs.exists(path));
}
}
public async createDirectory(path: RelativePath): Promise<void> {
@ -92,19 +99,37 @@ export class SafeFileSystemOperations implements FileSystemOperations {
public async rename(
oldPath: RelativePath,
newPath: RelativePath
newPath: RelativePath,
skipLock: boolean = false
): Promise<void> {
this.logger.debug(`Renaming file '${oldPath}' to '${newPath}'`);
return this.safeOperation(
oldPath,
async () =>
this.locks.withLock([oldPath, newPath], async () =>
this.fs.rename(oldPath, newPath)
),
async () => {
if (skipLock) {
return this.fs.rename(oldPath, newPath);
} else {
return this.locks.withLock([oldPath, newPath], async () =>
this.fs.rename(oldPath, newPath)
);
}
},
"rename"
);
}
public tryLock(path: RelativePath): boolean {
return this.locks.tryLock(path);
}
public waitForLock(path: RelativePath) {
return this.locks.waitForLock(path);
}
public unlock(path: RelativePath) {
this.locks.unlock(path);
}
public reset(): void {
this.locks.reset();
}