Replace wrapAssetRequest promise argument with a callback

The flexibility may be useful later

Author: GarboMuffin

src/engine/runtime.js

@@ -3460,24 +3460,26 @@ class Runtime extends EventEmitter {
     /**
      * Wrap an asset loading promise with progress support.
      * @template T
-     * @param {Promise<T>} promise
+     * @param {() => Promise<T>} callback
      * @returns {Promise<T>}
      */
-    wrapAssetRequest (promise) {
+    wrapAssetRequest (callback) {
         this.totalAssetRequests++;
         this.emitAssetProgress();
 
-        return promise
-            .then(result => {
-                this.finishedAssetRequests++;
-                this.emitAssetProgress();
-                return result;
-            })
-            .catch(error => {
-                this.finishedAssetRequests++;
-                this.emitAssetProgress();
-                throw error;
-            });
+        const onSuccess = result => {
+            this.finishedAssetRequests++;
+            this.emitAssetProgress();
+            return result;
+        };
+
+        const onError = error => {
+            this.finishedAssetRequests++;
+            this.emitAssetProgress();
+            throw error;
+        };
+
+        return callback().then(onSuccess, onError);
     }
 }
 

src/serialization/sb2.js

@@ -500,7 +500,7 @@ const parseScratchAssets = function (object, runtime, topLevel, zip) {
             // the file name of the costume should be the baseLayerID followed by the file ext
             const assetFileName = `${costumeSource.baseLayerID}.${ext}`;
             const textLayerFileName = costumeSource.textLayerID ? `${costumeSource.textLayerID}.png` : null;
-            costumePromises.push(runtime.wrapAssetRequest(
+            costumePromises.push(runtime.wrapAssetRequest(() =>
                 deserializeCostume(costume, runtime, zip, assetFileName, textLayerFileName)
                     .then(() => loadCostume(costume.md5, costume, runtime, 2 /* optVersion */))
             ));
@@ -536,7 +536,7 @@ const parseScratchAssets = function (object, runtime, topLevel, zip) {
             // the file name of the sound should be the soundID (provided from the project.json)
             // followed by the file ext
             const assetFileName = `${soundSource.soundID}.${ext}`;
-            soundPromises.push(runtime.wrapAssetRequest(
+            soundPromises.push(runtime.wrapAssetRequest(() =>
                 deserializeSound(sound, runtime, zip, assetFileName)
                     .then(() => loadSound(sound, runtime, soundBank))
             ));

src/serialization/sb3.js

@@ -1115,7 +1115,7 @@ const parseScratchAssets = function (object, runtime, zip) {
         // we're always loading the 'sb3' representation of the costume
         // any translation that needs to happen will happen in the process
         // of building up the costume object into an sb3 format
-        return runtime.wrapAssetRequest(deserializeCostume(costume, runtime, zip)
+        return runtime.wrapAssetRequest(() => deserializeCostume(costume, runtime, zip)
             .then(() => loadCostume(costumeMd5Ext, costume, runtime)));
         // Only attempt to load the costume after the deserialization
         // process has been completed
@@ -1140,7 +1140,7 @@ const parseScratchAssets = function (object, runtime, zip) {
         // we're always loading the 'sb3' representation of the costume
         // any translation that needs to happen will happen in the process
         // of building up the costume object into an sb3 format
-        return runtime.wrapAssetRequest(deserializeSound(sound, runtime, zip)
+        return runtime.wrapAssetRequest(() => deserializeSound(sound, runtime, zip)
             .then(() => loadSound(sound, runtime, assets.soundBank)));
         // Only attempt to load the sound after the deserialization
         // process has been completed.

src/util/tw-asset-util.js

@@ -25,7 +25,7 @@ class AssetUtil {
             }
 
             if (file) {
-                return runtime.wrapAssetRequest(file.async('uint8array').then(data => runtime.storage.createAsset(
+                return runtime.wrapAssetRequest(() => file.async('uint8array').then(data => runtime.storage.createAsset(
                     assetType,
                     ext,
                     data,
@@ -35,7 +35,7 @@ class AssetUtil {
             }
         }
 
-        return runtime.wrapAssetRequest(runtime.storage.load(assetType, md5, ext));
+        return runtime.wrapAssetRequest(() => runtime.storage.load(assetType, md5, ext));
     }
 }
 

test/integration/tw_asset_progress.js

@@ -69,13 +69,13 @@ test('wrapAssetRequest', t => {
     });
 
     Promise.all([
-        runtime.wrapAssetRequest(Promise.resolve(1)),
-        runtime.wrapAssetRequest(Promise.resolve(2))
+        runtime.wrapAssetRequest(() => Promise.resolve(1)),
+        runtime.wrapAssetRequest(() => Promise.resolve(2))
     ]).then(results => {
         t.same(results, [1, 2]);
 
         // eslint-disable-next-line prefer-promise-reject-errors
-        runtime.wrapAssetRequest(Promise.reject(3)).catch(error => {
+        runtime.wrapAssetRequest(() => Promise.reject(3)).catch(error => {
             t.equal(error, 3);
             t.same(log, [
                 [0, 1],