@mcpher/gas-fakes 1.2.30 → 1.2.32

package/package.json

@@ -34,7 +34,7 @@
   },
   "name": "@mcpher/gas-fakes",
   "author": "bruce mcpherson",
-  "version": "1.2.30",
+  "version": "1.2.32",
   "license": "MIT",
   "main": "main.js",
   "description": "A proof of concept implementation of Apps Script Environment on Node",

package/src/cli/executor.js

@@ -66,6 +66,30 @@ function generateGmailSandbox(gmailSandbox) {
   return temp;
 }
 
+function generateCalendarSandbox(calendarSandbox) {
+  if (!calendarSandbox) return [];
+  const { calendarWhitelist, usageLimit, cleanup } = calendarSandbox;
+  const temp = [
+    "const calendarSettings = behavior.sandboxService.CalendarApp;",
+  ];
+
+  if (calendarWhitelist && calendarWhitelist.length > 0) {
+    temp.push(
+      `calendarSettings.calendarWhitelist = ${JSON.stringify(
+        calendarWhitelist
+      )};`
+    );
+  }
+  if (calendarSandbox.hasOwnProperty("cleanup")) {
+    temp.push(`calendarSettings.cleanup = ${cleanup};`);
+  }
+  if (usageLimit) {
+    // usageLimit can be a number or an object, so stringify ensures correct format.
+    temp.push(`calendarSettings.usageLimit = ${JSON.stringify(usageLimit)};`);
+  }
+  return temp;
+}
+
 function generateSandboxSetupScript(sandboxConfig) {
   const script = [
     "const behavior = ScriptApp.__behavior;",
@@ -73,12 +97,18 @@ function generateSandboxSetupScript(sandboxConfig) {
     "behavior.strictSandbox = true;",
   ];
 
-  const { whitelistServices, blacklistServices, whitelistItems, gmailSandbox } =
-    sandboxConfig;
+  const {
+    whitelistServices,
+    blacklistServices,
+    whitelistItems,
+    gmailSandbox,
+    calendarSandbox,
+  } = sandboxConfig;
 
   script.push(...generateServiceWhitelistScript(whitelistServices));
   script.push(...generateServiceBlacklistScript(blacklistServices));
   script.push(...generateGmailSandbox(gmailSandbox));
+  script.push(...generateCalendarSandbox(calendarSandbox));
 
   const itemWhitelist = generateItemWhitelistScript(whitelistItems);
   if (itemWhitelist) {

package/src/cli/utils.js

@@ -4,7 +4,7 @@ const require = createRequire(import.meta.url);
 const pjson = require("../../package.json");
 
 export const VERSION = pjson.version;
-export const CLI_VERSION = "0.0.19";
+export const CLI_VERSION = "0.0.20";
 export const MCP_VERSION = "0.0.7";
 
 /**

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","md5Checksum","size"]
+const minFieldsList = ["name","id","mimeType","kind","parents","md5Checksum","size","trashed","createdTime","modifiedTime"]
 /**
  * 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/sxdrive.js

@@ -11,6 +11,7 @@ import intoStream from 'into-stream';
 import { getStreamAsBuffer } from 'get-stream';
 import { syncWarn, syncError, syncLog } from './workersync/synclogger.js';
 import { getDriveApiClient } from '../services/advdrive/drapis.js';
+import { translateFieldsToV2 } from './utils.js';
 
 
 /**
@@ -60,6 +61,17 @@ export const sxDrive = async (Auth, { prop, method, params, options }) => {
 
     const isRetryable = [429, 500, 503].includes(response?.status) || error?.code == 429;
 
+    // handle invalid field selection - sometimes old files dont support createdTime or modifiedTime
+    // we'll try to fallback to createdDate and modifiedDate
+    const isInvalidField = error?.message?.includes("Invalid field selection") && (params?.fields?.includes("createdTime") || params?.fields?.includes("modifiedTime"));
+
+    if (isInvalidField && i < maxRetries - 1) {
+      const fileId = params?.fileId ? ` for file ${params.fileId}` : "";
+      syncWarn(`Invalid field selection error on Drive API call ${prop}.${method}${fileId}. Retrying with v2 field names...`);
+      params.fields = translateFieldsToV2(params.fields);
+      continue;
+    }
+
     if (isRetryable && i < maxRetries - 1) {
       // add a random jitter to avoid thundering herd
       const jitter = Math.floor(Math.random() * 1000);
@@ -173,10 +185,12 @@ const sxStreamer = async ({
  */
 export const sxDriveExport = async (_, { id: fileId, mimeType }) => {
 
-  return sxStreamer({ params: {
-    fileId,
-    mimeType
-  }, method: 'export' })
+  return sxStreamer({
+    params: {
+      fileId,
+      mimeType
+    }, method: 'export'
+  })
 
 }
 /**
@@ -187,10 +201,12 @@ export const sxDriveExport = async (_, { id: fileId, mimeType }) => {
  */
 export const sxDriveMedia = async (_, { id: fileId }) => {
 
-  return sxStreamer({params: {
-    fileId,
-    alt: 'media'
-  }, method: 'get' })
+  return sxStreamer({
+    params: {
+      fileId,
+      alt: 'media'
+    }, method: 'get'
+  })
 
 }
 

package/src/support/utils.js

@@ -2,7 +2,7 @@
 
 import is from '@sindresorhus/is';
 import { assert } from '@sindresorhus/is'
-import {slogger} from './slogger.js'
+import { slogger } from './slogger.js'
 
 const isNU = (item) => is.null(item) || is.undefined(item)
 
@@ -171,6 +171,18 @@ export const mergeParamStrings = (...args) => {
   }).sort().join(",")
 }
 
+/**
+ * translated field names from v3 to v2
+ * @param {string} fields a comma separated fields string 
+ * @returns {string} the modified string
+ */
+export const translateFieldsToV2 = (fields) => {
+  if (!is.string(fields)) return fields
+  return fields
+    .replace(/\bcreatedTime\b/g, 'createdDate')
+    .replace(/\bmodifiedTime\b/g, 'modifiedDate')
+}
+
 const capital = (str) => str.substring(0, 1).toUpperCase() + str.substring(1)
 const unCapital = (str) => str.substring(0, 1).toLowerCase() + str.substring(1)