resolve: comments

Author: vpbs2

packages/duckdb-wasm/src/bindings/bindings_browser_base.ts

@@ -91,9 +91,11 @@ export abstract class DuckDBBrowserBindings extends DuckDBBindingsBase {
                 const response = fetchWithProgress();
 
                 const initiateStreaming = async () => {
-                    await WebAssembly.instantiateStreaming(response, imports).then(output => {
-                        success(output.instance, output.module);
-                    }).catch(error => {
+                    try{
+                        await WebAssembly.instantiateStreaming(response, imports).then(output => {
+                            success(output.instance, output.module);
+                        });
+                    } catch (error: any) {
                         this.logger.log({
                             timestamp: new Date(),
                             level: LogLevel.ERROR,
@@ -102,8 +104,9 @@ export abstract class DuckDBBrowserBindings extends DuckDBBindingsBase {
                             event: LogEvent.ERROR,
                             value: 'Failed to instantiate WASM: ' + error,
                         });
+
                         throw new Error(error);
-                    });
+                    }
                 };
 
                 initiateStreaming();
@@ -113,9 +116,11 @@ export abstract class DuckDBBrowserBindings extends DuckDBBindingsBase {
                 const request = new Request(this.mainModuleURL);
 
                 const initiateStreaming = async () => {
-                    await WebAssembly.instantiateStreaming(fetch(request), imports).then(output => {
-                        success(output.instance, output.module);
-                    }).catch(error => {
+                    try {
+                        await WebAssembly.instantiateStreaming(fetch(request), imports).then(output => {
+                            success(output.instance, output.module);
+                        })
+                    } catch (error: any){
                         this.logger.log({
                             timestamp: new Date(),
                             level: LogLevel.ERROR,
@@ -124,8 +129,9 @@ export abstract class DuckDBBrowserBindings extends DuckDBBindingsBase {
                             event: LogEvent.ERROR,
                             value: 'Failed to instantiate WASM: ' + error,
                         });
+
                         throw new Error(error);
-                    });
+                    }
                 };
 
                 initiateStreaming();

packages/duckdb-wasm/src/bindings/bindings_browser_eh.ts

@@ -17,12 +17,12 @@ export class DuckDB extends DuckDBBrowserBindings {
     }
 
     /** Instantiate the bindings */
-    protected instantiateImpl(moduleOverrides: Partial<DuckDBModule>): Promise<DuckDBModule> {
+    protected async instantiateImpl(moduleOverrides: Partial<DuckDBModule>): Promise<DuckDBModule> {
         try{
             const wasm = this.instantiateWasm.bind(this);
             const locateFile = this.locateFile.bind(this);
 
-            return DuckDBWasm({
+            return await DuckDBWasm({
                 ...moduleOverrides,
                 instantiateWasm: wasm,
                 locateFile: locateFile,