Add error hander

monochromer · Dec 13, 2023 · 500a04f · 500a04f
1 parent f14b26f
commit 500a04f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/scripts/main.js b/scripts/main.js
@@ -2,7 +2,7 @@ import { formatFileSize, parseFileName } from './utils.js';
 const worker = new Worker(new URL('worker.js', import.meta.url))
 
 function subsetFont(file, options) {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     const opts = {
       'desubroutinize': false,
       'no-hinting': false,
@@ -29,9 +29,13 @@ function subsetFont(file, options) {
     worker.addEventListener('message', function onWorkerMessage(event) {
       const { type, payload } = event.data
 
-      if (type === 'file' && fileId === payload.fileId) {
+      if (fileId === payload.fileId) {
         worker.removeEventListener('message', onWorkerMessage)
-        resolve(payload)
+        if (type === 'file' ) {
+          resolve(payload)
+        } else if (type === 'error') {
+          reject(payload.error)
+        }
       }
     })
   })

diff --git a/scripts/worker.js b/scripts/worker.js
@@ -69,9 +69,9 @@ pythonSourcePromise = loadPythonSource()
   .catch(console.error)
 
 self.addEventListener('message', async (event) => {
-  try {
-    const { type, payload } = event.data
+  const { type, payload } = event.data
 
+  try {
     if (type === 'file') {
       const pythonSource = await pythonSourcePromise
       const fileBuffer = await payload.file.arrayBuffer()
@@ -87,5 +87,12 @@ self.addEventListener('message', async (event) => {
     }
   } catch (error) {
     console.error(error)
+    self.postMessage({
+      type: 'error',
+      payload: {
+        fileId: payload.fileId,
+        error
+      }
+    })
   }
 })