@popina/cli 5.1.1 → 5.1.2-20260910122156Z

package/build/index.js

@@ -151,71 +151,7 @@ async function fetchEnv(email3) {
 
 // src/utils/gcloud/login-to-google.ts
 import * as p5 from "@clack/prompts";
-import { $ as $8 } from "zx/core";
-var emailRegex = /[\w.+-]+@[\w.-]+\.[a-z]{2,}/i;
-async function getActiveGoogleAccount() {
-  try {
-    const { stdout } = await $8`gcloud config get-value account`.quiet();
-    return stdout.match(emailRegex)?.[0];
-  } catch {
-    return void 0;
-  }
-}
-async function loginGoogle() {
-  const activeAccount = await getActiveGoogleAccount();
-  if (activeAccount) return activeAccount;
-  await $8`gcloud auth login`;
-  const authenticatedAccount = await getActiveGoogleAccount();
-  if (!authenticatedAccount) {
-    p5.log.warn(
-      "Could not detect your Google account email. Add INITIAL_SUPER_ADMIN_EMAIL to .env manually after setup."
-    );
-  }
-  return authenticatedAccount;
-}
-
-// src/utils/get-env-config.ts
-import fse2 from "fs-extra";
-import path from "path";
-var removeDirectory = (dir) => {
-  try {
-    fse2.rmSync(dir, { recursive: true });
-  } catch (error51) {
-    console.error(`Error removing directory: ${error51}`);
-    process.exit(1);
-  }
-};
-var copyDirectory = (source, destination) => {
-  try {
-    if (fse2.existsSync(destination)) {
-      removeDirectory(destination);
-    }
-    fse2.mkdirSync(destination, { recursive: true });
-    fse2.readdirSync(source).forEach((file2) => {
-      const sourcePath = path.join(source, file2);
-      const destinationPath = path.join(destination, file2);
-      if (fse2.lstatSync(sourcePath).isDirectory()) {
-        copyDirectory(sourcePath, destinationPath);
-      } else {
-        fse2.copyFileSync(sourcePath, destinationPath);
-      }
-    });
-  } catch (error51) {
-    console.error(`Error copying directory: ${error51}`);
-    process.exit(1);
-  }
-};
-var getEnvConfig = async (envConfigPath, envConfigCopyPath) => {
-  copyDirectory(envConfigPath, envConfigCopyPath);
-  const envConfig = await import(`${envConfigCopyPath}/index.mjs`).then((module) => module.envConfig).catch((error51) => {
-    console.error(`Error importing env config: ${error51}`);
-    process.exit(1);
-  });
-  return envConfig;
-};
-var removeEnvConfig = (envConfigCopyPath) => {
-  removeDirectory(envConfigCopyPath);
-};
+import { backOff } from "exponential-backoff";
 
 // ../../node_modules/.pnpm/zod@4.4.3/node_modules/zod/v4/classic/external.js
 var external_exports = {};
@@ -14731,8 +14667,103 @@ function date4(params) {
 // ../../node_modules/.pnpm/zod@4.4.3/node_modules/zod/v4/classic/external.js
 config(en_default());
 
+// src/utils/gcloud/login-to-google.ts
+import { $ as $8 } from "zx/core";
+var EMAIL_REGEX = /[\w.+-]+@[\w.-]+\.[a-z]{2,}/i;
+async function loginGoogle() {
+  return await backOff(
+    async () => await $8({
+      input: process.stdin,
+      quiet: true
+    })`gcloud config get-value account`.then((processOutput) => {
+      if (processOutput.stdout.length === 0) {
+        throw new Error("new account");
+      }
+      return processOutput;
+    }),
+    {
+      retry: async (error51, attemptNumber) => {
+        if (attemptNumber > 3) {
+          p5.log.error(
+            `\u{1F534} Couldn't manually re-authenticate (exceeded max 3 attempts): ${error51.message}`
+          );
+          process.exit(1);
+        }
+        const isNewAccount = error51.message.includes("new account");
+        const isTokenExpired = error51.message.includes(
+          // cspell: disable-next-line
+          "There was a problem refreshing your current auth tokens: Reauthentication failed"
+        );
+        if (!isNewAccount && !isTokenExpired) {
+          p5.log.error(`\u{1F534} gcloud get-value account failed: ${error51.message}`);
+          process.exit(1);
+        }
+        p5.log.info(`\u23F3 Auth tokens expired, manual re-authentication required`);
+        await $8({ input: process.stdin, quiet: true })`gcloud auth login`.then(() => {
+          p5.log.success("\u2705 Manual re-authentication succeeded");
+        }).catch((error52) => {
+          p5.log.error(`\u{1F534} Couldn't re-authenticate: ${error52.message}`);
+        });
+        return true;
+      }
+    }
+  ).then(({ stdout }) => {
+    const parsedEmail = external_exports.email({ pattern: EMAIL_REGEX }).safeParse(stdout);
+    if (!parsedEmail.success) {
+      p5.log.error(
+        `\u{1F534} Couldn't parse user email (${stdout}): ${external_exports.prettifyError(parsedEmail.error)}`
+      );
+      process.exit(1);
+    }
+    return parsedEmail.data;
+  });
+}
+
+// src/utils/get-env-config.ts
+import fse2 from "fs-extra";
+import path from "path";
+var removeDirectory = (dir) => {
+  try {
+    fse2.rmSync(dir, { recursive: true });
+  } catch (error51) {
+    console.error(`Error removing directory: ${error51}`);
+    process.exit(1);
+  }
+};
+var copyDirectory = (source, destination) => {
+  try {
+    if (fse2.existsSync(destination)) {
+      removeDirectory(destination);
+    }
+    fse2.mkdirSync(destination, { recursive: true });
+    fse2.readdirSync(source).forEach((file2) => {
+      const sourcePath = path.join(source, file2);
+      const destinationPath = path.join(destination, file2);
+      if (fse2.lstatSync(sourcePath).isDirectory()) {
+        copyDirectory(sourcePath, destinationPath);
+      } else {
+        fse2.copyFileSync(sourcePath, destinationPath);
+      }
+    });
+  } catch (error51) {
+    console.error(`Error copying directory: ${error51}`);
+    process.exit(1);
+  }
+};
+var getEnvConfig = async (envConfigPath, envConfigCopyPath) => {
+  copyDirectory(envConfigPath, envConfigCopyPath);
+  const envConfig = await import(`${envConfigCopyPath}/index.mjs`).then((module) => module.envConfig).catch((error51) => {
+    console.error(`Error importing env config: ${error51}`);
+    process.exit(1);
+  });
+  return envConfig;
+};
+var removeEnvConfig = (envConfigCopyPath) => {
+  removeDirectory(envConfigCopyPath);
+};
+
 // package.json
-var version2 = "5.1.1";
+var version2 = "5.1.2-20260910122156Z";
 
 // src/utils/get-package-info.ts
 async function getPackageInfo() {