@mcpher/gas-fakes 1.2.28 → 1.2.30

package/src/services/scriptapp/behavior.js

@@ -342,38 +342,32 @@ class FakeBehavior {
     return this.__sandboxMode;
   }
   addFile(id) {
-    if (this.sandboxMode) {
-      if (!is.nonEmptyString(id)) {
-        throw new Error(`Invalid sandbox id parameter (${id}) - must be a non-empty string`);
-      }
-      if (!this.isKnown(id)) {
-        slogger.log(`...adding file ${id} to sandbox allowed list`);
-        this.__createdIds.add(id);
-      }
+    if (!is.nonEmptyString(id)) {
+      throw new Error(`Invalid sandbox id parameter (${id}) - must be a non-empty string`);
+    }
+    if (!this.isKnown(id)) {
+      slogger.log(`...adding file ${id} to sandbox allowed list`);
+      this.__createdIds.add(id);
     }
     return id
   }
   addGmailId(id) {
-    if (this.sandboxMode) {
-      if (!is.nonEmptyString(id)) {
-        throw new Error(`Invalid sandbox id parameter (${id}) - must be a non-empty string`);
-      }
-      if (!this.isKnownGmail(id)) {
-        slogger.log(`...adding gmail id ${id} to sandbox allowed list`);
-        this.__createdGmailIds.add(id);
-      }
+    if (!is.nonEmptyString(id)) {
+      throw new Error(`Invalid sandbox id parameter (${id}) - must be a non-empty string`);
+    }
+    if (!this.isKnownGmail(id)) {
+      slogger.log(`...adding gmail id ${id} to sandbox allowed list`);
+      this.__createdGmailIds.add(id);
     }
     return id
   }
   addCalendarId(id) {
-    if (this.sandboxMode) {
-      if (!is.nonEmptyString(id)) {
-        throw new Error(`Invalid sandbox id parameter (${id}) - must be a non-empty string`);
-      }
-      if (!this.isKnownCalendar(id)) {
-        slogger.log(`...adding calendar id ${id} to sandbox allowed list`);
-        this.__createdCalendarIds.add(id);
-      }
+    if (!is.nonEmptyString(id)) {
+      throw new Error(`Invalid sandbox id parameter (${id}) - must be a non-empty string`);
+    }
+    if (!this.isKnownCalendar(id)) {
+      slogger.log(`...adding calendar id ${id} to sandbox allowed list`);
+      this.__createdCalendarIds.add(id);
     }
     return id
   }
@@ -549,7 +543,7 @@ class FakeBehavior {
       trashedCalendars = Array.from(this.__createdCalendarIds).reduce((acc, id) => {
         try {
           // Delete calendar
-          Calendar.Calendars.delete(id);
+          Calendar.Calendars.delete(id, { noLog404: true });
           slogger.log(`...deleted calendar ${id}`);
           acc.push(id);
         } catch (e) {

package/src/support/backoff.js

@@ -7,7 +7,13 @@ const defaultOptions = {
   initialDelay: 100,
   factor: 2,
   jitter: true,
-  shouldRetry: (err) => [429, 500, 503].includes(err.response?.status) || err.code == 429,
+  shouldRetry: (err) => [429, 500, 503].includes(err.response?.status) || 
+    err.code == 429 || 
+    (err.response?.status === 403 && (
+      err.message?.toLowerCase().includes('usage limit') || 
+      err.message?.toLowerCase().includes('rate limit') ||
+      err.errors?.some(e => ['rateLimitExceeded', 'userRateLimitExceeded', 'calendarUsageLimitsExceeded'].includes(e.reason))
+    )),
   onRetry: () => {},
 };
 

package/src/support/helpers.js

@@ -33,7 +33,7 @@ export const wontBeImplemented = (item="That") => {
   throw new Error(mess)
 }
 // added parents to the minfield length as its often needed
-const minFieldsList = ["name","id","mimeType","kind","parents"]
+const minFieldsList = ["name","id","mimeType","kind","parents","md5Checksum","size"]
 /**
  * minimum fields  these are the filds I'll take back from  the API to enable basic DriveApp - these are the defaults returned by the api
  * any other will be picked up on demand

package/src/support/sxcalendar.js

@@ -29,19 +29,27 @@ export const sxCalendar = async (Auth, { prop, method, params, options = {} }) =
   const maxRetries = 7;
   let delay = 1777;
 
+  const { noLog404, ...validParams } = params || {};
+
   for (let i = 0; i < maxRetries; i++) {
     let response;
     let error;
 
     try {
       const callish = apiClient[prop];
-      response = await callish[method](params, options);
+      response = await callish[method](validParams, options);
     } catch (err) {
       error = err;
       response = err.response;
     }
 
-    const isRetryable = [429, 500, 503].includes(response?.status) || error?.code == 429;
+    const isRetryable = [429, 500, 503].includes(response?.status) ||
+      error?.code == 429 ||
+      (response?.status === 403 && (
+        error?.message?.toLowerCase().includes('usage limit') ||
+        error?.message?.toLowerCase().includes('rate limit') ||
+        error?.errors?.some(e => ['rateLimitExceeded', 'userRateLimitExceeded', 'calendarUsageLimitsExceeded'].includes(e.reason))
+      ));
 
     if (isRetryable && i < maxRetries - 1) {
       // add a random jitter to avoid thundering herd
@@ -53,7 +61,11 @@ export const sxCalendar = async (Auth, { prop, method, params, options = {} }) =
     }
 
     if (error || isRetryable) {
-      syncError(`Failed in sxCalendar for ${prop}.${method}`, error);
+      if (noLog404 && (response?.status === 404 || error?.code === 404 || response?.status === 400 || error?.code === 400)) {
+        // Suppress logging for expected 404s (or 400s which can happen if already deleted)
+      } else {
+        syncError(`Failed in sxCalendar for ${prop}.${method}`, error);
+      }
       return { data: null, response: responseSyncify(response) };
     }
     return { data: response.data, response: responseSyncify(response) };