@mcpher/gas-fakes 1.2.31 → 2.0.0

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/services/advcalendar/clapis.js

@@ -3,12 +3,14 @@ import { Auth } from '../../support/auth.js'
 import { syncLog } from '../../support/workersync/synclogger.js'
 
 let __client = null;
+let __authClient = null;
 syncLog('...importing Calendar API');
 export const getCalendarApiClient = () => {
-  const auth = Auth.getAuthClient()
-  if (!__client) {
+  const auth = Auth.getAuthClient();
+  if (!__client || auth !== __authClient) {
     syncLog('Creating new Calendar API client');
     __client = google.calendar({ version: 'v3', auth });
+    __authClient = auth;
   }
   return __client;
 }

package/src/services/advdocs/docapis.js

@@ -1,15 +1,16 @@
 import { google } from "googleapis";
 import { Auth } from '../../support/auth.js'
-import { syncLog} from '../../support/workersync/synclogger.js'
+import { syncLog } from '../../support/workersync/synclogger.js'
 
 let __client = null;
+let __authClient = null;
 
 export const getDocsApiClient = () => {
   const auth = Auth.getAuthClient()
-  if (!__client) {
+  if (!__client || auth !== __authClient) {
     syncLog('Creating new Docs API client');
     __client = google.docs({ version: 'v1', auth });
+    __authClient = auth;
   }
   return __client;
 }
-

package/src/services/advdrive/drapis.js

@@ -1,14 +1,17 @@
 import { google } from "googleapis";
 import { Auth } from '../../support/auth.js'
-import { syncLog} from '../../support/workersync/synclogger.js'
-
+import { syncLog } from '../../support/workersync/synclogger.js'
 let __client = null;
-syncLog('...importing Drive API');
+let __authClient = null;
+
 export const getDriveApiClient = () => {
-  const auth = Auth.getAuthClient()
-  if (!__client) {
+  const auth = Auth.getAuth(); // Now returns the patched AuthClient instance
+  
+  if (!__client || auth !== __authClient) {
     syncLog('Creating new Drive API client');
+    // The Drive SDK sees a standard AuthClient and uses its (hijacked) getAccessToken
     __client = google.drive({ version: 'v3', auth });
+    __authClient = auth;
   }
   return __client;
 }

package/src/services/advforms/formsapis.js

@@ -1,15 +1,16 @@
 import { google } from "googleapis";
 import { Auth } from '../../support/auth.js'
-import { syncLog} from '../../support/workersync/synclogger.js'
+import { syncLog } from '../../support/workersync/synclogger.js'
 
 let __client = null;
+let __authClient = null;
 
 export const getFormsApiClient = () => {
   const auth = Auth.getAuthClient()
-  if (!__client) {
+  if (!__client || auth !== __authClient) {
     syncLog('Creating new Forms API client');
     __client = google.forms({ version: 'v1', auth });
+    __authClient = auth;
   }
   return __client;
 }
-

package/src/services/advgmail/gmailapis.js

@@ -1,15 +1,16 @@
 import { google } from "googleapis";
 import { Auth } from '../../support/auth.js'
-import { syncLog} from '../../support/workersync/synclogger.js'
+import { syncLog } from '../../support/workersync/synclogger.js'
 
 let __client = null;
+let __authClient = null;
 
 export const getGmailApiClient = () => {
   const auth = Auth.getAuthClient()
-  if (!__client) {
+  if (!__client || auth !== __authClient) {
     syncLog('Creating new Gmail API client');
     __client = google.gmail({ version: 'v1', auth });
+    __authClient = auth;
   }
   return __client;
 }
-

package/src/services/advsheets/shapis.js

@@ -1,21 +1,16 @@
 import { google } from "googleapis";
 import { Auth } from '../../support/auth.js'
-import { syncLog} from '../../support/workersync/synclogger.js'
-let currentAuth = null;
+import { syncLog } from '../../support/workersync/synclogger.js'
+
 let __client = null;
+let __authClient = null;
 syncLog('...importing Sheets API');
 export const getSheetsApiClient = () => {
   const auth = Auth.getAuthClient()
-
-  if (__client && currentAuth !== auth) {
-    syncLog('Auth has changed - creating new Sheets API client');
-    __client = null;
-  }
-  
-  currentAuth = auth;
-  if (!__client) {
+  if (!__client || auth !== __authClient) {
     syncLog('Creating new Sheets API client');
     __client = google.sheets({ version: 'v4', auth });
+    __authClient = auth;
   }
   return __client;
 }

package/src/services/advslides/slapis.js

@@ -1,15 +1,16 @@
-
 import { google } from "googleapis";
 import { Auth } from '../../support/auth.js'
-import { syncLog} from '../../support/workersync/synclogger.js'
+import { syncLog } from '../../support/workersync/synclogger.js'
 
 let __client = null;
+let __authClient = null;
 syncLog('...importing Slides API');
 export const getSlidesApiClient = () => {
   const auth = Auth.getAuthClient()
-  if (!__client) {
+  if (!__client || auth !== __authClient) {
     syncLog('Creating new Slides API client');
     __client = google.slides({ version: 'v1', auth });
+    __authClient = auth;
   }
   return __client;
 }

package/src/services/driveapp/fakedriveapp.js

@@ -3,6 +3,8 @@ import { newFakeDriveFile } from './fakedrivefile.js'
 import { newFakeFolderApp } from './fakefolderapp.js'
 import { notYetImplemented, isFolder } from '../../support/helpers.js'
 import { Proxies } from '../../support/proxies.js'
+import { Utils } from '../../support/utils.js'
+const { is } = Utils
 
 
 /**
@@ -42,11 +44,17 @@ export class FakeDriveApp {
    * @returns {newFakeDriveFile|null}
    */
   getFileById(id) {
+    if (!is.nonEmptyString(id)) {
+      throw new Error(`API call to DriveApp.getFileById failed with error: Invalid argument: id`)
+    }
     const file = Drive.Files.get(id, {}, { allow404: true })
     return file ? newFakeDriveFile(file) : null
   }
 
   getFolderById(id) {
+    if (!is.nonEmptyString(id)) {
+      throw new Error(`API call to DriveApp.getFolderById failed with error: Invalid argument: id`)
+    }
     const file = Drive.Files.get(id, {}, { allow404: true })
     return file ? newFakeDriveFolder(file) : null
   }
@@ -86,9 +94,9 @@ export class FakeDriveApp {
   }
 
   searchFiles(params) {
-    return this.folderApp.searchFiles({  params })
+    return this.folderApp.searchFiles({ params })
   }
-  
+
   searchFolders(params) {
     return this.folderApp.searchFolders({ params })
   }

package/src/services/logger/fakelogger.js

@@ -174,12 +174,15 @@ const writeToCloudOrConsole = (message, loggerInstance) => {
     loggerInstance.__cloudLogLink = base + encodedQueryParam + `?project=${projectId}`;
 
     const apiBase = 'https://logging.googleapis.com/v2/entries:write'
+    // Log the actual entry with its logName
+    metadata.logName = `projects/${projectId}/logs/${logName.replace('/', '%2F')}`
+
     const payload = JSON.stringify({
       entries: [
         metadata
       ]
     })
-    const token = ScriptApp.getOAuthToken()
+    const token = ScriptApp.__getSourceOAuthToken()
     const headers = {
       Authorization: `Bearer ${token}`,
       'content-type': "application/json",
@@ -189,9 +192,9 @@ const writeToCloudOrConsole = (message, loggerInstance) => {
       headers,
     })
     if (response.getResponseCode() !== 200) {
-      console.error ('logging failure', response.getContentText())
+      console.error('logging failure', response.getContentText())
     }
- 
+
   }
 
 };

package/src/services/scriptapp/app.js

@@ -8,19 +8,22 @@ import { Syncit } from '../../support/syncit.js'
 import { Auth } from '../../support/auth.js'
 import { Proxies } from '../../support/proxies.js'
 import { newFakeBehavior } from './behavior.js'
-import { newCacheDropin , getUserIdFromToken} from '@mcpher/gas-flex-cache'
-import {slogger } from "../../support/slogger.js";
+import { newCacheDropin } from '@mcpher/gas-flex-cache'
+import { slogger } from "../../support/slogger.js";
 /**
  * fake ScriptApp.getOAuthToken 
  * @return {string} token
  */
 const getOAuthToken = () => {
-  if (Auth.isTokenExpired()) {
-    const { accessToken, tokenInfo } = Syncit.fxRefreshToken();
-    Auth.setAccessToken(accessToken);
-    Auth.setTokenInfo(tokenInfo); // This will also update the expiry time
-  }
-  return Auth.getAccessToken();
+  return Syncit.fxGetAccessToken(Auth)
+}
+
+/**
+ * gets the token of the person running the script
+ * @return {string} token
+ */
+const getSourceOAuthToken = () => {
+  return Syncit.fxGetSourceAccessTokenInfo(Auth).token
 }
 
 
@@ -66,7 +69,7 @@ const checkScopesMatch = (required) => {
   const scopes = Auth.getTokenScopes()
 
   // now we're syncronous all the way
-  const tokened = new Set(scopes.split(" "))
+  const tokened = new Set((typeof scopes === 'string' ? scopes : "").split(" "))
 
   // see which ones are missing
   const missing = required.filter(s => {
@@ -115,6 +118,7 @@ if (typeof globalThis[name] === typeof undefined) {
 
       _app = {
         getOAuthToken,
+        __getSourceOAuthToken: getSourceOAuthToken,
         requireAllScopes,
         requireScopes,
         getScriptId: Auth.getScriptId,
@@ -122,14 +126,14 @@ if (typeof globalThis[name] === typeof undefined) {
           return Auth.getProjectId()
         },
         get __userId() {
-          return Auth.getUserId()
+          // this is actually the active user/ not the effective user
+          return Auth.getActiveUser().id
         },
         AuthMode: {
           FULL: 'FULL'
         },
         __behavior: newFakeBehavior(),
-        __newCacheDropin: newCacheDropin,
-        __getUserIdFromToken: getUserIdFromToken
+        __newCacheDropin: newCacheDropin
       }
 
 

package/src/services/scriptapp/behavior.js

@@ -254,6 +254,10 @@ class FakeBehavior {
     this.__createdIds = new Set();
     this.__createdGmailIds = new Set();
     this.__createdCalendarIds = new Set();
+    // Specifically for sandbox mode - files created when sandbox mode is on
+    this.__allowedIds = new Set();
+    this.__allowedGmailIds = new Set();
+    this.__allowedCalendarIds = new Set();
     // in sandbox mode we only allow access to files created in this instance
     // this is to emulate the behavior of a drive.file scope
     this.__sandboxMode = false;
@@ -341,39 +345,69 @@ class FakeBehavior {
   get sandBoxMode() {
     return this.__sandboxMode;
   }
-  addFile(id) {
+  resetDrive() {
+    this.__createdIds.clear();
+    this.__allowedIds.clear();
+    return this;
+  }
+  resetGmail() {
+    this.__createdGmailIds.clear();
+    this.__allowedGmailIds.clear();
+    return this;
+  }
+  resetCalendar() {
+    this.__createdCalendarIds.clear();
+    this.__allowedCalendarIds.clear();
+    return this;
+  }
+  reset() {
+    this.resetDrive();
+    this.resetGmail();
+    this.resetCalendar();
+    return this;
+  }
+  addFile(id, force = false) {
     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`);
+    if (this.sandboxMode || force) {
       this.__createdIds.add(id);
+      if (!this.__allowedIds.has(id)) {
+        slogger.log(`...adding file ${id} to sandbox allowed list`);
+        this.__allowedIds.add(id);
+      }
     }
     return id
   }
-  addGmailId(id) {
+  addGmailId(id, force = false) {
     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`);
+    if (this.sandboxMode || force) {
       this.__createdGmailIds.add(id);
+      if (!this.__allowedGmailIds.has(id)) {
+        slogger.log(`...adding gmail id ${id} to sandbox allowed list`);
+        this.__allowedGmailIds.add(id);
+      }
     }
     return id
   }
-  addCalendarId(id) {
+  addCalendarId(id, force = false) {
     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`);
+    if (this.sandboxMode || force) {
       this.__createdCalendarIds.add(id);
+      if (!this.__allowedCalendarIds.has(id)) {
+        slogger.log(`...adding calendar id ${id} to sandbox allowed list`);
+        this.__allowedCalendarIds.add(id);
+      }
     }
     return id
   }
   isAccessible(id, serviceName, accessType = 'read') {
-    if (this.sandboxMode && !is.nonEmptyString(id)) {
-      throw new Error(`Invalid sandbox id parameter (${id}) - must be a non-empty string`);
+    if (!is.nonEmptyString(id)) {
+      throw new Error(`API call to ${serviceName} failed with error: Invalid argument: id`);
     }
 
     // Advanced services should inherit sandbox rules from their App counterparts.
@@ -458,114 +492,105 @@ class FakeBehavior {
   }
   trash() {
     let trashed = [];
-
-    // Drive cleanup
-    // Use DriveApp.cleanup if exists? DriveApp doesn't map 1:1 to services list exactly for this, but 'DriveApp' defaults to global.
-    // Let's use global cleanup setting for Drive for now, OR DriveApp specific if we want consistent granularity.
-    // For now, keep behavior: this.__cleanup controls generic/drive files.
-    // OR: check `this.sandboxService.DriveApp.cleanup`?
-    // Let's stick to user request: "separate cleanup property for gmail settings".
-    // So global `this.__cleanup` works for Drive.
-
-    // Actually, `this.__cleanup` getter on global overrides? No.
-    // The prompt says "separate cleanup property for gmail settings".
-    // So if I set `ScriptApp.__behavior.cleanup` it applies to everything unless overridden?
-    // My implementation in FakeSandboxService maps `cleanup` to global if null.
-    // So `gmailSettings.cleanup` will return strict boolean.
-
-    if (this.__cleanup) {
-      trashed = Array.from(this.__createdIds).reduce((acc, id) => {
-        let d = null
-        try {
-          d = DriveApp.getFileById(id)
-        } catch (e) {
-          d = DriveApp.getFolderById(id)
-        }
-        if (d) {
-          d.setTrashed(true);
-          slogger.log(`...trashed file ${d.getName()} (${id})`);
-          acc.push(id);
-        }
-        return acc;
-      }, []);
-      this.__createdIds.clear();
-    } else {
-      slogger.log('...skipping cleaning up sandbox files (Drive)');
-    }
-
-    // Clean up Gmail artifacts
-    let trashedGmail = [];
-    const gmailSettings = this.sandboxService.GmailApp;
-    const gmailCleanup = gmailSettings && gmailSettings.cleanup; // This will return true/false (inherits or specific)
-
-    if (gmailCleanup) {
-      trashedGmail = Array.from(this.__createdGmailIds).reduce((acc, id) => {
-        // Try to determine type or just try deleting as label, then message/thread?
-        // IDs for labels vs threads/messages might overlap or be distinct formats.
-        // Label IDs are usually strings like 'Label_123'. Thread IDs are hex strings.
-        // We can try fetching as label first.
-        try {
-          // Try as label
-          Gmail.Users.Labels.remove('me', id);
-          slogger.log(`...deleted gmail label ${id}`);
-          acc.push(id);
+    const wasSandbox = this.sandboxMode;
+    this.sandboxMode = false;
+    try {
+      // Drive cleanup
+      if (this.__cleanup) {
+        trashed = Array.from(this.__createdIds).reduce((acc, id) => {
+          let d = null
+          try {
+            d = DriveApp.getFileById(id)
+          } catch (e) {
+            d = DriveApp.getFolderById(id)
+          }
+          if (d) {
+            d.setTrashed(true);
+            slogger.log(`...trashed file ${d.getName()} (${id})`);
+            acc.push(id);
+          }
           return acc;
-        } catch (e) { /* not a label or failed */ }
+        }, []);
+        this.__createdIds.clear();
+        this.__allowedIds.clear();
+      } else {
+        slogger.log('...skipping cleaning up sandbox files (Drive)');
+      }
+
+      // Clean up Gmail artifacts
+      let trashedGmail = [];
+      const gmailSettings = this.sandboxService.GmailApp;
+      const gmailCleanup = gmailSettings && gmailSettings.cleanup; // This will return true/false (inherits or specific)
+
+      if (gmailCleanup) {
+        trashedGmail = Array.from(this.__createdGmailIds).reduce((acc, id) => {
+          try {
+            // Try as label
+            Gmail.Users.Labels.remove('me', id);
+            slogger.log(`...deleted gmail label ${id}`);
+            acc.push(id);
+            return acc;
+          } catch (e) { /* not a label or failed */ }
+
+          try {
+            // Try as thread - move to trash
+            Gmail.Users.Threads.trash('me', id);
+            slogger.log(`...trashed gmail thread ${id}`);
+            acc.push(id);
+            return acc;
+          } catch (e) { /* not a thread */ }
+
+          try {
+            Gmail.Users.Messages.trash('me', id);
+            slogger.log(`...trashed gmail message ${id}`);
+            acc.push(id);
+            return acc;
+          } catch (e) { /* not a message */ }
 
-        try {
-          // Try as thread - move to trash
-          Gmail.Users.Threads.trash('me', id);
-          slogger.log(`...trashed gmail thread ${id}`);
-          acc.push(id);
           return acc;
-        } catch (e) { /* not a thread */ }
+        }, []);
+        this.__createdGmailIds.clear();
+        this.__allowedGmailIds.clear();
+      } else {
+        slogger.log('...skipping cleaning up sandbox files (Gmail)');
+      }
 
-        try {
-          Gmail.Users.Messages.trash('me', id);
-          slogger.log(`...trashed gmail message ${id}`);
-          acc.push(id);
+      // Clean up Calendar artifacts
+      let trashedCalendars = [];
+      const calendarSettings = this.sandboxService.CalendarApp;
+      const calendarCleanup = calendarSettings && calendarSettings.cleanup;
+
+      if (calendarCleanup) {
+        trashedCalendars = Array.from(this.__createdCalendarIds).reduce((acc, id) => {
+          try {
+            // Delete calendar
+            Calendar.Calendars.delete(id, { noLog404: true });
+            slogger.log(`...deleted calendar ${id}`);
+            acc.push(id);
+          } catch (e) {
+            slogger.log(`...failed to delete calendar ${id}: ${e.message}`);
+          }
           return acc;
-        } catch (e) { /* not a message */ }
-
-        return acc;
-      }, []);
-      this.__createdGmailIds.clear();
-    } else {
-      slogger.log('...skipping cleaning up sandbox files (Gmail)');
-    }
-
-    // Clean up Calendar artifacts
-    let trashedCalendars = [];
-    const calendarSettings = this.sandboxService.CalendarApp;
-    const calendarCleanup = calendarSettings && calendarSettings.cleanup;
-
-    if (calendarCleanup) {
-      trashedCalendars = Array.from(this.__createdCalendarIds).reduce((acc, id) => {
-        try {
-          // Delete calendar
-          Calendar.Calendars.delete(id, { noLog404: true });
-          slogger.log(`...deleted calendar ${id}`);
-          acc.push(id);
-        } catch (e) {
-          slogger.log(`...failed to delete calendar ${id}: ${e.message}`);
-        }
-        return acc;
-      }, []);
-      this.__createdCalendarIds.clear();
-    } else {
-      slogger.log('...skipping cleaning up sandbox calendars');
-    }
+        }, []);
+        this.__createdCalendarIds.clear();
+        this.__allowedCalendarIds.clear();
+      } else {
+        slogger.log('...skipping cleaning up sandbox calendars');
+      }
 
-    slogger.log(`...trashed ${trashed.length} sandboxed files, ${trashedGmail.length} gmail items, and ${trashedCalendars.length} calendars`);
+      slogger.log(`...trashed ${trashed.length} sandboxed files, ${trashedGmail.length} gmail items, and ${trashedCalendars.length} calendars`);
+    } finally {
+      this.sandboxMode = wasSandbox;
+    }
     return trashed;
   }
   isKnown(id) {
-    return this.__createdIds.has(id);
+    return this.__allowedIds.has(id);
   }
   isKnownGmail(id) {
-    return this.__createdGmailIds.has(id);
+    return this.__allowedGmailIds.has(id);
   }
   isKnownCalendar(id) {
-    return this.__createdCalendarIds.has(id);
+    return this.__allowedCalendarIds.has(id);
   }
 }

package/src/services/session/fakesession.js

@@ -1,10 +1,13 @@
-import { newFakeUser} from '../common/fakeuser.js'
-import { Auth } from '../../support/auth.js'
+import { newFakeUser } from '../common/fakeuser.js'
 import { Proxies } from '../../support/proxies.js'
-
+import { Syncit } from '../../support/syncit.js'
+import { Auth } from '../../support/auth.js'
 class FakeSession {
-  constructor () { 
-    this._activeUser = newFakeUser (Auth.getTokenInfo())
+  constructor() {
+    // Active user is the impersonated user (the one we're acting as)
+    this._activeUser = newFakeUser(Syncit.fxGetAccessTokenInfo().tokenInfo)
+    // Effective user is also the impersonated user in this context
+    this._effectiveUser = newFakeUser(Syncit.fxGetAccessTokenInfo().tokenInfo)
   }
   getActiveUser() {
     return this._activeUser
@@ -14,15 +17,27 @@ class FakeSession {
    * @returns {string}
    */
   getEffectiveUser() {
-    return this.getActiveUser()
+    return this._effectiveUser
   }
   /**
    * @returns {string}
    */
   getActiveUserLocale() {
-    const lang = process.env.LANG || ''
+    const lang =
+      process.env.LANG ||
+      process.env.LANGUAGE ||
+      process.env.LC_ALL ||
+      process.env.LC_MESSAGES ||
+      (function () {
+        try {
+          return Intl.DateTimeFormat().resolvedOptions().locale
+        } catch (e) {
+          return 'en'
+        }
+      })() ||
+      'en'
     // it'll be a format like en_US.UTF-8 so we need to drop the encoding to be like apps script
-    return lang.replace(/\_.*/,'')
+    return lang.split(/[._-]/)[0]
   }
   /**
    * this'll come from the manifest on Node (on Apps Script it'll be where the user is running from)
@@ -42,4 +57,4 @@ class FakeSession {
   }
 }
 
-export const newFakeSession = (...args) => Proxies.guard (new FakeSession(...args))
+export const newFakeSession = (...args) => Proxies.guard(new FakeSession(...args))