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

package/dist/commands/billing/subscribe.js

@@ -6,7 +6,7 @@ import { isSubscriptionActive } from "@layr-labs/ecloud-sdk";
 
 // src/client.ts
 import {
-  createComputeModule,
+  createAppModule,
   createBillingModule,
   getEnvironmentConfig as getEnvironmentConfig2,
   requirePrivateKey,
@@ -53,75 +53,7 @@ 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() {
-  const configHome = process.env.XDG_CONFIG_HOME;
-  let baseDir;
-  if (configHome && path.isAbsolute(configHome)) {
-    baseDir = configHome;
-  } else {
-    baseDir = path.join(os.homedir(), ".config");
-  }
-  const buildType = getBuildType();
-  const buildSuffix = buildType === "dev" ? "-dev" : "";
-  const configDirName = `ecloud${buildSuffix}`;
-  return path.join(baseDir, configDirName);
-}
-function getGlobalConfigPath() {
-  return path.join(getGlobalConfigDir(), GLOBAL_CONFIG_FILE);
-}
-function loadGlobalConfig() {
-  const configPath = getGlobalConfigPath();
-  if (!fs.existsSync(configPath)) {
-    return {
-      first_run: true
-    };
-  }
-  try {
-    const content = fs.readFileSync(configPath, "utf-8");
-    const config = loadYaml(content);
-    return config || { first_run: true };
-  } catch {
-    return {
-      first_run: true
-    };
-  }
-}
-function saveGlobalConfig(config) {
-  const configPath = getGlobalConfigPath();
-  const configDir = path.dirname(configPath);
-  fs.mkdirSync(configDir, { recursive: true, mode: 493 });
-  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 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/utils/appNames.ts
 import * as fs2 from "fs";
@@ -193,75 +125,13 @@ async function createBillingClient(flags) {
   const privateKey = await getPrivateKeyInteractive(result?.key);
   return createBillingModule({
     verbose: flags.verbose ?? false,
-    privateKey,
-    skipTelemetry: true
-    // CLI already has telemetry, skip SDK telemetry
+    privateKey
   });
 }
 
 // src/commands/billing/subscribe.ts
 import chalk from "chalk";
 import open from "open";
-
-// src/telemetry.ts
-import {
-  createTelemetryClient,
-  createAppEnvironment,
-  createMetricsContext,
-  addMetric,
-  addMetricWithDimensions,
-  emitMetrics,
-  getBuildType as getBuildType2
-} from "@layr-labs/ecloud-sdk";
-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/commands/billing/subscribe.ts
 var PAYMENT_TIMEOUT_MS = 5 * 60 * 1e3;
 var POLL_INTERVAL_MS = 3e3;
 var BillingSubscribe = class _BillingSubscribe extends Command {
@@ -278,66 +148,62 @@ var BillingSubscribe = class _BillingSubscribe extends Command {
     })
   };
   async run() {
-    return withTelemetry(this, async () => {
-      const { flags } = await this.parse(_BillingSubscribe);
-      const billing = await createBillingClient(flags);
-      this.debug(`
+    const { flags } = await this.parse(_BillingSubscribe);
+    const billing = await createBillingClient(flags);
+    this.debug(`
 Checking subscription status for ${flags.product}...`);
-      const result = await billing.subscribe({
-        productId: flags.product
-      });
-      if (result.type === "already_active") {
-        this.log(`
+    const result = await billing.subscribe({
+      productId: flags.product
+    });
+    if (result.type === "already_active") {
+      this.log(`
 ${chalk.green("\u2713")} You're already subscribed to ${flags.product}.`);
-        this.log(chalk.gray("Run 'ecloud billing status' for details."));
-        return;
-      }
-      if (result.type === "payment_issue") {
-        this.log(
-          `
+      this.log(chalk.gray("Run 'ecloud billing status' for details."));
+      return;
+    }
+    if (result.type === "payment_issue") {
+      this.log(
+        `
 ${chalk.yellow("\u26A0")} You already have a subscription on ${flags.product}, but it has a payment issue.`
-        );
-        this.log("Please update your payment method to restore access.");
-        if (result.portalUrl) {
-          this.log(`
+      );
+      this.log("Please update your payment method to restore access.");
+      if (result.portalUrl) {
+        this.log(`
 ${chalk.bold("Update payment method:")}`);
-          this.log(`  ${result.portalUrl}`);
-        }
-        return;
+        this.log(`  ${result.portalUrl}`);
       }
-      this.log(`
+      return;
+    }
+    this.log(`
 ${chalk.gray("Opening checkout in your browser...")}`);
-      this.log(chalk.gray(`
+    this.log(chalk.gray(`
 URL: ${result.checkoutUrl}`));
-      await open(result.checkoutUrl);
-      this.log(`
+    await open(result.checkoutUrl);
+    this.log(`
 ${chalk.gray("Waiting for payment confirmation...")}`);
-      const startTime = Date.now();
-      while (Date.now() - startTime < PAYMENT_TIMEOUT_MS) {
-        await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
-        try {
-          const status = await billing.getStatus({
-            productId: flags.product
-          });
-          if (isSubscriptionActive(status.subscriptionStatus)) {
-            this.log(
-              `
+    const startTime = Date.now();
+    while (Date.now() - startTime < PAYMENT_TIMEOUT_MS) {
+      await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
+      try {
+        const status = await billing.getStatus({
+          productId: flags.product
+        });
+        if (isSubscriptionActive(status.subscriptionStatus)) {
+          this.log(
+            `
 ${chalk.green("\u2713")} Subscription activated successfully for ${flags.product}!`
-            );
-            this.log(`
+          );
+          this.log(`
 ${chalk.gray("Start deploying with:")} ecloud app deploy`);
-            return;
-          }
-        } catch (error) {
-          this.debug(`Error polling for subscription status: ${error}`);
+          return;
         }
+      } catch (error) {
+        this.debug(`Error polling for subscription status: ${error}`);
       }
-      this.log(`
+    }
+    this.log(`
 ${chalk.yellow("\u26A0")} Payment confirmation timed out after 5 minutes.`);
-      this.log(
-        chalk.gray(`If you completed payment, run 'ecloud billing status' to check status.`)
-      );
-    });
+    this.log(chalk.gray(`If you completed payment, run 'ecloud billing status' to check status.`));
   }
 };
 export {