fix(bridge): window call should catch error

Signed-off-by: Innei <tukon479@gmail.com>
RSSNext · Dec 1, 2024 · 7bdf100 · 7bdf100
1 parent 605c3d6
commit 7bdf100
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/apps/main/src/tipc/reader.ts b/apps/main/src/tipc/reader.ts
@@ -68,7 +68,8 @@ export const readerRoute = {
     }
 
     await tts.setMetadata(input, OUTPUT_FORMAT.WEBM_24KHZ_16BIT_MONO_OPUS).catch((error) => {
-      return callWindowExpose(window).toast.error(error.message, {
+      const msg = typeof error === "string" ? error : error.message
+      return callWindowExpose(window).toast.error(msg || "unknown set voice error", {
         duration: 1000,
       })
     })

diff --git a/packages/shared/src/bridge.ts b/packages/shared/src/bridge.ts
@@ -89,7 +89,7 @@ function createProxy<T extends RenderGlobalContext>(window: BrowserWindow, path:
 
       try {
         return await window.webContents.executeJavaScript(
-          `globalThis.${PREFIX}?.${methodPath}?.(${args.map((arg) => JSON.stringify(arg)).join(",")})`,
+          `(async () => { try { return await globalThis.${PREFIX}?.${methodPath}?.(${args.map((arg) => JSON.stringify(arg)).join(",")}) } catch (err) { console.error('Failed to executeJavaScript: ${methodPath}', err) } })()`,
         )
       } catch (err) {
         console.error(`Failed to executeJavaScript: ${methodPath}`, err)