[file_packager] Convert openDatabase to async/await. NFC #24883

sbc100 · 2025-08-07T23:38:56Z

Followup to #24882

sbc100 · 2025-08-07T23:42:12Z

Best viewed with "hide whitespace".

sbc100 · 2025-08-07T23:42:52Z

I hope you don't mind me splitting this up into small peices like this. Its easier for me to get my head around each step on its own and I hope its easier to review.

kripken

lgtm % question

+1 for the splitting up!

kripken · 2025-08-07T23:49:01Z

tools/file_packager.py

-        code += '''
-            if (isNode) {
-              return errback();
-            }'''


Looks like node always errored. Is this fixing that path?

(do we test it?)

I think the typeof indexedDB == 'undefined' just below should be enough to handle the node case.

Hmm.. maybe I should split that out, or at least see why it was added.

This was added back in emscripten-core#22802 but seems redundant since the check just below for the indexedDB global should be enough to handle the node case. Split out from emscripten-core#24883

This was added back in #22802 but seems redundant since the check just below for the indexedDB global should be enough to handle the node case. Split out from #24883

Followup to emscripten-core#24882

Followup to emscripten-core#24882 and emscripten-core#24883

lkwinta · 2025-08-08T09:25:39Z

tools/file_packager.py

@@ -805,34 +805,32 @@ def generate_js(data_target, data_files, metadata):
        var DB_VERSION = 1;
        var METADATA_STORE_NAME = 'METADATA';
        var PACKAGE_STORE_NAME = 'PACKAGES';
-        function openDatabase(callback, errback) {
+        async function openDatabase() {
          if (typeof indexedDB == 'undefined') {
            return errback('using IndexedDB to cache data can only be done on a web page or in a web worker');


@sbc100 @kripken I think that this introduces a bug, it should be be throw or promise reject since errback doesn't exist anymore

Good point! Will fix

Looks like this went unnoticed because the errback is not defined error was caught an the fallback was run anyway:

$ node ./src.js ReferenceError: errback is not defined at openDatabase (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:173:13) at runWithFS (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:333:9) at callRuntimeCallbacks (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:1164:26) at preRun (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:841:3) at run (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:4658:3) at Object.removeRunDependency (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:950:7) at loadPackage (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:362:34) at runMetaWithFS (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:371:18) falling back to default preload behavior done

Still worth fixing though.

Fixed in #24886

This went unnoticed by the tests because the calling code has a `.catch` handler that calls the fallback function. So the test still passed but with a bunch of extra output: ``` ReferenceError: errback is not defined at openDatabase (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:173:13) at runWithFS (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:333:9) at callRuntimeCallbacks (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:1164:26) at preRun (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:841:3) at run (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:4658:3) at Object.removeRunDependency (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:950:7) at loadPackage (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:362:34) at runMetaWithFS (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:371:18) falling back to default preload behavior done ``` Followup to emscripten-core#24883

Followup to emscripten-core#24882 and emscripten-core#24883

This went unnoticed by the tests because the calling code has a `.catch` handler that calls the fallback function. So the test still passed but with a bunch of extra output: ``` ReferenceError: errback is not defined at openDatabase (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:173:13) at runWithFS (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:333:9) at callRuntimeCallbacks (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:1164:26) at preRun (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:841:3) at run (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:4658:3) at Object.removeRunDependency (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:950:7) at loadPackage (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:362:34) at runMetaWithFS (/usr/local/google/home/sbc/dev/wasm/emscripten/out/test/src.js:371:18) falling back to default preload behavior done ``` Followup to #24883

Followup to emscripten-core#24882 and emscripten-core#24883

The 3 functions related to IDB caching of preload data are now marked as `async`. This means that they return promises instead of using callbacks. Followup to #24882 and #24883

Part 4 in the sequence following emscripten-core#24882, emscripten-core#24883 and emscripten-core#24885.

Part 4 in the sequence following #24882, #24883 and #24885.

sbc100 requested a review from kripken August 7, 2025 23:39

sbc100 mentioned this pull request Aug 7, 2025

[file_packager.py] Fix errback call in fetchRemotePackage #24871

Closed

sbc100 requested a review from dschuff August 7, 2025 23:42

kripken approved these changes Aug 7, 2025

View reviewed changes

sbc100 mentioned this pull request Aug 7, 2025

[file_packager] Remove redundant isNode check #24884

Merged

sbc100 force-pushed the file_packager_async_part2 branch from fd6035c to c232a88 Compare August 8, 2025 00:21

[file_packager] Convert openDatabase to async/await. NFC

466604a

Followup to emscripten-core#24882

sbc100 force-pushed the file_packager_async_part2 branch from c232a88 to 466604a Compare August 8, 2025 00:25

sbc100 merged commit 4c3f383 into emscripten-core:main Aug 8, 2025
4 of 13 checks passed

sbc100 deleted the file_packager_async_part2 branch August 8, 2025 00:26

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packager] Convert checkCachedPackage to async/await. NFC

84aafea

Followup to emscripten-core#24882 and emscripten-core#24883

sbc100 mentioned this pull request Aug 8, 2025

[file_packager] Convert preload caching functions to async. NFC #24885

Merged

lkwinta reviewed Aug 8, 2025

View reviewed changes

sbc100 mentioned this pull request Aug 8, 2025

Fix reference for undefined errback. NFC #24886

Merged

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packager] Convert checkCachedPackage to async/await. NFC

31887e3

Followup to emscripten-core#24882 and emscripten-core#24883

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packager] Convert checkCachedPackage to async/await. NFC

ae82d77

Followup to emscripten-core#24882 and emscripten-core#24883

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packager] Convert checkCachedPackage to async/await. NFC

89deaf7

Followup to emscripten-core#24882 and emscripten-core#24883

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packager] Convert checkCachedPackage to async/await. NFC

5f9ae76

Followup to emscripten-core#24882 and emscripten-core#24883

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packager] Convert checkCachedPackage to async/await. NFC

02b795e

Followup to emscripten-core#24882 and emscripten-core#24883

lkwinta mentioned this pull request Aug 8, 2025

[file_packager.py] Convert fetchRemotePackage to promise #24892

Closed

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packages] Convert fetchRemotePackage to async. NFC

f3c53a9

Part 4 in the sequence following emscripten-core#24882, emscripten-core#24883 and emscripten-core#24885.

sbc100 mentioned this pull request Aug 8, 2025

[file_packager] Convert fetchRemotePackage to async. NFC #24893

Merged

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packages] Convert fetchRemotePackage to async. NFC

f85499d

Part 4 in the sequence following emscripten-core#24882, emscripten-core#24883 and emscripten-core#24885.

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packages] Convert fetchRemotePackage to async. NFC

e02e4a4

Part 4 in the sequence following emscripten-core#24882, emscripten-core#24883 and emscripten-core#24885.

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packages] Convert fetchRemotePackage to async. NFC

e5efcc8

Part 4 in the sequence following emscripten-core#24882, emscripten-core#24883 and emscripten-core#24885.

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packages] Convert fetchRemotePackage to async. NFC

13305e0

Part 4 in the sequence following emscripten-core#24882, emscripten-core#24883 and emscripten-core#24885.

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 8, 2025

[file_packages] Convert fetchRemotePackage to async. NFC

f874811

Part 4 in the sequence following emscripten-core#24882, emscripten-core#24883 and emscripten-core#24885.

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 9, 2025

[file_packages] Convert fetchRemotePackage to async. NFC

6d48d48

Part 4 in the sequence following emscripten-core#24882, emscripten-core#24883 and emscripten-core#24885.

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 11, 2025

[file_packages] Convert fetchRemotePackage to async. NFC

88f4523

Part 4 in the sequence following emscripten-core#24882, emscripten-core#24883 and emscripten-core#24885.

sbc100 added a commit to sbc100/emscripten that referenced this pull request Aug 12, 2025

[file_packages] Convert fetchRemotePackage to async. NFC

13603a8

Part 4 in the sequence following emscripten-core#24882, emscripten-core#24883 and emscripten-core#24885.

sbc100 added a commit that referenced this pull request Aug 12, 2025

[file_packager] Convert fetchRemotePackage to async. NFC (#24893)

889fda2

Part 4 in the sequence following #24882, #24883 and #24885.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[file_packager] Convert openDatabase to async/await. NFC #24883

[file_packager] Convert openDatabase to async/await. NFC #24883

Uh oh!

sbc100 commented Aug 7, 2025

Uh oh!

sbc100 commented Aug 7, 2025

Uh oh!

sbc100 commented Aug 7, 2025

Uh oh!

kripken left a comment

Uh oh!

kripken Aug 7, 2025

Uh oh!

kripken Aug 7, 2025

Uh oh!

sbc100 Aug 7, 2025

Uh oh!

sbc100 Aug 7, 2025

Uh oh!

Uh oh!

lkwinta Aug 8, 2025 •

edited

Loading

Uh oh!

sbc100 Aug 8, 2025

Uh oh!

sbc100 Aug 8, 2025

Uh oh!

sbc100 Aug 8, 2025

Uh oh!

Uh oh!

[file_packager] Convert openDatabase to async/await. NFC #24883

[file_packager] Convert openDatabase to async/await. NFC #24883

Uh oh!

Conversation

sbc100 commented Aug 7, 2025

Uh oh!

sbc100 commented Aug 7, 2025

Uh oh!

sbc100 commented Aug 7, 2025

Uh oh!

kripken left a comment

Choose a reason for hiding this comment

Uh oh!

kripken Aug 7, 2025

Choose a reason for hiding this comment

Uh oh!

kripken Aug 7, 2025

Choose a reason for hiding this comment

Uh oh!

sbc100 Aug 7, 2025

Choose a reason for hiding this comment

Uh oh!

sbc100 Aug 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lkwinta Aug 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sbc100 Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

sbc100 Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

sbc100 Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lkwinta Aug 8, 2025 •

edited

Loading