Improve error handling for calendar event data retrieval and JSON extraction
This commit is contained in:
parent
b349f958ce
commit
d5cb50194a
2 changed files with 6 additions and 4 deletions
|
|
@ -212,8 +212,8 @@ export class mzta_Menus {
|
||||||
calendar_event_data = await cmd_GetCalendarEvent.sendPrompt();
|
calendar_event_data = await cmd_GetCalendarEvent.sendPrompt();
|
||||||
// console.log(">>>>>>>>>>> calendar_event_data: " + calendar_event_data);
|
// console.log(">>>>>>>>>>> calendar_event_data: " + calendar_event_data);
|
||||||
}catch(err){
|
}catch(err){
|
||||||
console.error("[ThunderAI] Error getting calendar event data: ", 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") + ": " + 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") + ": " + err.message });
|
||||||
taWorkingStatus.stopWorking();
|
taWorkingStatus.stopWorking();
|
||||||
return {ok:'0'};
|
return {ok:'0'};
|
||||||
}
|
}
|
||||||
|
|
@ -221,8 +221,8 @@ export class mzta_Menus {
|
||||||
try{
|
try{
|
||||||
calendar_event_data_obj = extractJsonObject(calendar_event_data);
|
calendar_event_data_obj = extractJsonObject(calendar_event_data);
|
||||||
}catch(err){
|
}catch(err){
|
||||||
console.error("[ThunderAI] Error extracting JSON object from calendar event data: ", 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") + ": " + 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") + ": " + err.message });
|
||||||
taWorkingStatus.stopWorking();
|
taWorkingStatus.stopWorking();
|
||||||
return {ok:'0'};
|
return {ok:'0'};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -340,10 +340,12 @@ export function extractJsonObject(inputString) {
|
||||||
return jsonObject;
|
return jsonObject;
|
||||||
} else {
|
} else {
|
||||||
console.error("[ThunderAI] No JSON object found in the input string.");
|
console.error("[ThunderAI] No JSON object found in the input string.");
|
||||||
|
throw new Error("No JSON object found in the input string.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[ThunderAI] Error extracting JSON object:", error);
|
console.error("[ThunderAI] Error extracting JSON object:", error);
|
||||||
|
throw new Error("Error extracting JSON object: " + error.message);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue