Use async/await for LZ4.loadPackage

Author: sbc100

src/lib/liblz4.js

@@ -6,7 +6,7 @@
 
 #if LZ4
 addToLibrary({
-  $LZ4__deps: ['$FS', '$preloadPlugins', '$getUniqueRunDependency', '$addRunDependency', '$removeRunDependency'],
+  $LZ4__deps: ['$FS', '$preloadPlugins'],
   $LZ4: {
     DIR_MODE: {{{ cDefs.S_IFDIR | 0o777 }}},
     FILE_MODE: {{{ cDefs.S_IFREG | 0o777 }}},
@@ -20,7 +20,7 @@ addToLibrary({
       })();
       LZ4.CHUNK_SIZE = LZ4.codec.CHUNK_SIZE;
     },
-    loadPackage(pack, preloadPlugin) {
+    async loadPackage(pack, preloadPlugin) {
       LZ4.init();
       var compressedData = pack['compressedData'] || LZ4.codec.compressPackage(pack['data']);
       assert(compressedData['cachedIndexes'].length === compressedData['cachedChunks'].length);
@@ -52,14 +52,11 @@ addToLibrary({
           var fullname = file.filename;
           for (var plugin of preloadPlugins) {
             if (plugin['canHandle'](fullname)) {
-              var dep = getUniqueRunDependency('fp ' + fullname);
-              addRunDependency(dep);
-              var finish = () => removeRunDependency(dep);
               var byteArray = FS.readFile(fullname);
 #if ASSERTIONS
               assert(plugin['handle'].constructor.name === 'AsyncFunction', 'Filesystem plugin handlers must be async functions (See #24914)')
 #endif
-              plugin['handle'](byteArray, fullname).then(finish).catch(finish);
+              await plugin['handle'](byteArray, fullname);
               break;
             }
           }

test/codesize/test_codesize_file_preload.expected.js

@@ -112,10 +112,6 @@ Module["expectedDataFileDownloads"]++;
       function assert(check, msg) {
         if (!check) throw new Error(msg);
       }
-      for (var file of metadata["files"]) {
-        var name = file["filename"];
-        Module["addRunDependency"](`fp ${name}`);
-      }
       async function processPackageData(arrayBuffer) {
         assert(arrayBuffer, "Loading data file failed.");
         assert(arrayBuffer.constructor.name === ArrayBuffer.name, "bad input to processPackageData " + arrayBuffer.constructor.name);
@@ -138,7 +134,7 @@ Module["expectedDataFileDownloads"]++;
       if (!fetched) {
         fetched = await fetchPromise;
       }
-      processPackageData(fetched);
+      await processPackageData(fetched);
     }
     if (Module["calledRun"]) {
       runWithFS(Module);

test/codesize/test_codesize_file_preload.json

@@ -1,10 +1,10 @@
 {
-  "a.out.js": 22224,
-  "a.out.js.gz": 9207,
+  "a.out.js": 22168,
+  "a.out.js.gz": 9202,
   "a.out.nodebug.wasm": 1666,
   "a.out.nodebug.wasm.gz": 945,
-  "total": 23890,
-  "total_gz": 10152,
+  "total": 23834,
+  "total_gz": 10147,
   "sent": [
     "a (fd_write)"
   ],

tools/file_packager.py

@@ -689,15 +689,6 @@ def generate_preload_js(data_target, data_files, metadata):
 
   finish_handler = create_preloaded if options.use_preload_plugins else create_data
 
-  if not options.lz4:
-    # Data requests - for getting a block of data out of the big archive - have
-    # a similar API to XHRs
-    code += '''
-    for (var file of metadata['files']) {
-      var name = file['filename']
-      Module['addRunDependency'](`fp ${name}`);
-    }\n'''
-
   catch_handler = ''
   if options.export_es6:
     catch_handler += '''
@@ -735,7 +726,7 @@ def generate_preload_js(data_target, data_files, metadata):
       use_data = '''var compressedData = %s;
             compressedData['data'] = byteArray;
             assert(typeof Module['LZ4'] === 'object', 'LZ4 not present - was your app build with -sLZ4?');
-            Module['LZ4'].loadPackage({ 'metadata': metadata, 'compressedData': compressedData }, %s);
+            await Module['LZ4'].loadPackage({ 'metadata': metadata, 'compressedData': compressedData }, %s);
             Module['removeRunDependency']('datafile_%s');''' % (meta, "true" if options.use_preload_plugins else "false", js_manipulation.escape_for_js_string(data_target))
 
     if options.export_es6:
@@ -993,7 +984,7 @@ def generate_preload_js(data_target, data_files, metadata):
         async function preloadFallback(error) {
           console.error(error);
           console.error('falling back to default preload behavior');
-          processPackageData(await fetchRemotePackage(REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE));
+          await processPackageData(await fetchRemotePackage(REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE));
         }
 
         try {
@@ -1002,14 +993,14 @@ def generate_preload_js(data_target, data_files, metadata):
           var useCached = !!pkgMetadata;
           Module['preloadResults'][PACKAGE_NAME] = {fromCache: useCached};
           if (useCached) {
-            processPackageData(await fetchCachedPackage(db, PACKAGE_PATH + PACKAGE_NAME, pkgMetadata));
+            await processPackageData(await fetchCachedPackage(db, PACKAGE_PATH + PACKAGE_NAME, pkgMetadata));
           } else {
             var packageData = await fetchRemotePackage(REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE);
             try {
-              processPackageData(await cacheRemotePackage(db, PACKAGE_PATH + PACKAGE_NAME, packageData, {uuid:PACKAGE_UUID}))
+              await processPackageData(await cacheRemotePackage(db, PACKAGE_PATH + PACKAGE_NAME, packageData, {uuid:PACKAGE_UUID}))
             } catch (error) {
               console.error(error);
-              processPackageData(packageData);
+              await processPackageData(packageData);
             }
           }
         } catch(e) {
@@ -1037,7 +1028,7 @@ def generate_preload_js(data_target, data_files, metadata):
       if (!fetched) {
         fetched = await fetchPromise;
       }
-      processPackageData(fetched);\n'''
+      await processPackageData(fetched);\n'''
 
   ret += '''
     async function runWithFS(Module) {\n'''
@@ -1077,7 +1068,7 @@ def generate_preload_js(data_target, data_files, metadata):
       throw new Error(`${response.status}: ${response.url}`);
     }
     var json = await response.json();
-    await loadPackage(json);
+    loadPackage(json);
   }
 
   if (Module['calledRun']) {