fix: handle error for addons

CyanSalt · Oct 24, 2023 · 626efb1 · 626efb1
1 parent 7e6644e
commit 626efb1
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 23 deletions.
diff --git a/api/modules/addon.ts b/api/modules/addon.ts
@@ -72,6 +72,20 @@ interface AddonContext {
 
 const loadedAddonContexts: AddonContext[] = []
 
+function loadAddonEntry(addon: AddonInfo): APIAddon {
+  if (addon.name === 'custom.js') {
+    try {
+      const userDataPath = app.isPackaged()
+        ? path.join(app.getPath('userData'), 'User')
+        : path.join(app.getPath(), 'userdata')
+      return require(path.join(userDataPath, addon.name))
+    } catch {
+      return () => {/* noop */}
+    }
+  }
+  return require(addon.entry)
+}
+
 function loadAddon(addon: AddonInfo, api: CompatableAPI) {
   if (loadedAddonContexts.some(item => item.addon.name === addon.name)) return
   // Reserved names
@@ -84,20 +98,12 @@ function loadAddon(addon: AddonInfo, api: CompatableAPI) {
   // Reactivity scope
   const scope = effectScope()
   scope.run(() => {
-    let processor: APIAddon
-    if (addon.name === 'custom.js') {
-      try {
-        const userDataPath = app.isPackaged()
-          ? path.join(app.getPath('userData'), 'User')
-          : path.join(app.getPath(), 'userdata')
-        processor = require(path.join(userDataPath, addon.name))
-      } catch {
-        processor = () => {/* noop */}
-      }
-    } else {
-      processor = require(addon.entry)
+    try {
+      const processor = loadAddonEntry(addon)
+      processor(clonedAPI)
+    } catch (err) {
+      app.triggerError(err)
     }
-    processor(clonedAPI)
   })
   addCommasModule(undefined)
   loadedAddonContexts.push({ addon, scope })

diff --git a/api/modules/app.ts b/api/modules/app.ts
@@ -34,6 +34,14 @@ function getManifest(): Record<string, any> {
   return require(path.join(getPath(), 'package.json'))
 }
 
+function triggerError(err: Error) {
+  if (isMainProcess()) {
+    process.emit('uncaughtException', err)
+  } else {
+    console.error(err)
+  }
+}
+
 function onCleanup(this: APIContext, callback: () => void) {
   events.once(`unload:${this.__name__}`, callback)
 }
@@ -78,6 +86,7 @@ export {
   getPath,
   getVersion,
   getManifest,
+  triggerError,
   onCleanup,
   effect,
   onInvalidate,

diff --git a/api/types.ts b/api/types.ts
@@ -1,12 +1,12 @@
-import type * as Main from './main'
-import type * as Renderer from './renderer'
+import type * as main from './main'
+import type * as renderer from './renderer'
 
 type MixValues<T, U> = {
   [K in keyof T]: T[K] & U
 }
 
-export type MainAPI = typeof Main
-export type RendererAPI = typeof Renderer
+export type MainAPI = typeof main
+export type RendererAPI = typeof renderer
 export type API = MainAPI & RendererAPI
 export type CompatableAPI = MainAPI | RendererAPI
 

diff --git a/build/pack.mjs b/build/pack.mjs
@@ -97,7 +97,7 @@ const options = {
     ? pkg.name : pkg.productName,
   out: 'release/',
   overwrite: true,
-  asar: {
+  asar: process.env.DEBUG ? false : {
     // FIXME: node-pty does not support app.asar.unpacked currently
     unpack: '**/{*.node,node_modules/node-pty/**/*}',
   },

diff --git a/src/main/lib/message.ts b/src/main/lib/message.ts
@@ -4,18 +4,23 @@ import * as fileIcon from 'file-icon'
 import { readFile, watchFile, writeFile } from '../utils/file'
 import { execa, until } from '../utils/helper'
 import { notify } from '../utils/notification'
-import { broadcast } from './frame'
+import { broadcast, hasWindow } from './frame'
 
 let currentBouncingId = -1
 
+function reportError(error: Error) {
+  console.error(error)
+  if (hasWindow()) {
+    broadcast('uncaught-error', String(error))
+  }
+}
+
 function handleMessages() {
   process.on('uncaughtException', error => {
-    console.error(error)
-    broadcast('uncaught-error', String(error))
+    reportError(error)
   })
   process.on('unhandledRejection', (error: Error) => {
-    console.error(error)
-    broadcast('uncaught-error', String(error))
+    reportError(error)
   })
   app.on('before-quit', () => {
     broadcast('before-quit')