@botim/botim-cli 0.0.4 → 0.0.5

package/dist/cli.js

@@ -6,16 +6,17 @@ import { displayExamples, displayQuickStart } from "./utils/help.js";
 import { logger } from "./utils/logger.js";
 import { isLoggedIn, getCurrentEnvironment, setCurrentEnvironment, getAllEnvironmentStatus } from "./utils/config.js";
 import { setRuntimeEnvironment, parseEnvironment, getEnvironmentDisplayName } from "./utils/environment.js";
+import { executeWithAuthRetry } from "./utils/auth-handler.js";
 import chalk from "chalk";
 import fs from "fs-extra";
 import path from "path";
-const version = "0.0.4";
+const version = "0.0.5";
 const program = new Command();
-program.name("botim-cli").description("CLI tool to generate boilerplate code for React and Vue applications").version(version, "-v, --version", "Output the current version").option("--env <environment>", "Target environment: prod or uat (overrides default)", (value) => {
+program.name("botim-cli").description("CLI tool to generate boilerplate code for React and Vue applications").version(version, "-v, --version", "Output the current version").option("--env <environment>", "Target environment: prod, uat, or beta (overrides default)", (value) => {
   const env = parseEnvironment(value);
   if (!env) {
     console.error(chalk.red(`
-Invalid environment: ${value}. Valid values: prod, uat
+Invalid environment: ${value}. Valid values: prod, uat, beta
 `));
     process.exit(1);
   }
@@ -108,10 +109,20 @@ program.command("status").description("Show login status for all environments").
     console.log(chalk.gray("    Not logged in"));
   }
   console.log("");
+  const betaStatus = allStatus.beta;
+  const betaIndicator = betaStatus.loggedIn ? chalk.green("\u2713") : chalk.red("\u2717");
+  const betaActive = currentEnv === "beta" ? chalk.cyan(" (active)") : "";
+  console.log(`  ${betaIndicator} Beta${betaActive}`);
+  if (betaStatus.loggedIn && betaStatus.partnerName) {
+    console.log(chalk.gray(`    Partner: ${betaStatus.partnerName}`));
+  } else if (!betaStatus.loggedIn) {
+    console.log(chalk.gray("    Not logged in"));
+  }
+  console.log("");
   console.log(chalk.gray("Tips:"));
   console.log(chalk.gray("  Switch environment: botim-cli config set env uat"));
-  console.log(chalk.gray("  One-time override:  botim-cli --env uat <command>"));
-  console.log(chalk.gray("  Login to uat:       botim-cli --env uat login\n"));
+  console.log(chalk.gray("  One-time override:  botim-cli --env beta <command>"));
+  console.log(chalk.gray("  Login to beta:      botim-cli --env beta login\n"));
 });
 program.command("auth").description("Access authenticated commands (requires login)").alias("authenticated").action(async () => {
   await showMenuOrRequireAuth();
@@ -166,88 +177,128 @@ Audience Options:
   1 - Private (only accessible to specific users)
   2 - Public (accessible to all users) (default)
 `).action(async (options) => {
-  const loggedIn = await isLoggedIn();
-  if (!loggedIn) {
-    const currentEnv = await getCurrentEnvironment();
-    const envDisplay = getEnvironmentDisplayName(currentEnv);
-    console.log(chalk.red(`
+  try {
+    const loggedIn = await isLoggedIn();
+    if (!loggedIn) {
+      const currentEnv = await getCurrentEnvironment();
+      const envDisplay = getEnvironmentDisplayName(currentEnv);
+      console.log(chalk.red(`
 \u274C Authentication required for ${envDisplay}. Please login first using: botim-cli ${currentEnv === "uat" ? "--env uat " : ""}login
 `));
+      process.exit(1);
+    }
+    const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
+    const command = authenticatedCommandRegistry.get("cmp");
+    if (command) {
+      const processedOptions = {
+        ...options,
+        audience: parseInt(options.audience, 10)
+      };
+      await executeWithAuthRetry(
+        () => command.execute(processedOptions),
+        { commandName: "create-mp-app", retryAfterLogin: true }
+      );
+    }
+  } catch (error) {
+    logger.error("create-mp-app command failed", error);
     process.exit(1);
   }
-  const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
-  const command = authenticatedCommandRegistry.get("cmp");
-  if (command) {
-    const processedOptions = {
-      ...options,
-      audience: parseInt(options.audience, 10)
-    };
-    await command.execute(processedOptions);
-  }
 });
 program.command("init-mp-app").description("Initialize MP app in current directory (requires authentication)").alias("init-mp").action(async () => {
-  const loggedIn = await isLoggedIn();
-  if (!loggedIn) {
-    const currentEnv = await getCurrentEnvironment();
-    const envDisplay = getEnvironmentDisplayName(currentEnv);
-    console.log(chalk.red(`
+  try {
+    const loggedIn = await isLoggedIn();
+    if (!loggedIn) {
+      const currentEnv = await getCurrentEnvironment();
+      const envDisplay = getEnvironmentDisplayName(currentEnv);
+      console.log(chalk.red(`
 \u274C Authentication required for ${envDisplay}. Please login first using: botim-cli ${currentEnv === "uat" ? "--env uat " : ""}login
 `));
+      process.exit(1);
+    }
+    const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
+    const command = authenticatedCommandRegistry.get("init-mp-app");
+    if (command) {
+      await executeWithAuthRetry(
+        () => command.execute(),
+        { commandName: "init-mp-app", retryAfterLogin: true }
+      );
+    }
+  } catch (error) {
+    logger.error("init-mp-app command failed", error);
     process.exit(1);
   }
-  const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
-  const command = authenticatedCommandRegistry.get("init-mp-app");
-  if (command) {
-    await command.execute();
-  }
 });
 program.command("deploy-mp-app").description("Deploy MP app to server (requires authentication)").alias("deploy").option("-w, --website <url>", "Website/Endpoint URL (required for H5BRIDGE apps)").option("-n, --note <note>", 'Review note (optional, defaults to "Deployed via CLI")').option("-t, --testflight", "Release to TestFlight (Beta) - this is the default for direct mode").option("-y, --yes", "Skip confirmation prompts (Note: Production releases require interactive mode)").action(async (options) => {
-  const loggedIn = await isLoggedIn();
-  if (!loggedIn) {
-    const currentEnv = await getCurrentEnvironment();
-    const envDisplay = getEnvironmentDisplayName(currentEnv);
-    console.log(chalk.red(`
+  try {
+    const loggedIn = await isLoggedIn();
+    if (!loggedIn) {
+      const currentEnv = await getCurrentEnvironment();
+      const envDisplay = getEnvironmentDisplayName(currentEnv);
+      console.log(chalk.red(`
 \u274C Authentication required for ${envDisplay}. Please login first using: botim-cli ${currentEnv === "uat" ? "--env uat " : ""}login
 `));
+      process.exit(1);
+    }
+    const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
+    const command = authenticatedCommandRegistry.get("deploy-mp-app");
+    if (command) {
+      await executeWithAuthRetry(
+        () => command.execute(options),
+        { commandName: "deploy-mp-app", retryAfterLogin: true }
+      );
+    }
+  } catch (error) {
+    logger.error("deploy-mp-app command failed", error);
     process.exit(1);
   }
-  const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
-  const command = authenticatedCommandRegistry.get("deploy-mp-app");
-  if (command) {
-    await command.execute(options);
-  }
 });
 program.command("debug-mp-app").description("Debug MP app (requires authentication and botim_config.json)").alias("debug").action(async () => {
-  const loggedIn = await isLoggedIn();
-  if (!loggedIn) {
-    const currentEnv = await getCurrentEnvironment();
-    const envDisplay = getEnvironmentDisplayName(currentEnv);
-    console.log(chalk.red(`
+  try {
+    const loggedIn = await isLoggedIn();
+    if (!loggedIn) {
+      const currentEnv = await getCurrentEnvironment();
+      const envDisplay = getEnvironmentDisplayName(currentEnv);
+      console.log(chalk.red(`
 \u274C Authentication required for ${envDisplay}. Please login first using: botim-cli ${currentEnv === "uat" ? "--env uat " : ""}login
 `));
+      process.exit(1);
+    }
+    const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
+    const command = authenticatedCommandRegistry.get("debug-mp-app");
+    if (command) {
+      await executeWithAuthRetry(
+        () => command.execute(),
+        { commandName: "debug-mp-app", retryAfterLogin: true }
+      );
+    }
+  } catch (error) {
+    logger.error("debug-mp-app command failed", error);
     process.exit(1);
   }
-  const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
-  const command = authenticatedCommandRegistry.get("debug-mp-app");
-  if (command) {
-    await command.execute();
-  }
 });
 program.command("list-mp-permissions [app-id]").description("List permissions for a mini-program app (requires authentication)").alias("perms").action(async (appId) => {
-  const loggedIn = await isLoggedIn();
-  if (!loggedIn) {
-    const currentEnv = await getCurrentEnvironment();
-    const envDisplay = getEnvironmentDisplayName(currentEnv);
-    console.log(chalk.red(`
+  try {
+    const loggedIn = await isLoggedIn();
+    if (!loggedIn) {
+      const currentEnv = await getCurrentEnvironment();
+      const envDisplay = getEnvironmentDisplayName(currentEnv);
+      console.log(chalk.red(`
 \u274C Authentication required for ${envDisplay}. Please login first using: botim-cli ${currentEnv === "uat" ? "--env uat " : ""}login
 `));
+      process.exit(1);
+    }
+    const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
+    const command = authenticatedCommandRegistry.get("list-mp-permissions");
+    if (command) {
+      await executeWithAuthRetry(
+        () => command.execute({ appId }),
+        { commandName: "list-mp-permissions", retryAfterLogin: true }
+      );
+    }
+  } catch (error) {
+    logger.error("list-mp-permissions command failed", error);
     process.exit(1);
   }
-  const { authenticatedCommandRegistry } = await import("./commands/auth/index.js");
-  const command = authenticatedCommandRegistry.get("list-mp-permissions");
-  if (command) {
-    await command.execute({ appId });
-  }
 });
 const configCommand = program.command("config").description("Manage CLI configuration");
 configCommand.command("set <key> <value>").description("Set a configuration value").action(async (key, value) => {
@@ -259,7 +310,7 @@ configCommand.command("set <key> <value>").description("Set a configuration valu
     if (!env) {
       console.log(chalk.red(`\u274C Invalid environment: ${value}
 `));
-      console.log(chalk.yellow("Valid values: prod, production, uat\n"));
+      console.log(chalk.yellow("Valid values: prod, production, uat, beta\n"));
       process.exit(1);
     }
     await setCurrentEnvironment(env);
@@ -288,7 +339,7 @@ configCommand.command("set <key> <value>").description("Set a configuration valu
     console.log(chalk.red(`\u274C Unknown configuration key: ${key}
 `));
     console.log(chalk.yellow("Available keys:\n"));
-    console.log(chalk.yellow("  - env (or environment): Set default environment (prod, uat)\n"));
+    console.log(chalk.yellow("  - env (or environment): Set default environment (prod, uat, beta)\n"));
     console.log(chalk.yellow("\nNote: Template repository URLs are configured via .env file, not CLI commands.\n"));
     process.exit(1);
   }
@@ -529,9 +580,12 @@ async function showMainMenu() {
       const command = authenticatedCommandRegistry.get(commandName);
       if (command) {
         try {
-          await command.execute();
+          await executeWithAuthRetry(
+            () => command.execute(),
+            { commandName, retryAfterLogin: true }
+          );
         } catch (error) {
-          console.error(chalk.red("\n\u274C Error executing command:"), error);
+          logger.error("Command execution failed", error);
           process.exit(1);
         }
       }
@@ -578,6 +632,10 @@ async function showMainMenu() {
               name: `UAT ${allStatus.uat.loggedIn ? chalk.green("\u2713 Logged in") : chalk.gray("(not logged in)")}${currentEnv === "uat" ? chalk.cyan(" \u2190 current") : ""}`,
               value: "uat"
             },
+            {
+              name: `Beta ${allStatus.beta.loggedIn ? chalk.green("\u2713 Logged in") : chalk.gray("(not logged in)")}${currentEnv === "beta" ? chalk.cyan(" \u2190 current") : ""}`,
+              value: "beta"
+            },
             new inquirer.Separator(),
             { name: "\u2190 Back to main menu", value: "back" }
           ]
@@ -619,6 +677,13 @@ async function showMainMenu() {
       if (uatStatus.loggedIn && uatStatus.partnerName) {
         console.log(chalk.gray(`    Partner: ${uatStatus.partnerName}`));
       }
+      const betaStatus = allStatus.beta;
+      const betaIndicator = betaStatus.loggedIn ? chalk.green("\u2713") : chalk.red("\u2717");
+      const betaActive = currentEnv === "beta" ? chalk.cyan(" (active)") : "";
+      console.log(`  ${betaIndicator} Beta${betaActive}`);
+      if (betaStatus.loggedIn && betaStatus.partnerName) {
+        console.log(chalk.gray(`    Partner: ${betaStatus.partnerName}`));
+      }
       console.log("");
       await showMainMenu();
     } else if (action === "login") {