@onexapis/cli 1.1.64 → 1.1.65

package/dist/index.mjs

@@ -1550,21 +1550,43 @@ async function installDependencies(projectPath, packageManager = "npm") {
   });
 }
 var AUTH_DIR = path8.join(os.homedir(), ".onexthm");
-var AUTH_FILE = path8.join(AUTH_DIR, "auth.json");
-function getApiUrl() {
-  return process.env.ONEXTHM_API_URL || "https://platform-dev.onexeos.com";
+var ENV_URLS = {
+  dev: "https://platform-dev.onexeos.com",
+  prod: "https://platform-staging.onexeos.com"
+};
+function getAuthFile(env = "dev") {
+  const newFile = path8.join(AUTH_DIR, `auth-${env}.json`);
+  if (env === "dev") {
+    const legacyFile = path8.join(AUTH_DIR, "auth.json");
+    if (fs.existsSync(legacyFile) && !fs.existsSync(newFile)) {
+      try {
+        fs.moveSync(legacyFile, newFile);
+      } catch {
+        try {
+          fs.copySync(legacyFile, newFile);
+          fs.removeSync(legacyFile);
+        } catch {
+        }
+      }
+    }
+  }
+  return newFile;
 }
-async function saveAuthTokens(tokens) {
+function getApiUrl(env = "dev") {
+  return process.env.ONEXTHM_API_URL || ENV_URLS[env];
+}
+async function saveAuthTokens(tokens, env = "dev") {
   await fs.ensureDir(AUTH_DIR);
   const key = getMachineKey();
   const data = JSON.stringify(tokens);
   const encrypted = encrypt(data, key);
-  await fs.writeFile(AUTH_FILE, encrypted, "utf-8");
+  await fs.writeFile(getAuthFile(env), encrypted, "utf-8");
 }
-function loadAuthTokens() {
+function loadAuthTokens(env = "dev") {
   try {
-    if (!fs.existsSync(AUTH_FILE)) return null;
-    const encrypted = fs.readFileSync(AUTH_FILE, "utf-8");
+    const file = getAuthFile(env);
+    if (!fs.existsSync(file)) return null;
+    const encrypted = fs.readFileSync(file, "utf-8");
     const key = getMachineKey();
     const data = decrypt(encrypted, key);
     return JSON.parse(data);
@@ -1572,34 +1594,34 @@ function loadAuthTokens() {
     return null;
   }
 }
-async function clearAuthTokens() {
+async function clearAuthTokens(env = "dev") {
   try {
-    await fs.remove(AUTH_FILE);
+    await fs.remove(getAuthFile(env));
   } catch {
   }
 }
 function isTokenExpired(tokens) {
   return Date.now() / 1e3 > tokens.expiresAt - 300;
 }
-async function getValidTokens() {
-  const tokens = loadAuthTokens();
+async function getValidTokens(env = "dev") {
+  const tokens = loadAuthTokens(env);
   if (!tokens) return null;
   if (!isTokenExpired(tokens)) return tokens;
   try {
-    const apiUrl = getApiUrl();
+    const apiUrl = getApiUrl(env);
     const response = await fetch(`${apiUrl}/auth/refresh`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ refresh_token: tokens.refreshToken })
     });
     if (!response.ok) {
-      await clearAuthTokens();
+      await clearAuthTokens(env);
       return null;
     }
     const data = await response.json();
     const body = data.statusCode ? data.body : data;
     if (!body.IdToken) {
-      await clearAuthTokens();
+      await clearAuthTokens(env);
       return null;
     }
     const refreshed = {
@@ -1608,17 +1630,19 @@ async function getValidTokens() {
       idToken: body.IdToken,
       expiresAt: Math.floor(Date.now() / 1e3) + (body.ExpiresIn || 3600)
     };
-    await saveAuthTokens(refreshed);
+    await saveAuthTokens(refreshed, env);
     return refreshed;
   } catch {
-    await clearAuthTokens();
+    await clearAuthTokens(env);
     return null;
   }
 }
-async function authenticatedFetch(url, init) {
-  const tokens = await getValidTokens();
+async function authenticatedFetch(url, init, env = "dev") {
+  const tokens = await getValidTokens(env);
   if (!tokens) {
-    throw new Error("Not logged in. Run: onexthm login");
+    throw new Error(
+      `Not logged in to ${env} environment. Run: onexthm login --env ${env}`
+    );
   }
   const headers = new Headers(init?.headers);
   headers.set("Authorization", `Bearer ${tokens.idToken}`);
@@ -1693,7 +1717,7 @@ async function initCommand(projectName, options = {}) {
   }
   if (!options.yes) {
     try {
-      const apiUrl = getApiUrl();
+      const apiUrl = getApiUrl(options.env ?? "dev");
       const controller = new AbortController();
       const timeout = setTimeout(() => controller.abort(), 3e3);
       const response = await fetch(
@@ -3005,9 +3029,7 @@ function showDownloadFailureHelp(themeId, apiUrl) {
   console.log();
   console.log(chalk4.white("2. Check API URL configuration:"));
   console.log(chalk4.gray(`   Current API URL: ${apiUrl}`));
-  console.log(
-    chalk4.gray("   Override with NEXT_PUBLIC_API_URL or ONEXTHM_API_URL")
-  );
+  console.log(chalk4.gray("   Override with ONEXTHM_API_URL env var if needed"));
   console.log();
   console.log(chalk4.white("3. Pin a specific version (CI/production):"));
   console.log(
@@ -3017,15 +3039,17 @@ function showDownloadFailureHelp(themeId, apiUrl) {
 }
 async function downloadCommand(options) {
   logger.header("Download Theme");
+  const env = options.env ?? "dev";
+  const apiUrl = getApiUrl(env);
+  logger.info(`Environment: ${env}  (${apiUrl})`);
   const spinner = ora("Initializing download...").start();
-  if (options.bucket || options.environment) {
+  if (options.bucket) {
     spinner.stop();
     logger.warning(
-      "--bucket and --environment are deprecated and ignored. Themes are now served via HTTP from the website-api Lambda."
+      "--bucket is deprecated and ignored. Themes are now served via HTTP from the website-api Lambda."
     );
     spinner.start();
   }
-  const apiUrl = getApiUrl();
   try {
     const themeId = options.themeId || process.env.NEXT_PUBLIC_THEME_ID || process.env.THEME_ID;
     const requestedVersion = options.version || process.env.THEME_VERSION || "latest";
@@ -3082,6 +3106,7 @@ async function downloadCommand(options) {
     console.log(
       chalk4.cyan("   Theme:   ") + chalk4.white(`${themeId}@${resolvedVersion}`)
     );
+    console.log(chalk4.cyan("   Env:     ") + chalk4.white(env));
     console.log(chalk4.cyan("   Source:  ") + chalk4.white(apiUrl));
     console.log(chalk4.cyan("   Output:  ") + chalk4.white(outputDir));
     console.log(chalk4.cyan("   Files:   ") + chalk4.white(entries.length));
@@ -3124,11 +3149,9 @@ async function resolveLatestVersion2(apiUrl, themeId) {
   }
   return latest;
 }
-async function fetchSourceZip(apiUrl, themeId, version) {
+async function fetchSourceZip(apiUrl, themeId, version, env) {
   const url = `${apiUrl}/website-api/themes/${encodeURIComponent(themeId)}/source?version=${encodeURIComponent(version)}`;
-  const response = await authenticatedFetch(url, {
-    method: "GET"
-  });
+  const response = await authenticatedFetch(url, { method: "GET" }, env);
   if (!response.ok) {
     if (response.status === 404) {
       throw new Error(
@@ -3137,7 +3160,7 @@ async function fetchSourceZip(apiUrl, themeId, version) {
     }
     if (response.status === 401 || response.status === 403) {
       throw new Error(
-        `Not authorized to download source for "${themeId}". Run \`onexthm login\` first.`
+        `Not authorized to download source for "${themeId}". Run \`onexthm login --env ${env}\` first.`
       );
     }
     throw new Error(
@@ -3256,14 +3279,19 @@ async function renameTheme(themeDir, oldName, newName) {
 }
 async function cloneCommand(themeName, options) {
   logger.header("Clone Theme Source");
-  if (options.bucket || options.environment) {
+  const env = options.env ?? "dev";
+  const apiUrl = getApiUrl(env);
+  logger.info(`Environment: ${env}  (${apiUrl})`);
+  if (options.bucket) {
     logger.warning(
-      "--bucket and --environment are deprecated and ignored. Source is now fetched via HTTP from the website-api Lambda."
+      "--bucket is deprecated and ignored. Source is now fetched via HTTP from the website-api Lambda."
     );
   }
-  const tokens = await getValidTokens();
+  const tokens = await getValidTokens(env);
   if (!tokens) {
-    logger.error("Not logged in. Run: onexthm login");
+    logger.error(
+      `Not logged in to ${env} environment. Run: onexthm login --env ${env}`
+    );
     process.exit(1);
   }
   let newName = options.name;
@@ -3272,7 +3300,6 @@ async function cloneCommand(themeName, options) {
   }
   const spinner = ora("Initializing clone...").start();
   try {
-    const apiUrl = getApiUrl();
     const outputDir = options.output || path8.resolve(process.cwd(), newName);
     if (await fs.pathExists(outputDir)) {
       spinner.fail(chalk4.red(`Directory already exists: ${outputDir}`));
@@ -3292,7 +3319,7 @@ async function cloneCommand(themeName, options) {
     spinner.start(`Downloading source.zip for ${themeName}@${version}...`);
     let zipBuffer;
     try {
-      zipBuffer = await fetchSourceZip(apiUrl, themeName, version);
+      zipBuffer = await fetchSourceZip(apiUrl, themeName, version, env);
     } catch (error) {
       spinner.fail(chalk4.red(error.message));
       console.log();
@@ -3326,7 +3353,7 @@ async function cloneCommand(themeName, options) {
         [
           "# API Configuration (enables real data in preview)",
           "# Get your Company ID from the OneX dashboard",
-          "NEXT_PUBLIC_API_URL=https://platform-dev.onexeos.com",
+          `NEXT_PUBLIC_API_URL=${apiUrl}`,
           "NEXT_PUBLIC_COMPANY_ID=",
           ""
         ].join("\n")
@@ -3379,6 +3406,7 @@ async function cloneCommand(themeName, options) {
     console.log(
       chalk4.cyan("   Source:   ") + chalk4.gray(`${themeName}@${version}`)
     );
+    console.log(chalk4.cyan("   Env:      ") + chalk4.white(env));
     console.log(chalk4.cyan("   Theme:    ") + chalk4.white(newName));
     console.log(chalk4.cyan("   Location: ") + chalk4.white(outputDir));
     console.log(chalk4.cyan("   Files:    ") + chalk4.white(entries.length));