@layr-labs/ecloud-cli 0.1.0-dev.3 → 0.1.0-rc.2

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

@@ -11,15 +11,38 @@ import {
   watchDeployment
 } from "@layr-labs/ecloud-sdk";
 
-// src/telemetry.ts
+// src/flags.ts
+import { Flags } from "@oclif/core";
+
+// src/utils/prompts.ts
+import { input, select, password, confirm as inquirerConfirm } from "@inquirer/prompts";
+import fs3 from "fs";
+import path3 from "path";
+import os3 from "os";
+import { isAddress as isAddress2 } from "viem";
+import { privateKeyToAccount as privateKeyToAccount2 } from "viem/accounts";
 import {
-  createTelemetryClient,
-  createAppEnvironment,
-  createMetricsContext,
-  addMetric,
-  addMetricWithDimensions,
-  emitMetrics,
-  getBuildType as getBuildType2
+  getEnvironmentConfig,
+  getAvailableEnvironments,
+  isEnvironmentAvailable,
+  getAllAppsByDeveloper as getAllAppsByDeveloper2,
+  getCategoryDescriptions,
+  fetchTemplateCatalog,
+  PRIMARY_LANGUAGES,
+  validateAppName,
+  validateImageReference,
+  validateFilePath,
+  validatePrivateKeyFormat,
+  extractAppNameFromImage,
+  UserApiClient as UserApiClient2
+} from "@layr-labs/ecloud-sdk";
+
+// src/utils/appResolver.ts
+import { isAddress } from "viem";
+import { privateKeyToAccount } from "viem/accounts";
+import {
+  UserApiClient,
+  getAllAppsByDeveloper
 } from "@layr-labs/ecloud-sdk";
 
 // src/utils/globalConfig.ts
@@ -28,7 +51,6 @@ import * as path from "path";
 import * as os from "os";
 import { load as loadYaml, dump as dumpYaml } from "js-yaml";
 import { getBuildType } from "@layr-labs/ecloud-sdk";
-import * as crypto from "crypto";
 var GLOBAL_CONFIG_FILE = "config.yaml";
 var PROFILE_CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
 function getGlobalConfigDir() {
@@ -71,14 +93,6 @@ function saveGlobalConfig(config) {
   const content = dumpYaml(config, { lineWidth: -1 });
   fs.writeFileSync(configPath, content, { mode: 420 });
 }
-function getDefaultEnvironment() {
-  const config = loadGlobalConfig();
-  return config.default_environment;
-}
-function getGlobalTelemetryPreference() {
-  const config = loadGlobalConfig();
-  return config.telemetry_enabled;
-}
 function invalidateProfileCache(environment) {
   const config = loadGlobalConfig();
   if (!config.profile_cache) {
@@ -91,107 +105,6 @@ function invalidateProfileCache(environment) {
   }
   saveGlobalConfig(config);
 }
-function getOrCreateUserUUID() {
-  const config = loadGlobalConfig();
-  if (config.user_uuid) {
-    return config.user_uuid;
-  }
-  const uuid = generateUUID();
-  config.user_uuid = uuid;
-  config.first_run = false;
-  saveGlobalConfig(config);
-  return uuid;
-}
-function generateUUID() {
-  const bytes = crypto.randomBytes(16);
-  bytes[6] = bytes[6] & 15 | 64;
-  bytes[8] = bytes[8] & 63 | 128;
-  const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, "0"));
-  return hex.slice(0, 4).join("") + hex.slice(4, 6).join("") + "-" + hex.slice(6, 8).join("") + "-" + hex.slice(8, 10).join("") + "-" + hex.slice(10, 12).join("") + "-" + hex.slice(12, 16).join("");
-}
-
-// src/telemetry.ts
-function createCLITelemetryClient() {
-  const userUUID = getOrCreateUserUUID();
-  const environment = createAppEnvironment(userUUID);
-  const telemetryEnabled = getGlobalTelemetryPreference();
-  return createTelemetryClient(environment, "ecloud-cli", {
-    telemetryEnabled: telemetryEnabled === true
-    // Only enabled if explicitly set to true
-  });
-}
-async function withTelemetry(command, action) {
-  const client = createCLITelemetryClient();
-  const metrics = createMetricsContext();
-  metrics.properties["source"] = "ecloud-cli";
-  metrics.properties["command"] = command.id || command.constructor.name;
-  const environment = getDefaultEnvironment() || "sepolia";
-  metrics.properties["environment"] = environment;
-  const buildType = getBuildType2() || "prod";
-  metrics.properties["build_type"] = buildType;
-  const cliVersion = command.config.version;
-  if (cliVersion) {
-    metrics.properties["cli_version"] = cliVersion;
-  }
-  addMetric(metrics, "Count", 1);
-  let actionError;
-  let result;
-  try {
-    result = await action();
-    return result;
-  } catch (err) {
-    actionError = err instanceof Error ? err : new Error(String(err));
-    throw err;
-  } finally {
-    const resultValue = actionError ? "Failure" : "Success";
-    const dimensions = {};
-    if (actionError) {
-      dimensions["error"] = actionError.message;
-    }
-    addMetricWithDimensions(metrics, resultValue, 1, dimensions);
-    const duration = Date.now() - metrics.startTime.getTime();
-    addMetric(metrics, "DurationMilliseconds", duration);
-    try {
-      await emitMetrics(client, metrics);
-      await client.close();
-    } catch {
-    }
-  }
-}
-
-// src/flags.ts
-import { Flags } from "@oclif/core";
-
-// src/utils/prompts.ts
-import { input, select, password, confirm as inquirerConfirm } from "@inquirer/prompts";
-import fs3 from "fs";
-import path3 from "path";
-import os3 from "os";
-import { isAddress as isAddress2 } from "viem";
-import { privateKeyToAccount as privateKeyToAccount2 } from "viem/accounts";
-import {
-  getEnvironmentConfig,
-  getAvailableEnvironments,
-  isEnvironmentAvailable,
-  getAllAppsByDeveloper as getAllAppsByDeveloper2,
-  getCategoryDescriptions,
-  fetchTemplateCatalog,
-  PRIMARY_LANGUAGES,
-  validateAppName,
-  validateImageReference,
-  validateFilePath,
-  validatePrivateKeyFormat,
-  extractAppNameFromImage,
-  UserApiClient as UserApiClient2
-} from "@layr-labs/ecloud-sdk";
-
-// src/utils/appResolver.ts
-import { isAddress } from "viem";
-import { privateKeyToAccount } from "viem/accounts";
-import {
-  UserApiClient,
-  getAllAppsByDeveloper
-} from "@layr-labs/ecloud-sdk";
 
 // src/utils/appNames.ts
 import * as fs2 from "fs";
@@ -256,7 +169,7 @@ function findAvailableName(environment, baseName) {
 
 // src/utils/version.ts
 function getCliVersion() {
-  return true ? "0.1.0-dev.3" : "0.0.0";
+  return true ? "0.1.0-rc.2" : "0.0.0";
 }
 function getClientId() {
   return `ecloud-cli/v${getCliVersion()}`;
@@ -1043,141 +956,130 @@ var AppDeploy = class _AppDeploy extends Command {
     })
   };
   async run() {
-    return withTelemetry(this, async () => {
-      const { flags } = await this.parse(_AppDeploy);
-      const logger = {
-        info: (msg) => this.log(msg),
-        warn: (msg) => this.warn(msg),
-        error: (msg) => this.error(msg),
-        debug: (msg) => flags.verbose && this.log(msg)
-      };
-      const environment = flags.environment || "sepolia";
-      const environmentConfig = getEnvironmentConfig2(environment);
-      const rpcUrl = flags["rpc-url"] || environmentConfig.defaultRPCURL;
-      const privateKey = await getPrivateKeyInteractive(flags["private-key"]);
-      const dockerfilePath = await getDockerfileInteractive(flags.dockerfile);
-      const buildFromDockerfile = dockerfilePath !== "";
-      const imageRef = await getImageReferenceInteractive(flags["image-ref"], buildFromDockerfile);
-      const appName = await getOrPromptAppName(flags.name, environment, imageRef);
-      const envFilePath = await getEnvFileInteractive(flags["env-file"]);
-      const availableTypes = await fetchAvailableInstanceTypes(
-        environmentConfig,
+    const { flags } = await this.parse(_AppDeploy);
+    const logger = {
+      info: (msg) => this.log(msg),
+      warn: (msg) => this.warn(msg),
+      error: (msg) => this.error(msg),
+      debug: (msg) => flags.verbose && this.log(msg)
+    };
+    const environment = flags.environment || "sepolia";
+    const environmentConfig = getEnvironmentConfig2(environment);
+    const rpcUrl = flags["rpc-url"] || environmentConfig.defaultRPCURL;
+    const privateKey = await getPrivateKeyInteractive(flags["private-key"]);
+    const dockerfilePath = await getDockerfileInteractive(flags.dockerfile);
+    const buildFromDockerfile = dockerfilePath !== "";
+    const imageRef = await getImageReferenceInteractive(flags["image-ref"], buildFromDockerfile);
+    const appName = await getOrPromptAppName(flags.name, environment, imageRef);
+    const envFilePath = await getEnvFileInteractive(flags["env-file"]);
+    const availableTypes = await fetchAvailableInstanceTypes(environmentConfig, privateKey, rpcUrl);
+    const instanceType = await getInstanceTypeInteractive(
+      flags["instance-type"],
+      "",
+      // No default for new deployments
+      availableTypes
+    );
+    const logSettings = await getLogSettingsInteractive(
+      flags["log-visibility"]
+    );
+    const resourceUsageMonitoring = await getResourceUsageMonitoringInteractive(
+      flags["resource-usage-monitoring"]
+    );
+    const logVisibility = logSettings.publicLogs ? "public" : logSettings.logRedirect ? "private" : "off";
+    const { prepared, gasEstimate } = await prepareDeploy(
+      {
         privateKey,
-        rpcUrl
-      );
-      const instanceType = await getInstanceTypeInteractive(
-        flags["instance-type"],
-        "",
-        // No default for new deployments
-        availableTypes
-      );
-      const logSettings = await getLogSettingsInteractive(
-        flags["log-visibility"]
-      );
-      const resourceUsageMonitoring = await getResourceUsageMonitoringInteractive(
-        flags["resource-usage-monitoring"]
-      );
-      const logVisibility = logSettings.publicLogs ? "public" : logSettings.logRedirect ? "private" : "off";
-      const { prepared, gasEstimate } = await prepareDeploy(
-        {
-          privateKey,
-          rpcUrl,
-          environment,
-          dockerfilePath,
-          imageRef,
-          envFilePath,
-          appName,
-          instanceType,
-          logVisibility,
-          resourceUsageMonitoring,
-          skipTelemetry: true
-        },
-        logger
-      );
-      this.log(`
+        rpcUrl,
+        environment,
+        dockerfilePath,
+        imageRef,
+        envFilePath,
+        appName,
+        instanceType,
+        logVisibility,
+        resourceUsageMonitoring
+      },
+      logger
+    );
+    this.log(`
 Estimated transaction cost: ${chalk.cyan(gasEstimate.maxCostEth)} ETH`);
-      if (isMainnet(environmentConfig)) {
-        const confirmed = await confirm(`Continue with deployment?`);
-        if (!confirmed) {
-          this.log(`
+    if (isMainnet(environmentConfig)) {
+      const confirmed = await confirm(`Continue with deployment?`);
+      if (!confirmed) {
+        this.log(`
 ${chalk.gray(`Deployment cancelled`)}`);
-          return;
+        return;
+      }
+    }
+    const res = await executeDeploy(
+      prepared,
+      {
+        maxFeePerGas: gasEstimate.maxFeePerGas,
+        maxPriorityFeePerGas: gasEstimate.maxPriorityFeePerGas
+      },
+      logger
+    );
+    if (!flags["skip-profile"]) {
+      const hasProfileFlags = flags.website || flags.description || flags["x-url"] || flags.image;
+      let profile = null;
+      if (hasProfileFlags) {
+        profile = {
+          name: appName,
+          website: flags.website,
+          description: flags.description,
+          xURL: flags["x-url"],
+          imagePath: flags.image
+        };
+      } else {
+        this.log(
+          "\nDeployment confirmed onchain. While your instance provisions, set up a public profile:"
+        );
+        try {
+          profile = await getAppProfileInteractive(appName, true) || null;
+        } catch {
+          logger.debug("Profile collection skipped or cancelled");
         }
       }
-      const res = await executeDeploy(
-        prepared,
-        {
-          maxFeePerGas: gasEstimate.maxFeePerGas,
-          maxPriorityFeePerGas: gasEstimate.maxPriorityFeePerGas
-        },
-        logger,
-        true
-        // skipTelemetry
-      );
-      if (!flags["skip-profile"]) {
-        const hasProfileFlags = flags.website || flags.description || flags["x-url"] || flags.image;
-        let profile = null;
-        if (hasProfileFlags) {
-          profile = {
-            name: appName,
-            website: flags.website,
-            description: flags.description,
-            xURL: flags["x-url"],
-            imagePath: flags.image
-          };
-        } else {
-          this.log(
-            "\nDeployment confirmed onchain. While your instance provisions, set up a public profile:"
+      if (profile) {
+        logger.info("Uploading app profile...");
+        try {
+          const userApiClient = new UserApiClient3(
+            environmentConfig,
+            privateKey,
+            rpcUrl,
+            getClientId()
           );
+          await userApiClient.uploadAppProfile(
+            res.appId,
+            profile.name,
+            profile.website,
+            profile.description,
+            profile.xURL,
+            profile.imagePath
+          );
+          logger.info("\u2713 Profile uploaded successfully");
           try {
-            profile = await getAppProfileInteractive(appName, true) || null;
-          } catch {
-            logger.debug("Profile collection skipped or cancelled");
-          }
-        }
-        if (profile) {
-          logger.info("Uploading app profile...");
-          try {
-            const userApiClient = new UserApiClient3(
-              environmentConfig,
-              privateKey,
-              rpcUrl,
-              getClientId()
-            );
-            await userApiClient.uploadAppProfile(
-              res.appId,
-              profile.name,
-              profile.website,
-              profile.description,
-              profile.xURL,
-              profile.imagePath
-            );
-            logger.info("\u2713 Profile uploaded successfully");
-            try {
-              invalidateProfileCache(environment);
-            } catch (cacheErr) {
-              logger.debug(`Failed to invalidate profile cache: ${cacheErr.message}`);
-            }
-          } catch (uploadErr) {
-            logger.warn(`Failed to upload profile: ${uploadErr.message}`);
+            invalidateProfileCache(environment);
+          } catch (cacheErr) {
+            logger.debug(`Failed to invalidate profile cache: ${cacheErr.message}`);
           }
+        } catch (uploadErr) {
+          logger.warn(`Failed to upload profile: ${uploadErr.message}`);
         }
       }
-      const ipAddress = await watchDeployment(
-        res.appId,
-        privateKey,
-        rpcUrl,
-        environment,
-        logger,
-        getClientId(),
-        true
-        // skipTelemetry - CLI already has telemetry
-      );
-      this.log(
-        `
+    }
+    const ipAddress = await watchDeployment(
+      res.appId,
+      privateKey,
+      rpcUrl,
+      environment,
+      logger,
+      getClientId()
+    );
+    this.log(
+      `
 \u2705 ${chalk.green(`App deployed successfully ${chalk.bold(`(id: ${res.appId}, ip: ${ipAddress})`)}`)}`
-      );
-    });
+    );
   }
 };
 async function fetchAvailableInstanceTypes(environmentConfig, privateKey, rpcUrl) {