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

@@ -138,7 +138,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": 22228,
+  "a.out.js.gz": 9212,
   "a.out.nodebug.wasm": 1666,
   "a.out.nodebug.wasm.gz": 945,
-  "total": 23890,
-  "total_gz": 10152,
+  "total": 23894,
+  "total_gz": 10157,
   "sent": [
     "a (fd_write)"
   ],

tools/file_packager.py

@@ -993,7 +993,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 +1002,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 +1037,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 +1077,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']) {