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

use allSettled

Browse source
This commit is contained in:
Andras Schmelczer 2025-11-23 15:09:35 +00:00
parent 83c15a77c3
commit 17fa584ea1
5 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/sync-client/src/persistence/database.ts
View file

@ -183,7 +183,7 @@ export class Database {
const currentPromises = entry.updates;
entry.updates = [...currentPromises, promise];
await Promise.all(currentPromises);
await Promise.allSettled(currentPromises);
return entry;
}

23
frontend/sync-client/src/sync-operations/syncer.ts
View file

@ -26,6 +26,8 @@ export class Syncer {
private readonly remainingOperationsListeners: ((
remainingOperations: number
) => unknown)[] = [];
// FIFO to limit the number of concurrent sync operations
private readonly syncQueue: PQueue;
private _isFirstSyncComplete = false;
@ -83,15 +85,6 @@ export class Syncer {
this.remainingOperationsListeners.push(listener);
}
public removeRemainingOperationsListener(
listener: (remainingOperations: number) => unknown
): void {
const index = this.remainingOperationsListeners.indexOf(listener);
if (index !== -1) {
this.remainingOperationsListeners.splice(index, 1);
}
}
public async syncLocallyCreatedFile(
relativePath: RelativePath
): Promise<void> {
@ -280,10 +273,6 @@ export class Syncer {
return this.syncQueue.onEmpty();
}
public async reset(): Promise<void> {
await this.waitUntilFinished();
}
public async syncRemotelyUpdatedFile(
message: WebSocketVaultUpdate
): Promise<void> {
@ -416,7 +405,7 @@ export class Syncer {
}
}
const updates = Promise.all(
const updates = Promise.allSettled(
allLocalFiles.map(async (relativePath) => {
if (
this.database.getLatestDocumentByRelativePath(relativePath)
@ -474,7 +463,7 @@ export class Syncer {
})
);
const deletes = Promise.all(
const deletes = Promise.allSettled(
locallyPossiblyDeletedFiles.map(async ({ relativePath }) => {
this.logger.debug(
`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
@ -485,7 +474,7 @@ export class Syncer {
})
);
await Promise.all([updates, deletes]);
await Promise.allSettled([updates, deletes]);
}
/**
@ -498,7 +487,7 @@ export class Syncer {
return;
}
const [allLocalFiles, remote] = await Promise.all([
const [allLocalFiles, remote] = await Promise.allSettled([
this.operations.listFilesRecursively(),
this.syncQueue.add(async () => this.syncService.getAll())
]);

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

@ -54,7 +54,9 @@ export class Locks<T> {
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)));
await Promise.allSettled(
uniqueKeys.map(async (key) => this.waitForLock(key))
);
try {
return await fn();

2
frontend/test-client/src/agent/mock-agent.ts
View file

@ -127,7 +127,7 @@ export class MockAgent extends MockClient {
public async finish(): Promise<void> {
await this.client.setSetting("isSyncEnabled", true);
await Promise.all(this.pendingActions);
await Promise.allSettled(this.pendingActions);
await this.client.waitAndStop();
}

6
frontend/test-client/src/cli.ts
View file

@ -53,11 +53,13 @@ async function runTest({
}
try {
await Promise.all(clients.map(async (client) => client.init()));
await Promise.allSettled(clients.map(async (client) => client.init()));
for (let i = 0; i < iterations; i++) {
console.info(`Iteration ${i + 1}/${iterations}`);
await Promise.all(clients.map(async (client) => client.act()));
await Promise.allSettled(
clients.map(async (client) => client.act())
);
await sleep(100);
}