Skip to content

OPFS Error handling improvements #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhashimoto merged 4 commits into from
Jan 6, 2026
Merged

OPFS Error handling improvements #304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21cf856
Clear retryOps on error (#59)
stevensJourney Dec 30, 2025
c54197c
Update src/examples/OPFSCoopSyncVFS.js
stevensJourney Dec 30, 2025
774b80c
Reset dist/ to upstream/master
stevensJourney Dec 30, 2025
21d8f4f
remove async and await from releaseAccessHandle
stevensJourney Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions dist/wa-sqlite-async.mjs
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified dist/wa-sqlite-async.wasm
View file
Open in desktop
Binary file not shown.
18 changes: 2 additions & 16 deletions dist/wa-sqlite-jspi.mjs
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified dist/wa-sqlite-jspi.wasm
View file
Open in desktop
Binary file not shown.
18 changes: 2 additions & 16 deletions dist/wa-sqlite.mjs
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified dist/wa-sqlite.wasm
View file
Open in desktop
Binary file not shown.
29 changes: 18 additions & 11 deletions src/examples/OPFSCoopSyncVFS.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,17 +519,24 @@ export class OPFSCoopSyncVFS extends FacadeVFS {
this._module.retryOps.push((async () => {
// Acquire the Web Lock.
file.persistentFile.handleLockReleaser = await this.#acquireLock(file.persistentFile);

// Get access handles for the database and releated files in parallel.
this.log?.(`creating access handles for ${file.path}`)
await Promise.all(DB_RELATED_FILE_SUFFIXES.map(async suffix => {
const persistentFile = this.persistentFiles.get(file.path + suffix);
if (persistentFile) {
persistentFile.accessHandle =
await persistentFile.fileHandle.createSyncAccessHandle();
}
}));
file.persistentFile.isRequestInProgress = false;
try {
// Get access handles for the database and releated files in parallel.
this.log?.(`creating access handles for ${file.path}`)
await Promise.all(DB_RELATED_FILE_SUFFIXES.map(async suffix => {
const persistentFile = this.persistentFiles.get(file.path + suffix);
if (persistentFile) {
persistentFile.accessHandle =
await persistentFile.fileHandle.createSyncAccessHandle();
}
}));
} catch (e) {
this.log?.(`failed to create access handles for ${file.path}`, e);
// Close any of the potentially opened access handles
this.#releaseAccessHandle(file);
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The #releaseAccessHandle function is declared as async, meaning it returns a promise. Although it currently contains no await statements, it's a good practice to await the call. This makes the code more robust and prevents potential race conditions if the function's implementation becomes truly asynchronous in the future.

Suggested change
this.#releaseAccessHandle(file);
await this.#releaseAccessHandle(file);

Copy link
Contributor Author

@stevensJourney stevensJourney Dec 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why this method is marked as async since it doesn't contain any await statements internally, but it's probably safer to await the call here to handle the async signature correctly.

Copy link
Owner

@rhashimoto rhashimoto Dec 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stevensJourney You're right, there's no reason for #releaseAccessHandle() to be async or contain any async code. I don't know what I was thinking there. Let's just fix that instead by:

Everything else LGTM!

Copy link
Contributor Author

@stevensJourney stevensJourney Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me :) . I've made those changes.

throw e;
} finally {
file.persistentFile.isRequestInProgress = false;
}
})());
return this._module.retryOps.at(-1);
}
Expand Down
7 changes: 5 additions & 2 deletions src/sqlite-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,8 +873,11 @@ export function Factory(Module) {
// Wait for all pending retry operations to complete. This is
// normally empty on the first loop iteration.
if (Module.retryOps.length) {
await Promise.all(Module.retryOps);
Module.retryOps = [];
try {
await Promise.all(Module.retryOps);
} finally {
Module.retryOps = [];
}
}

rc = await f();
Expand Down