@mcpher/gas-fakes 2.0.8 → 2.0.10

package/README.md

@@ -129,15 +129,13 @@ It contains a cloud logging query that will display any logging done in this ses
 
 You will have used the gas-fakes init command to create a .env file, containing the LOG_DESTINATION setting. You can change any of the settings in the .env file manually if you want to.
 
-If you want to set an initial LOG_DESTINATION using that .env file, you have to let gas-fakes know where to find it. Let's assume it's in the same folder as your main script.
+If you want to set an initial LOG_DESTINATION using that .env file, you have to let gas-fakes know where to find it. Let's assume it's in the same folder as your main script. 
 ```env
-node --env-file=.env yourapp.js
-```
-Some developers prefer to use dotenv to set the path of the .env file
-```javascript
-import dotenv from 'dotenv'
-dotenv.config({ path: '/custom/path/to/.env' })
+node yourapp.js
+# or if your .env is somewhere else
+node --env-file pathtoenv yourapp.js
 ```
+
 Alternatively, instead of putting it in an env file, you can export it in your shell environment. 
 ```sh
 export LOG_DESTINATION="BOTH"
@@ -170,7 +168,8 @@ As I mentioned earlier, to take this further, I'm going to need a lot of help to
 - [getting started](GETTING_STARTED.md) - how to handle authentication for restricted scopes.
 - [readme](README.md)
 - [gas fakes cli](gas-fakes-cli.md)
-- [running gas-fakes on google cloud run](cloud-run.md)
+- [running gas-fakes on google cloud run](https://github.com/brucemcpherson/gas-fakes-containers)
+- [running gas-fakes on google kubernetes engine](https://github.com/brucemcpherson/gas-fakes-containers)
 - [initial idea and thoughts](https://ramblings.mcpher.com/a-proof-of-concept-implementation-of-apps-script-environment-on-node/)
 - [Inside the volatile world of a Google Document](https://ramblings.mcpher.com/inside-the-volatile-world-of-a-google-document/)
 - [Apps Script Services on Node – using apps script libraries](https://ramblings.mcpher.com/apps-script-services-on-node-using-apps-script-libraries/)

package/package.json

@@ -13,16 +13,16 @@
     "dotenv": "^17.3.1",
     "fast-xml-parser": "^5.3.6",
     "get-stream": "^9.0.1",
-    "googleapis": "^170.1.0",
+    "googleapis": "^171.4.0",
     "got": "^14.6.6",
-    "into-stream": "^8.0.1",
+    "into-stream": "^9.1.0",
     "keyv": "^5.6.0",
     "keyv-file": "^5.3.3",
     "mime": "^4.1.0",
     "prompts": "^2.4.2",
     "sleep-synchronously": "^2.0.0",
     "unzipper": "^0.12.3",
-    "zod": "^3.25.76"
+    "zod": "^4.3.6"
   },
   "type": "module",
   "scripts": {
@@ -33,7 +33,7 @@
   },
   "name": "@mcpher/gas-fakes",
   "author": "bruce mcpherson",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "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",

package/src/cli/app.js

@@ -82,9 +82,17 @@ export async function main() {
         return;
       }
 
-      const envPath = path.resolve(process.cwd(), env);
-      console.log(`...using env file in ${envPath}`);
-      dotenv.config({ path: envPath, quiet: true });
+      // Load environment variables. 
+      // If --env-file is used, we skip the default .env to avoid conflicts,
+      // but if the user explicitly provided -e, we use that.
+      const hasEnvFileFlag = process.execArgv.some(arg => arg.startsWith('--env-file'));
+      const isDefaultEnv = env === "./.env";
+
+      if (!hasEnvFileFlag || !isDefaultEnv) {
+        const envPath = path.resolve(process.cwd(), env);
+        console.log(`...using env file in ${envPath}`);
+        dotenv.config({ path: envPath, quiet: true });
+      }
 
       const settingsPath = path.resolve(process.cwd(), gfsettings);
       console.log(`...using gasfakes settings file in ${settingsPath}`);

package/src/index.js

@@ -1,6 +1,5 @@
-
+import './support/env-loader.js'; 
 import './services/scriptapp/app.js'
-
 import './services/driveapp/app.js'
 import './services/logger/app.js'
 import './services/urlfetchapp/app.js'

package/src/services/spreadsheetapp/faketextfinder.js

@@ -60,7 +60,7 @@ export class FakeTextFinder {
     }
     return (
       this.searchResults[
-        this.count == 0 ? this.searchResults.length - 1 : --this.count
+      this.count == 0 ? this.searchResults.length - 1 : --this.count
       ] || null
     );
   }
@@ -189,6 +189,9 @@ export class FakeTextFinder {
           target = c.normalize("NFD").replace(/[\u0300-\u036f]/g, "");
         }
         if (!matchCase) {
+          if (typeof c !== 'string') {
+            c = String(c);
+          }
           target = c.toLowerCase();
           this.text = this.text.toLowerCase();
         }

package/src/support/auth.js

@@ -2,7 +2,6 @@ import { GoogleAuth, JWT, Impersonated, OAuth2Client } from "google-auth-library
 import is from "@sindresorhus/is";
 import { createHash } from "node:crypto";
 import { syncLog, syncError } from "./workersync/synclogger.js";
-import fs from "node:fs";
 
 const _authScopes = new Set([]);
 
@@ -225,6 +224,9 @@ const setAuth = async (scopes = [], mcpLoading = false) => {
         this._expiresAt = 0
         this.credentials = null
       }
+      _authClient.refreshAccessToken = function () {
+        return this.getAccessToken()
+      }
 
       mayLog(`...using Domain-Wide Delegation for user: ${userEmail}`)
 

package/src/support/env-loader.js

@@ -0,0 +1,34 @@
+import dotenv from 'dotenv';
+import { existsSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+
+/**
+ * Conditionally loads environment variables from a .env file.
+ * 
+ * If Node.js was started with the --env-file flag, this loader does nothing
+ * to allow the native Node.js environment file handling to take precedence.
+ * 
+ * Otherwise, it attempts to load a .env file from the directory where the 
+ * main script is located. If not found, it falls back to the default 
+ * dotenv behavior (searching the current working directory).
+ */
+
+// Check if node was run with --env-file
+const hasEnvFileFlag = process.execArgv.some(arg => arg.startsWith('--env-file'));
+
+if (!hasEnvFileFlag) {
+  const mainScript = process.argv[1];
+  if (mainScript) {
+    // Try to find .env in the same directory as the main entry point script
+    const envPath = join(dirname(mainScript), '.env');
+    if (existsSync(envPath)) {
+      dotenv.config({ path: envPath });
+    } else {
+      // Fallback to default dotenv behavior (CWD)
+      dotenv.config();
+    }
+  } else {
+    // Fallback if mainScript is not available (e.g. REPL)
+    dotenv.config();
+  }
+}

package/src/support/sxauth.js

@@ -77,9 +77,13 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, cachePath,
   // now update all that if anything has changed
   const strSet = JSON.stringify(settings, null, 2)
   if (JSON.stringify(_settings, null, 2) !== strSet) {
+    try {
     await mkdir(settingsDir, { recursive: true })
     syncLog(`...writing to ${settingsPath}`);
     writeFile(settingsPath, strSet, { flag: 'w' })
+    } catch (err) {
+      syncWarn(`...unable to write settings file (normal in readonly filesystem) - skipping ${settingsPath}: ${err}`)
+    }
   }
 
   // get the required scopes and set them

package/src/support/sxretry.js

@@ -17,7 +17,7 @@ const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
  */
 export const sxRetry = async (Auth, tag, func, options = {}) => {
   const {
-    maxRetries = 7,
+    maxRetries = 9,
     initialDelay = 1777,
     extraRetryCheck = () => false,
     skipLog = () => false
@@ -63,16 +63,20 @@ export const sxRetry = async (Auth, tag, func, options = {}) => {
       retryReason = 'Rate Limit';
     }
 
+    if (!retryReason && error?.message?.toLowerCase().includes('no refresh token')) {
+      retryReason = 'No Refresh Token';
+    }
+
     const isRetryable = !!retryReason || extraRetryCheck(error, response);
     if (isRetryable && !retryReason) retryReason = 'Extra Check';
 
     if (isRetryable && i < maxRetries - 1) {
-      const isAuthError = error?.code === 401 || status === 401;
+      const isAuthError = error?.code === 401 || status === 401 || retryReason === 'No Refresh Token';
       if (isAuthError) {
         // Only retry auth error once
         if (i > 0) break;
         Auth.invalidateToken();
-        syncWarn(`Authentication error (401) on ${tag}. Invalidated token and retrying immediately...`);
+        syncWarn(`Authentication error (${status || retryReason}) on ${tag}. Invalidated token and retrying immediately...`);
       } else {
         const jitter = Math.floor(Math.random() * 1000);
         const totalDelay = delay + jitter;

package/src/support/sxtoken.js

@@ -1,4 +1,5 @@
 import { Auth } from './auth.js'
+import { sxRetry } from './sxretry.js'
 
 /**
  * fetch effective user access token
@@ -12,4 +13,23 @@ export const sxGetAccessTokenInfo = async () => {
 }
 export const sxGetSourceAccessTokenInfo = async () => {
   return await Auth.getSourceAccessTokenInfo()
-}
+}
+
+/**
+ * For testing sxRetry logic
+ */
+export const sxTestRetry = async (Auth, { errorMessage }) => {
+  let callCount = 0;
+  const mockFunc = async () => {
+    callCount++;
+    if (callCount === 1) {
+      throw new Error(errorMessage);
+    }
+    return {
+      status: 200,
+      data: { success: true, callCount }
+    };
+  };
+
+  return await sxRetry(Auth, 'TestRetry', mockFunc);
+};

package/src/support/syncit.js

@@ -381,6 +381,10 @@ const fxGetSourceAccessTokenInfo = () => {
   return callSync("sxGetSourceAccessTokenInfo");
 };
 
+const fxTestRetry = (errorMessage) => {
+  return callSync("sxTestRetry", { errorMessage });
+};
+
 const fxSheets = (args) =>
   fxGeneric({
     ...args,
@@ -447,5 +451,6 @@ export const Syncit = {
   fxDriveExport,
   fxGetAccessToken,
   fxGetAccessTokenInfo,
-  fxGetSourceAccessTokenInfo
+  fxGetSourceAccessTokenInfo,
+  fxTestRetry
 }

package/debug_form.js

@@ -1,43 +0,0 @@
-import './main.js';
-import { Syncit } from './src/support/syncit.js';
-
-async function debug() {
-  Syncit.fxInit();
-  
-  try {
-    const resource = Forms.Form.create({
-      info: {
-        title: "Debug Form with Items"
-      }
-    });
-    const formId = resource.formId;
-    
-    // Add a text item
-    const updateRequest = {
-      requests: [{
-        createItem: {
-          item: {
-            title: "Question 1",
-            questionItem: {
-              question: {
-                textQuestion: { paragraph: false }
-              }
-            }
-          },
-          location: { index: 0 }
-        }
-      }]
-    };
-    
-    const updateResponse = Forms.Form.batchUpdate(updateRequest, formId);
-    console.log("Update Response:", JSON.stringify(updateResponse, null, 2));
-    
-    const fullForm = Forms.Form.get(formId);
-    console.log("Full Form Resource:", JSON.stringify(fullForm, null, 2));
-    
-  } catch (e) {
-    console.error("Error:", e);
-  }
-}
-
-debug();