Properly catch error inside MediaInfoModule

buzz · Sep 2, 2021 · cae7183 · cae7183
1 parent 85956e8
commit cae7183
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/__tests__/error.wasmLoading.test.js b/__tests__/error.wasmLoading.test.js
@@ -15,5 +15,7 @@ describe('Error on WASM loading', () => {
   })
 
   it('should return error via Promise', () =>
-    expect(MediaInfo({ locateFile: () => 'file_does_not_exist.wasm' })).rejects.toThrow())
+    expect(MediaInfo({ locateFile: () => 'file_does_not_exist.wasm' })).rejects.toThrow(
+      /no such file/
+    ))
 })
diff --git a/src/mediainfo.ts b/src/mediainfo.ts
@@ -191,14 +191,20 @@ function MediaInfoFactory(
   }
 
   // Wait for WASM module to be fetched and loaded
-  MediaInfoModuleFactory(mediaInfoModuleFactoryOpts).then((wasmModule: MediaInfoModule) => {
-    const format = mergedOptions.format === 'object' ? 'JSON' : mergedOptions.format
-    const wasmModuleInstance: MediaInfoWasmInterface = new wasmModule.MediaInfo(
-      format as FormatType,
-      mergedOptions.coverData as boolean
-    )
-    callback(new MediaInfo(wasmModuleInstance, mergedOptions))
-  })
+  MediaInfoModuleFactory(mediaInfoModuleFactoryOpts)
+    .then((wasmModule: MediaInfoModule) => {
+      const format = mergedOptions.format === 'object' ? 'JSON' : mergedOptions.format
+      const wasmModuleInstance: MediaInfoWasmInterface = new wasmModule.MediaInfo(
+        format as FormatType,
+        mergedOptions.coverData as boolean
+      )
+      callback(new MediaInfo(wasmModuleInstance, mergedOptions))
+    })
+    .catch((err) => {
+      if (errCallback) {
+        errCallback(err)
+      }
+    })
 }
 
 export type {