Skip to content

Commit 3b4c5cc

Browse files
authored
[file_packager] Convert metadata handling to async. NFC (#24882)
I plan on converting the rest as a followup.
1 parent 0331e82 commit 3b4c5cc

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

tools/file_packager.py

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,32 +1115,25 @@ def generate_js(data_target, data_files, metadata):
11151115
if options.support_node:
11161116
node_support_code = '''
11171117
if (isNode) {
1118-
require('fs').readFile(metadataUrl, 'utf8', (err, contents) => {
1119-
if (err) {
1120-
return Promise.reject(err);
1121-
} else {
1122-
loadPackage(JSON.parse(contents));
1123-
}
1124-
});
1125-
return;
1118+
var fsPromises = require('fs/promises');
1119+
var contents = await fsPromises.readFile(metadataUrl, 'utf8');
1120+
return loadPackage(JSON.parse(contents));
11261121
}'''.strip()
11271122

11281123
ret += '''
11291124
Module['removeRunDependency']('%(metadata_file)s');
11301125
}
11311126
1132-
function runMetaWithFS() {
1127+
async function runMetaWithFS() {
11331128
Module['addRunDependency']('%(metadata_file)s');
11341129
var metadataUrl = Module['locateFile'] ? Module['locateFile']('%(metadata_file)s', '') : '%(metadata_file)s';
11351130
%(node_support_code)s
1136-
fetch(metadataUrl)
1137-
.then((response) => {
1138-
if (response.ok) {
1139-
return response.json();
1140-
}
1141-
return Promise.reject(new Error(`${response.status}: ${response.url}`));
1142-
})
1143-
.then(loadPackage);
1131+
var response = await fetch(metadataUrl);
1132+
if (!response.ok) {
1133+
throw new Error(`${response.status}: ${response.url}`);
1134+
}
1135+
var json = await response.json();
1136+
return loadPackage(json);
11441137
}
11451138
11461139
if (Module['calledRun']) {

0 commit comments

Comments
 (0)