diff --git a/packages/api/src/utility/useController.js b/packages/api/src/utility/useController.js index 3e1b82d4c..6ab16c676 100644 --- a/packages/api/src/utility/useController.js +++ b/packages/api/src/utility/useController.js @@ -31,9 +31,14 @@ module.exports = function useController(app, electron, route, controller) { const handler = `${route.substring(1)}-${_.kebabCase(key)}`; // console.log('REGISTERING HANDLER', handler); electron.ipcMain.handle(handler, async (event, args) => { - const data = await controller[key](args); - // console.log('HANDLED API', handler, data); - return data; + try { + const data = await controller[key](args); + // console.log('HANDLED API', handler, data); + if (data === undefined) return null; + return data; + } catch (err) { + return { apiErrorMessage: err.message }; + } }); } @@ -68,7 +73,7 @@ module.exports = function useController(app, electron, route, controller) { res.json(data); } catch (e) { console.log(e); - res.status(500).json({ error: e.message }); + res.status(500).json({ apiErrorMessage: e.message }); } }); } diff --git a/packages/web/src/utility/api.ts b/packages/web/src/utility/api.ts index 261117506..cdcbb1831 100644 --- a/packages/web/src/utility/api.ts +++ b/packages/web/src/utility/api.ts @@ -3,6 +3,7 @@ import { writable } from 'svelte/store'; // import { cacheClean } from './cache'; import getElectron from './getElectron'; // import socket from './socket'; +import { showSnackbarError } from '../utility/snackbar'; let eventSource; let apiLogging = false; @@ -15,6 +16,16 @@ function wantEventSource() { } } +function processApiResponse(route, args, resp) { + if (apiLogging) { + console.log('<<< API RESPONSE', route, args, resp); + } + + if (resp?.apiErrorMessage) { + showSnackbarError(resp?.apiErrorMessage); + } +} + export async function apiCall(route: string, args: {} = undefined) { if (apiLogging) { console.log('>>> API CALL', route, args); @@ -23,11 +34,7 @@ export async function apiCall(route: string, args: {} = undefined) { const electron = getElectron(); if (electron) { const resp = await electron.invoke(route.replace('/', '-'), args); - - if (apiLogging) { - console.log('<<< API RESPONSE', route, args, resp); - } - + processApiResponse(route, args, resp); return resp; } else { const resp = await fetch(`${resolveApi()}/${route}`, { @@ -41,11 +48,7 @@ export async function apiCall(route: string, args: {} = undefined) { }); const json = await resp.json(); - - if (apiLogging) { - console.log('<<< API RESPONSE', route, args, json); - } - + processApiResponse(route, args, json); return json; } }