Merge pull request #6 from devrev/fix/dashboard-wasm-bala

fix: duckdb instatiation error fix

Author: ujaval403

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

@@ -34,7 +34,7 @@ export abstract class DuckDBBrowserBindings extends DuckDBBindingsBase {
     }
 
     /** Instantiate the wasm module */
-    protected instantiateWasm(
+    protected async instantiateWasm(
         // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
         imports: any,
         success: (instance: WebAssembly.Instance, module: WebAssembly.Module) => void,
@@ -89,15 +89,53 @@ export abstract class DuckDBBrowserBindings extends DuckDBBindingsBase {
                 };
                 // Instantiate streaming
                 const response = fetchWithProgress();
-                WebAssembly.instantiateStreaming(response, imports).then(output => {
-                    success(output.instance, output.module);
-                });
+
+                const initiateStreaming = async () => {
+                    try{
+                        const output = await WebAssembly.instantiateStreaming(response, imports);
+                        success(output.instance, output.module);
+                       
+                    } catch (error: any) {
+                        this.logger.log({
+                            timestamp: new Date(),
+                            level: LogLevel.ERROR,
+                            origin: LogOrigin.BINDINGS,
+                            topic: LogTopic.INSTANTIATE,
+                            event: LogEvent.ERROR,
+                            value: 'Failed to instantiate WASM: ' + error,
+                        });
+
+                        throw error;
+                    }
+                };
+
+                await initiateStreaming();
+
             } else {
                 console.warn('instantiating without progress handler since transform streams are unavailable');
                 const request = new Request(this.mainModuleURL);
-                WebAssembly.instantiateStreaming(fetch(request), imports).then(output => {
-                    success(output.instance, output.module);
-                });
+
+                const initiateStreaming = async () => {
+                    try {
+                        const output = await WebAssembly.instantiateStreaming(fetch(request), imports);
+                        success(output.instance, output.module);
+
+                    } catch (error: any){
+                        this.logger.log({
+                            timestamp: new Date(),
+                            level: LogLevel.ERROR,
+                            origin: LogOrigin.BINDINGS,
+                            topic: LogTopic.INSTANTIATE,
+                            event: LogEvent.ERROR,
+                            value: 'Failed to instantiate WASM: ' + error,
+                        });
+
+                        throw error;
+                    }
+                };
+
+                await initiateStreaming();
+
             }
         } else if (typeof XMLHttpRequest == 'function') {
             // Otherwise we fall back to XHRs

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

@@ -2,7 +2,7 @@ import DuckDBWasm from './duckdb-eh.js';
 import { DuckDBBrowserBindings } from './bindings_browser_base';
 import { DuckDBModule } from './duckdb_module';
 import { DuckDBRuntime } from './runtime';
-import { Logger } from '../log';
+import { LogEvent, LogLevel, LogOrigin, LogTopic, Logger } from '../log';
 
 /** DuckDB bindings for the browser */
 export class DuckDB extends DuckDBBrowserBindings {
@@ -17,12 +17,28 @@ export class DuckDB extends DuckDBBrowserBindings {
     }
 
     /** Instantiate the bindings */
-    protected instantiateImpl(moduleOverrides: Partial<DuckDBModule>): Promise<DuckDBModule> {
-        return DuckDBWasm({
-            ...moduleOverrides,
-            instantiateWasm: this.instantiateWasm.bind(this),
-            locateFile: this.locateFile.bind(this),
-        });
+    protected async instantiateImpl(moduleOverrides: Partial<DuckDBModule>): Promise<DuckDBModule> {
+        try{
+            const wasm = this.instantiateWasm.bind(this);
+            const locateFile = this.locateFile.bind(this);
+
+            return await DuckDBWasm({
+                ...moduleOverrides,
+                instantiateWasm: wasm,
+                locateFile: locateFile,
+            });
+        } catch (error : any) {
+            this.logger.log({
+                timestamp: new Date(),
+                level: LogLevel.ERROR,
+                origin: LogOrigin.BINDINGS,
+                topic: LogTopic.INSTANTIATE,
+                event: LogEvent.ERROR,
+                value: 'Failed to instantiate WASM: ' + error,
+            });
+
+            throw error;
+        }
     }
 }