@layr-labs/ecloud-cli 0.4.3 → 0.5.0-dev.3

package/dist/commands/compute/app/deploy.js

@@ -190,7 +190,6 @@ import { privateKeyToAccount as privateKeyToAccount3 } from "viem/accounts";
 import {
   getEnvironmentConfig as getEnvironmentConfig2,
   getAvailableEnvironments,
-  isEnvironmentAvailable,
   getAllAppsByDeveloper as getAllAppsByDeveloper2,
   getCategoryDescriptions,
   fetchTemplateCatalog,
@@ -305,7 +304,7 @@ function findAvailableName(environment, baseName) {
 
 // src/utils/version.ts
 function getCliVersion() {
-  return true ? "0.4.3" : "0.0.0";
+  return true ? "0.5.0-dev.3" : "0.0.0";
 }
 function getClientId() {
   return `ecloud-cli/v${getCliVersion()}`;
@@ -313,6 +312,13 @@ function getClientId() {
 
 // src/utils/prompts.ts
 import { execSync } from "child_process";
+function ensureInteractive(missingFlagHint) {
+  if (!process.stdin.isTTY) {
+    throw new Error(
+      `Cannot prompt in non-interactive mode. Provide ${missingFlagHint} via CLI flags or environment variables.`
+    );
+  }
+}
 async function getDockerfileInteractive(dockerfilePath) {
   if (dockerfilePath) {
     return dockerfilePath;
@@ -322,6 +328,7 @@ async function getDockerfileInteractive(dockerfilePath) {
   if (!fs3.existsSync(dockerfilePath_resolved)) {
     return "";
   }
+  ensureInteractive("--dockerfile or --image-ref");
   console.log(`
 Found Dockerfile in ${cwd}`);
   const choice = await select({
@@ -364,10 +371,12 @@ function detectGitRepoInfo() {
     return {};
   }
 }
-async function promptUseVerifiableBuild() {
+async function promptUseVerifiableBuild(force = false) {
+  if (force) return false;
   return confirmWithDefault("Build from verifiable source?", false);
 }
 async function promptVerifiableSourceType() {
+  ensureInteractive("--verifiable with --repo/--commit or --image-ref");
   return select({
     message: "Choose verifiable source type:",
     choices: [
@@ -377,6 +386,7 @@ async function promptVerifiableSourceType() {
   });
 }
 async function promptVerifiableGitSourceInputs() {
+  ensureInteractive("--repo, --commit");
   const detected = detectGitRepoInfo();
   const repoUrl = (await input({
     message: "Enter public git repository URL:",
@@ -458,6 +468,7 @@ async function promptVerifiableGitSourceInputs() {
   };
 }
 async function promptVerifiablePrebuiltImageRef() {
+  ensureInteractive("--image-ref");
   const ref = await input({
     message: "Enter prebuilt verifiable image ref:",
     default: "docker.io/eigenlayer/eigencloud-containers:",
@@ -548,6 +559,7 @@ async function getAvailableRegistries() {
     const auths = config.auths || {};
     const credsStore = config.credsStore;
     const gcrProjects = /* @__PURE__ */ new Map();
+    const dockerhubUsers = /* @__PURE__ */ new Map();
     const registries = [];
     for (const [registry, auth] of Object.entries(auths)) {
       const authData = auth;
@@ -588,8 +600,17 @@ async function getAvailableRegistries() {
         }
         continue;
       }
+      if (registryType === "dockerhub") {
+        if (!dockerhubUsers.has(username)) {
+          dockerhubUsers.set(username, info);
+        }
+        continue;
+      }
       registries.push(info);
     }
+    for (const dhInfo of Array.from(dockerhubUsers.values())) {
+      registries.push(dhInfo);
+    }
     for (const gcrInfo of Array.from(gcrProjects.values())) {
       registries.push(gcrInfo);
     }
@@ -692,6 +713,7 @@ async function getImageReferenceInteractive(imageRef, buildFromDockerfile = fals
   if (imageRef) {
     return imageRef;
   }
+  ensureInteractive("--image-ref");
   const registries = await getAvailableRegistries();
   const appName = getDefaultAppName();
   if (buildFromDockerfile) {
@@ -721,6 +743,7 @@ async function getImageReferenceInteractive(imageRef, buildFromDockerfile = fals
   return imageRefInput;
 }
 async function getAvailableAppNameInteractive(environment, imageRef, suggestedBaseName, skipDefaultName) {
+  ensureInteractive("--name");
   const baseName = skipDefaultName ? void 0 : suggestedBaseName || extractAppNameFromImage(imageRef);
   const suggestedName = baseName ? findAvailableName(environment, baseName) : void 0;
   while (true) {
@@ -768,6 +791,7 @@ async function getEnvFileInteractive(envFilePath) {
   if (fs3.existsSync(".env")) {
     return ".env";
   }
+  ensureInteractive("--env-file");
   console.log("\nEnvironment file not found.");
   console.log("Environment files contain variables like RPC_URL, etc.");
   const choice = await select({
@@ -819,14 +843,19 @@ async function getInstanceTypeInteractive(instanceType, defaultSKU, availableTyp
     const validSKUs = availableTypes.map((t) => t.sku).join(", ");
     throw new Error(`Invalid instance-type: ${instanceType} (must be one of: ${validSKUs})`);
   }
+  ensureInteractive("--instance-type");
   const isCurrentType = defaultSKU !== "";
   const hasPricing = availableTypes.some((t) => t.monthly_price_usd != null);
   if (hasPricing) {
     console.log("\nPay for what you use \u2014 no upfront costs, per-hour billing.\n");
     console.log(`  ${chalk.bold("Shielded VM (vTPM)")}: Verified boot and runtime attestation.`);
-    console.log(`  ${chalk.bold("SEV-SNP (TEE)")}: Verified boot, runtime attestation, and hardware-encrypted memory (AMD).`);
-    console.log(`  ${chalk.bold("TDX (TEE)")}: Verified boot, runtime attestation, and hardware-encrypted memory (Intel).
-`);
+    console.log(
+      `  ${chalk.bold("SEV-SNP (TEE)")}: Verified boot, runtime attestation, and hardware-encrypted memory (AMD).`
+    );
+    console.log(
+      `  ${chalk.bold("TDX (TEE)")}: Verified boot, runtime attestation, and hardware-encrypted memory (Intel).
+`
+    );
   }
   if (isCurrentType && defaultSKU) {
     console.log(`Current instance type: ${defaultSKU}
@@ -860,6 +889,7 @@ async function getLogSettingsInteractive(logVisibility) {
         );
     }
   }
+  ensureInteractive("--log-visibility");
   const choice = await select({
     message: "Do you want to view your app's logs?",
     choices: [
@@ -891,6 +921,7 @@ async function getResourceUsageMonitoringInteractive(resourceUsageMonitoring) {
         );
     }
   }
+  ensureInteractive("--resource-usage-monitoring");
   const choice = await select({
     message: "Show resource usage (CPU/memory) for your app?",
     choices: [
@@ -904,6 +935,11 @@ async function confirm(prompt) {
   return confirmWithDefault(prompt, false);
 }
 async function confirmWithDefault(prompt, defaultValue = false) {
+  if (!process.stdin.isTTY) {
+    throw new Error(
+      `Cannot confirm "${prompt}" in non-interactive mode. Use --force to skip confirmation prompts.`
+    );
+  }
   return await inquirerConfirm({
     message: prompt,
     default: defaultValue
@@ -921,6 +957,7 @@ async function getPrivateKeyInteractive(privateKey) {
   if (result) {
     return result.key;
   }
+  ensureInteractive("--private-key or ECLOUD_PRIVATE_KEY");
   const key = await password({
     message: "Enter private key:",
     mask: true,
@@ -938,15 +975,10 @@ async function getPrivateKeyInteractive(privateKey) {
 }
 async function getEnvironmentInteractive(environment) {
   if (environment) {
-    try {
-      getEnvironmentConfig2(environment);
-      if (!isEnvironmentAvailable(environment)) {
-        throw new Error(`Environment ${environment} is not available in this build`);
-      }
-      return environment;
-    } catch {
-    }
+    getEnvironmentConfig2(environment);
+    return environment;
   }
+  ensureInteractive("--environment or ECLOUD_ENV");
   const availableEnvs = getAvailableEnvironments();
   let defaultEnv;
   const configDefaultEnv = getDefaultEnvironment();
@@ -1049,6 +1081,7 @@ function validateImagePath(filePath) {
   return void 0;
 }
 async function getAppProfileInteractive(defaultName = "", allowRetry = true) {
+  ensureInteractive("--skip-profile or --website/--description/--x-url/--image");
   while (true) {
     const name = await getAppNameForProfile(defaultName);
     const website = await getAppWebsiteInteractive();
@@ -1686,6 +1719,10 @@ var AppDeploy = class _AppDeploy extends Command {
       description: "Optional path to Caddyfile inside the repo (relative to build context). If omitted, auto-detected from env file TLS settings",
       required: false,
       env: "ECLOUD_BUILD_CADDYFILE"
+    }),
+    force: Flags2.boolean({
+      description: "Skip all confirmation prompts",
+      default: false
     })
   };
   async run() {
@@ -1705,12 +1742,12 @@ var AppDeploy = class _AppDeploy extends Command {
       if (balance === 0n) {
         const isSepolia = environmentConfig.chainID === BigInt(11155111);
         this.log(
-          chalk2.yellow(`
-Warning: Wallet ${chalk2.bold(address)} has zero balance on ${environment}.`)
-        );
-        this.log(
-          chalk2.yellow(`You will need ETH to pay for deployment gas fees.`)
+          chalk2.yellow(
+            `
+Warning: Wallet ${chalk2.bold(address)} has zero balance on ${environment}.`
+          )
         );
+        this.log(chalk2.yellow(`You will need ETH to pay for deployment gas fees.`));
         if (isSepolia) {
           this.log(
             chalk2.yellow(
@@ -1777,7 +1814,7 @@ Warning: Wallet ${chalk2.bold(address)} has zero balance on ${environment}.`)
         }
       } else {
         if (!flags.dockerfile) {
-          const useVerifiable = await promptUseVerifiableBuild();
+          const useVerifiable = await promptUseVerifiableBuild(flags.force);
           if (useVerifiable) {
             const sourceType = await promptVerifiableSourceType();
             verifiableMode = sourceType;
@@ -1909,15 +1946,19 @@ Warning: Wallet ${chalk2.bold(address)} has zero balance on ${environment}.`)
       });
       const finalTx = await applyTxOverrides(gasEstimate, flags, { publicClient, address });
       if (flags["max-fee-per-gas"] || flags["max-priority-fee"]) {
-        this.log(chalk2.yellow(`
-Gas override active \u2014 max fee: ${flags["max-fee-per-gas"] || "estimated"} gwei, priority fee: ${flags["max-priority-fee"] || "estimated"} gwei`));
+        this.log(
+          chalk2.yellow(
+            `
+Gas override active \u2014 max fee: ${flags["max-fee-per-gas"] || "estimated"} gwei, priority fee: ${flags["max-priority-fee"] || "estimated"} gwei`
+          )
+        );
       }
       if (finalTx.nonce != null) {
         this.log(chalk2.yellow(`Nonce override active \u2014 nonce: ${finalTx.nonce}`));
       }
       this.log(`
 Estimated transaction cost: ${chalk2.cyan(finalTx.maxCostEth)} ETH`);
-      if (isMainnet(environmentConfig)) {
+      if (isMainnet(environmentConfig) && !flags.force) {
         const confirmed = await confirm(`Continue with deployment?`);
         if (!confirmed) {
           this.log(`
@@ -1982,6 +2023,15 @@ ${chalk2.gray(`Deployment cancelled`)}`);
       const dashboardUrl = getDashboardUrl(environment, res.appId);
       this.log(`
 ${chalk2.gray("View your app:")} ${chalk2.blue.underline(dashboardUrl)}`);
+      if (ipAddress) {
+        this.log(
+          chalk2.gray(
+            `
+Note: "Running" means the container started \u2014 verify it is serving traffic with:`
+          )
+        );
+        this.log(chalk2.gray(`  curl -s -o /dev/null -w "%{http_code}" http://${ipAddress}/`));
+      }
     });
   }
 };
@@ -1992,12 +2042,9 @@ async function fetchAvailableInstanceTypes(environment, environmentConfig, priva
       rpcUrl,
       environment
     });
-    const userApiClient = new UserApiClient3(
-      environmentConfig,
-      walletClient,
-      publicClient,
-      { clientId: getClientId() }
-    );
+    const userApiClient = new UserApiClient3(environmentConfig, walletClient, publicClient, {
+      clientId: getClientId()
+    });
     const skuList = await userApiClient.getSKUs();
     if (skuList.skus.length === 0) {
       throw new Error("No instance types available from server");