@mcpher/gas-fakes 2.2.5 → 2.2.6

package/package.json

@@ -15,6 +15,7 @@
     "dotenv": "^17.3.1",
     "fast-xml-parser": "^5.4.2",
     "get-stream": "^9.0.1",
+    "google-auth-library": "^10.6.2",
     "googleapis": "^171.4.0",
     "got": "^14.6.6",
     "into-stream": "^9.1.0",
@@ -26,6 +27,9 @@
     "unzipper": "^0.12.3",
     "zod": "^4.3.6"
   },
+  "overrides": {
+    "glob": "^13.0.6"
+  },
   "type": "module",
   "scripts": {
     "pub": "npm publish --access public",
@@ -35,7 +39,7 @@
   },
   "name": "@mcpher/gas-fakes",
   "author": "bruce mcpherson",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "license": "MIT",
   "main": "main.js",
   "description": "An implementation of the Google Workspace Apps Script runtime: Run native App Script Code on Node and Cloud Run",
@@ -44,4 +48,4 @@
   "bin": {
     "gas-fakes": "gas-fakes.js"
   }
-}
+}

package/src/support/msgraph/msauth.js

@@ -1,7 +1,9 @@
 import {
   InteractiveBrowserCredential,
-  ClientSecretCredential
+  ClientSecretCredential,
+  useIdentityPlugin
 } from "@azure/identity";
+
 import { execSync } from 'node:child_process';
 import { readFile, writeFile } from 'fs/promises';
 import { existsSync } from 'fs';
@@ -40,20 +42,66 @@ function decodeJWT(token) {
   return JSON.parse(Buffer.from(encodedPayload, 'base64url').toString('utf-8'));
 }
 
+const customCachePlugin = (options) => {
+  return {
+    beforeCacheAccess: async (cacheContext) => {
+      if (existsSync(TOKEN_CACHE_FILE)) {
+        try {
+          const data = await readFile(TOKEN_CACHE_FILE, 'utf-8');
+          let cache;
+          if (data.trim().startsWith('{')) {
+             cache = JSON.parse(data);
+          } else {
+             cache = decodeJWT(data.trim());
+          }
+          if (cache && cache.msalCache) {
+             cacheContext.tokenCache.deserialize(cache.msalCache);
+          }
+        } catch (e) {
+          console.warn(`...failed to load MS Graph token cache: ${e.message}`);
+        }
+      }
+    },
+    afterCacheAccess: async (cacheContext) => {
+      if (cacheContext.cacheHasChanged) {
+        try {
+          const msalCache = cacheContext.tokenCache.serialize();
+          const cacheData = { 
+            msalCache, 
+            token: 'managed-by-msal', 
+            expiresOn: new Date(Date.now() + 86400000 * 30).getTime() // Keep valid for 30 days
+          };
+          const jwtString = encodeJWT(cacheData);
+          await writeFile(TOKEN_CACHE_FILE, jwtString);
+          try {
+            chmodSync(TOKEN_CACHE_FILE, 0o600);
+          } catch (e) {}
+        } catch (e) {
+          console.warn(`...failed to save MS Graph token cache: ${e.message}`);
+        }
+      }
+    }
+  };
+};
+
+useIdentityPlugin((context) => {
+  if (context.cachePluginControl) {
+    context.cachePluginControl.setPersistence(customCachePlugin);
+  }
+});
+
 async function loadTokenCache() {
   if (existsSync(TOKEN_CACHE_FILE)) {
     try {
       const data = await readFile(TOKEN_CACHE_FILE, 'utf-8');
       
       let cache;
-      // Handle legacy plain-text JSON format gracefully
       if (data.trim().startsWith('{')) {
          cache = JSON.parse(data);
       } else {
          cache = decodeJWT(data.trim());
       }
 
-      // Check if expired (buffer of 5 mins)
       if (cache && cache.expiresOn && new Date(cache.expiresOn).getTime() > Date.now() + 300000) {
         return cache.token;
       }
@@ -70,10 +118,8 @@ async function saveTokenCache(token, expiresOn) {
     const jwtString = encodeJWT(cacheData);
     await writeFile(TOKEN_CACHE_FILE, jwtString);
     try {
-      chmodSync(TOKEN_CACHE_FILE, 0o600); // Read/Write only for owner
-    } catch (e) {
-      // Ignore if chmod fails (e.g. on non-posix)
-    }
+      chmodSync(TOKEN_CACHE_FILE, 0o600);
+    } catch (e) {}
   } catch (e) {
     console.warn(`...failed to save MS Graph token cache: ${e.message}`);
   }
@@ -230,7 +276,11 @@ export async function getMsGraphToken(scopes = ['User.Read']) {
     const credentialSilent = new InteractiveBrowserCredential({
       tenantId: (envTenant && envTenant !== 'common') ? envTenant : 'consumers',
       clientId,
-      prompt: promptBehavior
+      prompt: promptBehavior,
+      tokenCachePersistenceOptions: {
+        enabled: true,
+        name: 'gas-fakes-msgraph-cache'
+      }
     });
 
     try {
@@ -244,7 +294,11 @@ export async function getMsGraphToken(scopes = ['User.Read']) {
          const credentialInteractive = new InteractiveBrowserCredential({
            tenantId: (envTenant && envTenant !== 'common') ? envTenant : 'consumers',
            clientId,
-           prompt: 'select_account consent'
+           prompt: 'select_account consent',
+           tokenCachePersistenceOptions: {
+             enabled: true,
+             name: 'gas-fakes-msgraph-cache'
+           }
          });
          const tokenResponse = await credentialInteractive.getToken(msScopes);
          syncLog('...retrieved MS Graph token via interactive login');

package/exgcp.sh

@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# This script reads the GCP_PROJECT_ID from a .env file
-# and exports it as GOOGLE_CLOUD_PROJECT for the current shell session.
-#
-# Usage: source . ./exgcp.sh
-
-# Define the path to your .env file relative to the script's location
-ENV_FILE="$(dirname "$0")/.env"
-
-# Check if the .env file exists
-
-if [ ! -f "$ENV_FILE" ]; then
-  echo "Error: .env file not found at path: $ENV_FILE"
-  # Use 'return' instead of 'exit' so it doesn't close the user's terminal when sourced
-  return 1
-fi
-
-# Read the GCP_PROJECT_ID, remove quotes, and handle potential carriage returns
-GOOGLE_CLOUD_PROJECT_VALUE=$(grep -E '^GOOGLE_CLOUD_PROJECT=' "$ENV_FILE" | cut -d '=' -f2 | tr -d '"\r')
-GEMINI_API_KEY_VALUE=$(grep -E '^GEMINI_API_KEY=' "$ENV_FILE" | cut -d '=' -f2 | tr -d '"\r')
-GEMINI_MODEL_VALUE=$(grep -E '^GEMINI_MODEL=' "$ENV_FILE" | cut -d '=' -f2 | tr -d '"\r')
-OMDB_API_KEY_VALUE=$(grep -E '^OMDB_API_KEY=' "$ENV_FILE" | cut -d '=' -f2 | tr -d '"\r')
-# Check if a value was extracted
-if [ -z "$GOOGLE_CLOUD_PROJECT_VALUE" ]; then
-  echo "Error: GOOGLE_CLOUD_PROJECT not found or is empty in $ENV_FILE."
-  return 1
-fi
-
-if [ -z "GEMINI_API_KEY_VALUE" ]; then
-  echo "GEMINI_API_KEY not found or is empty in $ENV_FILE."
-else
-  echo "exported: GEMINI_API_KEY"
-  export GEMINI_API_KEY="$GEMINI_API_KEY_VALUE"
-fi  
-
-if [ -z "OMDB_API_KEY_VALUE" ]; then
-  echo "OMDB_API_KEY not found or is empty in $ENV_FILE."
-else
-  echo "exported: OMDB_API_KEY"
-  export OMDB_API_KEY="$OMDB_API_KEY_VALUE"
-fi  
-
-if [ -z "GEMINI_MODEL_VALUE" ]; then
-  echo "GEMINI_MODEL not found or is empty in $ENV_FILE."
-else
-  echo "exported: GEMINI_MODEL=$GEMINI_MODEL_VALUE"
-  export GEMINI_MODEL="$GEMINI_MODEL_VALUE"
-fi  
-
-# Export the variable for the current session
-export GOOGLE_CLOUD_PROJECT="$GOOGLE_CLOUD_PROJECT_VALUE"
-
-echo "exported: GOOGLE_CLOUD_PROJECT=$GOOGLE_CLOUD_PROJECT"

package/testlib.sh

@@ -1,2 +0,0 @@
-gas-fakes -l bmFiddler@13EWG4-lPrEf34itxQhAQ7b9JEbmCBfO8uE4Mhr99CHi3Pw65oxXtq-rU \
--s "const sheet=SpreadsheetApp.openById('1h9IGIShgVBVUrUjjawk5MaCEQte_7t32XeEP1Z5jXKQ').getSheets()[0];const fiddler = new bmFiddler.Fiddler(sheet);console.log (fiddler.getData().slice(0, 5));"