From d5cb50194adf35c7804262a85186c374fec7be28 Mon Sep 17 00:00:00 2001 From: Mic Date: Fri, 28 Mar 2025 01:15:00 +0100 Subject: [PATCH] Improve error handling for calendar event data retrieval and JSON extraction --- js/mzta-menus.js | 8 ++++---- js/mzta-utils.js | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/js/mzta-menus.js b/js/mzta-menus.js index f2b3248a..d636261b 100644 --- a/js/mzta-menus.js +++ b/js/mzta-menus.js @@ -212,8 +212,8 @@ export class mzta_Menus { calendar_event_data = await cmd_GetCalendarEvent.sendPrompt(); // console.log(">>>>>>>>>>> calendar_event_data: " + calendar_event_data); }catch(err){ - console.error("[ThunderAI] Error getting calendar event data: ", JSON.stringify(err)); - browser.tabs.sendMessage(tabs[0].id, { command: "sendAlert", curr_tab_type: tabs[0].type, message: browser.i18n.getMessage("calendar_getting_data_error") + ": " + JSON.stringify(err) }); + console.error("[ThunderAI] Error getting calendar event data: ", err.message); + browser.tabs.sendMessage(tabs[0].id, { command: "sendAlert", curr_tab_type: tabs[0].type, message: browser.i18n.getMessage("calendar_getting_data_error") + ": " + err.message }); taWorkingStatus.stopWorking(); return {ok:'0'}; } @@ -221,8 +221,8 @@ export class mzta_Menus { try{ calendar_event_data_obj = extractJsonObject(calendar_event_data); }catch(err){ - console.error("[ThunderAI] Error extracting JSON object from calendar event data: ", JSON.stringify(err)); - browser.tabs.sendMessage(tabs[0].id, { command: "sendAlert", curr_tab_type: tabs[0].type, message: browser.i18n.getMessage("calendar_getting_data_error") + ": " + JSON.stringify(err) }); + console.error("[ThunderAI] Error extracting JSON object from calendar event data: ", err.message); + browser.tabs.sendMessage(tabs[0].id, { command: "sendAlert", curr_tab_type: tabs[0].type, message: browser.i18n.getMessage("calendar_getting_data_error") + ": " + err.message }); taWorkingStatus.stopWorking(); return {ok:'0'}; } diff --git a/js/mzta-utils.js b/js/mzta-utils.js index d2f0e0b5..a8e1bb34 100644 --- a/js/mzta-utils.js +++ b/js/mzta-utils.js @@ -340,10 +340,12 @@ export function extractJsonObject(inputString) { return jsonObject; } else { console.error("[ThunderAI] No JSON object found in the input string."); + throw new Error("No JSON object found in the input string."); return null; } } catch (error) { console.error("[ThunderAI] Error extracting JSON object:", error); + throw new Error("Error extracting JSON object: " + error.message); return null; } }