@mcpher/gas-fakes 2.3.6 → 2.3.8

package/README.md

@@ -188,6 +188,8 @@ As I mentioned earlier, to take this further, I'm going to need a lot of help to
 - [github actions using dwd and wif](https://github.com/brucemcpherson/gas-fakes-actions-dwd)
 - [ksuite as a back end](ksuite_poc.md)
 - [msgraph as a back end](msgraph.md)
+- [resurrecting scriptDb repo](https://github.com/brucemcpherson/scriptdb-redux)
+- [Resurrecting ScriptDb – nosql database for Apps Script](https://ramblings.mcpher.com/resurrecting-scriptdb-nosql-database-for-apps-script/)
 - [gas-fakes in serverless containers](https://docs.google.com/presentation/d/1JlXF9T--DD4ERHopyP3WyAMhjRCxxHblgCP5ynxaJ3k/edit?usp=sharing)
 - [apps script - a lingua franca for workspace platforms](https://ramblings.mcpher.com/apps-script-a-lingua-franca/)
 - [Apps Script: A ‘Lingua Franca’ for the Multi-Cloud Era](https://ramblings.mcpher.com/apps-script-with-ksuite/)

package/appsscript.json

@@ -3,17 +3,17 @@
   "exceptionLogging": "STACKDRIVER",
   "runtimeVersion": "V8",
   "oauthScopes": [
+    "openid",
+    "https://www.googleapis.com/auth/userinfo.email",
     "https://www.googleapis.com/auth/cloud-platform",
     "https://www.googleapis.com/auth/drive",
     "https://www.googleapis.com/auth/sqlservice",
     "https://www.googleapis.com/auth/script.external_request",
     "https://www.googleapis.com/auth/spreadsheets",
-    "https://www.googleapis.com/auth/userinfo.email",
     "https://www.googleapis.com/auth/documents",
     "https://www.googleapis.com/auth/presentations",
     "https://www.googleapis.com/auth/forms",
     "https://mail.google.com/",
-    "openid",
     "https://www.googleapis.com/auth/calendar"
   ],
   "dependencies": {
@@ -99,4 +99,4 @@
       }
     ]
   }
-}
+}

package/package.json

@@ -38,7 +38,7 @@
   },
   "name": "@mcpher/gas-fakes",
   "author": "bruce mcpherson",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "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/setup.js

@@ -5,7 +5,7 @@ import path from "path";
 import os from "os";
 import { randomUUID } from "node:crypto";
 import { execSync } from "child_process";
-import { checkForGcloudCli, runCommandSync } from "./utils.js";
+import { checkForGcloudCli, runCommandSync, runCommandWithRetrySync } from "./utils.js";
 import { getMsGraphToken, mapGasScopesToMsGraph } from "../support/msgraph/msauth.js";
 
 // --- Utility Functions ---
@@ -65,7 +65,7 @@ async function findEnvFiles(dir) {
 // --- Exported Command Implementations ---
 
 export async function initializeConfiguration(options = {}) {
-  console.log("...gas-fakes init v2.2.4 starting");
+  console.log("...gas-fakes init starting");
   let envPath;
 
   // need to figure out which env file we are operating on
@@ -794,9 +794,9 @@ export async function authenticateUser(options = {}) {
         }
 
         console.log("...applying IAM permissions");
-        runCommandSync(`gcloud projects add-iam-policy-binding "${projectId}" --member="serviceAccount:${sa_email}" --role="roles/editor" --quiet`, true);
-        runCommandSync(`gcloud iam service-accounts add-iam-policy-binding "${sa_email}" --member="serviceAccount:${sa_email}" --role="roles/iam.serviceAccountTokenCreator" --quiet`, true);
-        runCommandSync(`gcloud iam service-accounts add-iam-policy-binding "${sa_email}" --member="user:${current_user}" --role="roles/iam.serviceAccountTokenCreator" --quiet`, true);
+        runCommandWithRetrySync(`gcloud projects add-iam-policy-binding "${projectId}" --member="serviceAccount:${sa_email}" --role="roles/editor" --quiet`, true);
+        runCommandWithRetrySync(`gcloud iam service-accounts add-iam-policy-binding "${sa_email}" --member="serviceAccount:${sa_email}" --role="roles/iam.serviceAccountTokenCreator" --quiet`, true);
+        runCommandWithRetrySync(`gcloud iam service-accounts add-iam-policy-binding "${sa_email}" --member="user:${current_user}" --role="roles/iam.serviceAccountTokenCreator" --quiet`, true);
 
         const saUniqueId = execSync(`gcloud iam service-accounts describe "${sa_email}" --format="value(uniqueId)"`, { shell: true }).toString().trim();
         console.log(`\n\x1b[1;33m*************************************************************************************************`);

package/src/cli/utils.js

@@ -99,6 +99,27 @@ export function runCommandSync(command, silent = false) {
   }
 }
 
+/**
+ * Helper function to run a shell command sync with retries (useful for GCP eventual consistency).
+ */
+export function runCommandWithRetrySync(command, silent = false, retries = 5, delay = 5000) {
+  for (let i = 0; i <= retries; i++) {
+    try {
+      execSync(command, { stdio: silent ? "ignore" : "inherit", shell: true });
+      return;
+    } catch (error) {
+      if (i < retries) {
+        console.log(`...command failed, retrying in ${delay / 1000}s (${i + 1}/${retries})...`);
+        const start = Date.now();
+        while (Date.now() - start < delay);
+        continue;
+      }
+      console.error(`\nError executing command after ${retries} retries: ${command}`);
+      process.exit(1);
+    }
+  }
+}
+
 /**
  * Parses sandbox-related CLI options into a structured config object.
  */

package/src/support/env-loader.js

@@ -1,6 +1,6 @@
 import dotenv from 'dotenv';
 import { existsSync } from 'node:fs';
-import { join, dirname } from 'node:path';
+import { join, dirname, resolve } from 'node:path';
 
 /**
  * Conditionally loads environment variables from a .env file.
@@ -11,27 +11,47 @@ import { join, dirname } from 'node:path';
  * 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).
+ * 
+ * It also checks process.argv in case the user mistakenly passed --env-file
+ * after the script name.
  */
 
-// Check if node was run with --env-file
+// Check if node was run with --env-file natively
 const hasEnvFileFlag = process.execArgv.some(arg => arg.startsWith('--env-file'));
 
 if (!hasEnvFileFlag) {
   // Suppress dotenv logs/tips
   process.env.DOTENV_CONFIG_NO_TIP = 'true';
   
-  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, override: false, quiet: true });
+  // Check if --env-file was passed as a script argument
+  let customEnvPath = null;
+  const argvEnvFileIdx = process.argv.findIndex(arg => arg === '--env-file');
+  
+  if (argvEnvFileIdx !== -1 && process.argv.length > argvEnvFileIdx + 1) {
+    customEnvPath = resolve(process.cwd(), process.argv[argvEnvFileIdx + 1]);
+  } else {
+    const argvEnvFileMatch = process.argv.find(arg => arg.startsWith('--env-file='));
+    if (argvEnvFileMatch) {
+      customEnvPath = resolve(process.cwd(), argvEnvFileMatch.split('=')[1]);
+    }
+  }
+
+  if (customEnvPath && existsSync(customEnvPath)) {
+    dotenv.config({ path: customEnvPath, override: false, quiet: true });
+  } else {
+    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, override: false, quiet: true });
+      } else {
+        // Fallback to default dotenv behavior (CWD)
+        dotenv.config({ override: false, quiet: true });
+      }
     } else {
-      // Fallback to default dotenv behavior (CWD)
+      // Fallback if mainScript is not available (e.g. REPL)
       dotenv.config({ override: false, quiet: true });
     }
-  } else {
-    // Fallback if mainScript is not available (e.g. REPL)
-    dotenv.config({ override: false, quiet: true });
   }
 }

package/src/support/sxauth.js

@@ -67,6 +67,8 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, cachePath,
       if (!_loggedSummary) {
         syncLog(`...appsscript.json missing or missing scopes. Emulating manifest using scopes from .env file`);
       }
+    } else if (!_loggedSummary) {
+      syncWarn(`...Warning: No appsscript.json found and .env file missing or no DEFAULT_SCOPES/EXTRA_SCOPES defined in .env. Downstream API calls may fail with 'insufficient authentication scopes'.`);
     }
   }
 
@@ -97,6 +99,26 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, cachePath,
       mandatoryScopes.forEach(scope => scopeSet.add(scope))
       const finalScopes = Array.from(scopeSet)
 
+      // Check for file-type scopes that also require Drive scope
+      const hasWorkspaceFileScope = finalScopes.some(s => 
+        s.includes('auth/spreadsheets') || 
+        s.includes('auth/documents') || 
+        s.includes('auth/presentations') || 
+        s.includes('auth/forms')
+      );
+      const hasDriveScope = finalScopes.some(s => s.includes('auth/drive'));
+
+      if (hasWorkspaceFileScope && !hasDriveScope && !_loggedSummary) {
+        const envScopesStr = (process.env.DEFAULT_SCOPES || "") + "," + (process.env.EXTRA_SCOPES || "");
+        const envHasDrive = envScopesStr.includes("auth/drive");
+        
+        if (envHasDrive) {
+          syncWarn(`...Warning: A Workspace file scope (e.g., spreadsheets) was requested, but the Drive scope is missing from your appsscript.json. Your .env file permits Drive access, so please add "https://www.googleapis.com/auth/drive" to your appsscript.json.`);
+        } else {
+          syncWarn(`...Warning: A Workspace file scope (e.g., spreadsheets) was requested, but the Drive scope is missing. Please add "https://www.googleapis.com/auth/drive" to your appsscript.json and .env file (EXTRA_SCOPES), then re-run 'gas-fakes auth' to re-authenticate.`);
+        }
+      }
+
       await Auth.setAuth(finalScopes);
 
       const [activeInfo, effectiveInfo] = await Promise.all([