Skip to content

[file_packager] Use await when waiting for fetch to complete. #24992

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
merged 1 commit into from
Aug 21, 2025
Merged

[file_packager] Use await when waiting for fetch to complete. #24992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions test/code_size/test_codesize_file_preload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 22730,
"a.out.js.gz": 9405,
"a.out.js": 22699,
"a.out.js.gz": 9379,
"a.out.nodebug.wasm": 1733,
"a.out.nodebug.wasm.gz": 980,
"total": 24463,
"total_gz": 10385,
"total": 24432,
"total_gz": 10359,
"sent": [
"a (fd_write)"
],
Expand Down
19 changes: 5 additions & 14 deletions test/other/codesize/test_codesize_file_preload.expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,12 @@ Module["expectedDataFileDownloads"]++;
}
return packageData.buffer;
}
var fetchedCallback;
var fetchPromise;
var fetched = Module["getPreloadedPackage"]?.(REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE);
if (!fetched) {
// Note that we don't use await here because we want to execute the
// the rest of this function immediately.
fetchRemotePackage(REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE).then(data => {
if (fetchedCallback) {
fetchedCallback(data);
fetchedCallback = null;
} else {
fetched = data;
}
});
fetchPromise = fetchRemotePackage(REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE);
}
async function runWithFS(Module) {
function assert(check, msg) {
Expand Down Expand Up @@ -141,12 +134,10 @@ Module["expectedDataFileDownloads"]++;
Module["preloadResults"][PACKAGE_NAME] = {
fromCache: false
};
if (fetched) {
processPackageData(fetched);
fetched = null;
} else {
fetchedCallback = processPackageData;
if (!fetched) {
fetched = await fetchPromise;
}
processPackageData(fetched);
}
if (Module["calledRun"]) {
runWithFS(Module);
Expand Down
22 changes: 6 additions & 16 deletions tools/file_packager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,31 +1044,21 @@ def generate_js(data_target, data_files, metadata):
# Only tricky bit is the fetch is async, but also when runWithFS is called
# is async, so we handle both orderings.
ret += '''
var fetchedCallback;
var fetchPromise;
var fetched = Module['getPreloadedPackage']?.(REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE);

if (!fetched) {
// Note that we don't use await here because we want to execute the
// the rest of this function immediately.
fetchRemotePackage(REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE)
.then((data) => {
if (fetchedCallback) {
fetchedCallback(data);
fetchedCallback = null;
} else {
fetched = data;
}
})%s;
fetchPromise = fetchRemotePackage(REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE)%s;
}\n''' % catch_handler

code += '''
Module['preloadResults'][PACKAGE_NAME] = {fromCache: false};
if (fetched) {
processPackageData(fetched);
fetched = null;
} else {
fetchedCallback = processPackageData;
}\n'''
if (!fetched) {
fetched = await fetchPromise;
}
processPackageData(fetched);\n'''

ret += '''
async function runWithFS(Module) {\n'''
Expand Down