Include error from wasm module in pretty print error message

openshift-knative · Apr 18, 2023 · bff8677 · bff8677
1 parent 33d820d
commit bff8677
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/expressjs/package.json b/expressjs/package.json
@@ -11,7 +11,7 @@
     "serve": "npm run build:prepare && bpm run serve:only",
     "serve:only": "node src/index",
     "test:ci": "npm run build:prepare && npm run lint && npm run test:jest",
-    "test:jest:watch": "npm run build:prepare && jest --watch",
+    "test:jest:watch": "npm run build:prepare && jest --watchAll",
     "test:jest": "npm run build:prepare && jest --detectOpenHandles --coverage",
     "lint:eslint": "eslint .",
     "build:prepare": "npm run build:cache-git && npm run build:extract-webjar",

diff --git a/expressjs/src/routes/events/pretty-print.js b/expressjs/src/routes/events/pretty-print.js
@@ -26,7 +26,7 @@ class PrinterFactory {
     // Instantiate the WASI module
     const instance = await wasi.instantiate(module, {})
 
-    return new Printer({ instance })
+    return new Printer({ instance, wasi })
   }
 }
 
@@ -37,10 +37,12 @@ class Printer {
    *
    * @param {Object} v - the params object
    * @param {WebAssembly.Instance} v.instance - the WebAssembly instance
+   * @param {WASI} v.wasi - the WASI instance
    */
-  constructor({ instance }) {
+  constructor({ instance, wasi }) {
     this.mem = instance.exports.memory
     this.fn = instance.exports.pp_print
+    this.wasi = wasi
   }
 
   /**
@@ -56,7 +58,8 @@ class Printer {
 
     const rc = this.fn(0)
     if (rc !== 0) {
-      throw new Error(`pp_print() returned ${rc}`)
+      const err = this.wasi.getStderrString()
+      throw new Error(`pp_print(${rc}): ${err}\nce: ${message}`)
     }
 
     return readFromMemory(this.mem)

diff --git a/frontend/scripts/webjar.ts b/frontend/scripts/webjar.ts
@@ -65,7 +65,7 @@ const webjars: Webjar[] = [{
     const tmpDir = os.tmpdir()
     const tmp = await fs.mkdtemp(`${tmpDir}/wasm-oci-`)
     const reg = new WasmRegistry(tmp)
-    const image = Image.parse('quay.io/cardil/cloudevents-pretty-print@sha256:01b30983dda5eb42a8baefb523eb50d7d0e539fb10d7ab9498a2a59f35036afb')
+    const image = Image.parse('quay.io/cardil/cloudevents-pretty-print@sha256:134269c7090bcb923d8b8764920bb25923e38411413eac7e4240524f1a40dc74')
     log(`Pulling image: ${green(image.toString())}`)
     const wasm = await reg.pull(image)
     p.addFile('META-INF/cloudevents-pretty-print.wasm', await fs.readFile(wasm.file), 'Wasm')