Merge pull request #245 from derekantrican/jonas0b1011001-error-handling

Fix typo & reworked error handling Fix #264
derekantrican · Mar 27, 2022 · 33c8056 · 33c8056
2 parents d99b8be + 663b1a3
commit 33c8056
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 28 deletions.
diff --git a/Code.gs b/Code.gs
@@ -153,17 +153,16 @@ function startSync(){
 
     targetCalendarName = calendar[0];
     var sourceCalendarURLs = calendar[1];
-    var colorId = calendar[2];
     var vevents;
 
     //------------------------ Fetch URL items ------------------------
     var responses = fetchSourceCalendars(sourceCalendarURLs);
     Logger.log("Syncing " + responses.length + " calendars to " + targetCalendarName);
 
     //------------------------ Get target calendar information------------------------
-    var targetCalendar = setupTargetCalendar(targetCalendarName, colorId);
+    var targetCalendar = setupTargetCalendar(targetCalendarName);
     targetCalendarId = targetCalendar.id;
-    Logger.log("Working on calendar: " + targetCalendarId + colorId !== undefined ? " with colorId: " + colorId : "");
+    Logger.log("Working on calendar: " + targetCalendarId);
 
     //------------------------ Parse existing events --------------------------
     if(addEventsToCalendar || modifyExistingEvents || removeEventsFromCalendar){
@@ -203,7 +202,7 @@ function startSync(){
         }, defaultMaxRetries);
 
       vevents.forEach(function(e){
-        processEvent(e, calendarTz, colorId);
+        processEvent(e, calendarTz);
       });
 
       Logger.log("Done processing events");

diff --git a/Helpers.gs b/Helpers.gs
@@ -45,9 +45,9 @@ function condenseCalendarMap(calendarMap){
     }
 
     if (index > -1)
-      result[index][1].push(mapping[0]);
+      result[index][1].push([mapping[0],mapping[2]]);
     else
-      result.push([ mapping[1], [ mapping[0] ], mapping[2] ]);
+      result.push([ mapping[1], [[mapping[0],mapping[2]]] ]);
   }
 
   return result;
@@ -73,25 +73,25 @@ function deleteAllTriggers(){
  */
 function fetchSourceCalendars(sourceCalendarURLs){
   var result = []
-  for (var url of sourceCalendarURLs){
-    url = url.replace("webcal://", "https://");
+  for (var source of sourceCalendarURLs){
+    var url = source[0].replace("webcal://", "https://");
+    var colorId = source[1];
 
     callWithBackoff(function() {
-      var urlResponse = UrlFetchApp.fetch(url, { 'validateHttpsCertificates' : false });
+      var urlResponse = UrlFetchApp.fetch(url, { 'validateHttpsCertificates' : false, 'muteHttpExceptions' : true });
       if (urlResponse.getResponseCode() == 200){
-        var urlContent = urlResponse.getContentText();
-        if(!urlContent.includes("BEGIN:VCALENDAR")){
+        var urlContent = RegExp("(BEGIN:VCALENDAR.*?END:VCALENDAR)", "s").exec(urlResponse.getContentText());
+        if(urlContent == null){
           Logger.log("[ERROR] Incorrect ics/ical URL: " + url);
           return;
         }
         else{
-          result.push(urlContent);
-          Logger.log("Result: " + result.length);
+          result.push([urlContent[0], colorId]);
           return;
         }     
       }
       else{ //Throw here to make callWithBackoff run again
-        throw "Error: Encountered " + urlReponse.getReponseCode() + " when accessing " + url; 
+        throw "Error: Encountered HTTP error " + urlResponse.getResponseCode() + " when accessing " + url; 
       }
     }, defaultMaxRetries);
   }
@@ -106,7 +106,7 @@ function fetchSourceCalendars(sourceCalendarURLs){
  * @param {string} targetCalendarName - The name of the calendar to return
  * @return {Calendar} The calendar retrieved or created
  */
-function setupTargetCalendar(targetCalendarName, colorId){
+function setupTargetCalendar(targetCalendarName){
   var targetCalendar = Calendar.CalendarList.list({showHidden: true}).items.filter(function(cal) {
     return ((cal.summaryOverride || cal.summary) == targetCalendarName) &&
                 (cal.accessRole == "owner" || cal.accessRole == "writer");
@@ -117,7 +117,6 @@ function setupTargetCalendar(targetCalendarName, colorId){
     targetCalendar = Calendar.newCalendar();
     targetCalendar.summary = targetCalendarName;
     targetCalendar.description = "Created by GAS";
-    targetCalendar.colorId = colorId;
     targetCalendar.timeZone = Calendar.Settings.get("timezone").value;
     targetCalendar = Calendar.Calendars.insert(targetCalendar);
   }
@@ -135,7 +134,9 @@ function setupTargetCalendar(targetCalendarName, colorId){
  */
 function parseResponses(responses){
   var result = [];
-  for (var resp of responses){
+  for (var itm of responses){
+    var resp = itm[0];
+    var colorId = itm[1];
     var jcalData = ICAL.parse(resp);
     var component = new ICAL.Component(jcalData);
 
@@ -146,6 +147,9 @@ function parseResponses(responses){
     }
 
     var allEvents = component.getAllSubcomponents("vevent");
+    if (colorId != undefined)
+      allEvents.forEach(function(event){event.addPropertyWithValue("color", colorId);});
+
     var calName = component.getFirstPropertyValue("x-wr-calname") || component.getFirstPropertyValue("name");
     if (calName != null)
       allEvents.forEach(function(event){event.addPropertyWithValue("parentCal", calName); });
@@ -192,11 +196,10 @@ function parseResponses(responses){
  *
  * @param {ICAL.Component} event - The event to process
  * @param {string} calendarTz - The timezone of the target calendar
- * @param {string} colorId - The colorId for the target calendar
  */
-function processEvent(event, calendarTz, colorId){
+function processEvent(event, calendarTz){
   //------------------------ Create the event object ------------------------
-  var newEvent = createEvent(event, calendarTz, colorId);
+  var newEvent = createEvent(event, calendarTz);
   if (newEvent == null)
     return;
 
@@ -246,10 +249,9 @@ function processEvent(event, calendarTz, colorId){
  *
  * @param {ICAL.Component} event - The event to process
  * @param {string} calendarTz - The timezone of the target calendar
- * @param {string} colorId - The color id for the target calendar events
  * @return {?Calendar.Event} The Calendar.Event that will be added to the target calendar
  */
-function createEvent(event, calendarTz, colorId){
+function createEvent(event, calendarTz){
   event.removeProperty('dtstamp');
   var icalEvent = new ICAL.Event(event, {strictExceptions: true});
   if (onlyFutureEvents && checkSkipEvent(event, icalEvent)){
@@ -450,8 +452,10 @@ function createEvent(event, calendarTz, colorId){
     newEvent.extendedProperties.private['rec-id'] = newEvent.extendedProperties.private['id'] + "_" + newEvent.recurringEventId;
   }
 
-  newEvent.colorId = colorId;
-
+  if (event.hasProperty('color')){
+    newEvent.colorId = event.getFirstPropertyValue('color').toString();
+  }
+
   return newEvent;
 }
 
@@ -907,12 +911,14 @@ function callWithBackoff(func, maxRetries) {
       return result;
     }
     catch(err){
-      if ( err.message.includes("is not a function")  || !backoffRecoverableErrors.some(function(e){
-              return err.message.toLowerCase().includes(e);
+      err = err.message  || err;
+      if ( err.includes("HTTP error") ) {
+        Logger.log(err);
+        return null;
+      } else if ( err.includes("is not a function")  || !backoffRecoverableErrors.some(function(e){
+              return err.toLowerCase().includes(e);
             }) ) {
         throw err;
-      } else if ( err.message.includes("Forbidden") ) {
-        return null;
       } else if ( tries > maxRetries) {
         Logger.log(`Error, giving up after trying ${maxRetries} times [${err}]`);
         return null;