@layr-labs/ecloud-cli 0.1.1 → 0.1.2

package/dist/commands/compute/app/profile/set.js

@@ -2,10 +2,11 @@
 
 // src/commands/compute/app/profile/set.ts
 import { Command, Args, Flags as Flags2 } from "@oclif/core";
-import { getEnvironmentConfig as getEnvironmentConfig2, UserApiClient as UserApiClient3 } from "@layr-labs/ecloud-sdk";
+import { getEnvironmentConfig as getEnvironmentConfig3 } from "@layr-labs/ecloud-sdk";
 
 // src/flags.ts
 import { Flags } from "@oclif/core";
+import { getBuildType as getBuildType2 } from "@layr-labs/ecloud-sdk";
 
 // src/utils/prompts.ts
 import { input, select, password, confirm as inquirerConfirm } from "@inquirer/prompts";
@@ -87,6 +88,27 @@ function saveGlobalConfig(config) {
   const content = dumpYaml(config, { lineWidth: -1 });
   fs.writeFileSync(configPath, content, { mode: 420 });
 }
+function normalizeDirectoryPath(directoryPath) {
+  const resolved = path.resolve(directoryPath);
+  try {
+    return fs.realpathSync(resolved);
+  } catch {
+    return resolved;
+  }
+}
+function getLinkedAppForDirectory(environment, directoryPath) {
+  if (!directoryPath) {
+    return null;
+  }
+  const config = loadGlobalConfig();
+  const links = config.directory_links?.[environment];
+  if (!links) {
+    return null;
+  }
+  const normalizedPath = normalizeDirectoryPath(directoryPath);
+  const appId = links[normalizedPath];
+  return appId || null;
+}
 function getDefaultEnvironment() {
   const config = loadGlobalConfig();
   return config.default_environment;
@@ -232,7 +254,7 @@ function listApps(environment) {
 
 // src/utils/version.ts
 function getCliVersion() {
-  return true ? "0.1.1" : "0.0.0";
+  return true ? "0.1.2" : "0.0.0";
 }
 function getClientId() {
   return `ecloud-cli/v${getCliVersion()}`;
@@ -423,6 +445,9 @@ function addHexPrefix(value) {
   }
   return `0x${value}`;
 }
+function getCurrentProjectPath() {
+  return process.env.INIT_CWD || process.cwd();
+}
 var ContractAppStatusStarted = 1;
 var ContractAppStatusStopped = 2;
 var ContractAppStatusTerminated = 3;
@@ -589,7 +614,19 @@ Select an app to ${action}:
       index: i
     });
   }
+  const linkedAppId = getLinkedAppForDirectory(environment, getCurrentProjectPath());
+  const normalizedLinkedAppId = linkedAppId ? linkedAppId.toLowerCase() : "";
   appItems.sort((a, b) => {
+    if (normalizedLinkedAppId) {
+      const aLinked = String(a.addr).toLowerCase() === normalizedLinkedAppId;
+      const bLinked = String(b.addr).toLowerCase() === normalizedLinkedAppId;
+      if (aLinked && !bLinked) {
+        return -1;
+      }
+      if (bLinked && !aLinked) {
+        return 1;
+      }
+    }
     const aPriority = getStatusPriority(a.status, false);
     const bPriority = getStatusPriority(b.status, false);
     if (aPriority !== bPriority) {
@@ -655,7 +692,18 @@ async function getAppIDInteractiveFromRegistry(environment, action) {
     }
     throw new Error(`Invalid app ID address: ${appIDInput}`);
   }
-  const choices = Object.entries(allApps).map(([name, appID]) => {
+  const entries = Object.entries(allApps);
+  const linkedAppId = getLinkedAppForDirectory(environment, getCurrentProjectPath());
+  if (linkedAppId) {
+    const linkedIndex = entries.findIndex(
+      ([, appId]) => String(appId).toLowerCase() === linkedAppId.toLowerCase()
+    );
+    if (linkedIndex > 0) {
+      const [linkedEntry] = entries.splice(linkedIndex, 1);
+      entries.unshift(linkedEntry);
+    }
+  }
+  const choices = entries.map(([name, appID]) => {
     const displayName = `${name} (${appID})`;
     return { name: displayName, value: appID };
   });
@@ -703,8 +751,8 @@ async function getPrivateKeyInteractive(privateKey) {
     }
     return privateKey;
   }
-  const { getPrivateKeyWithSource } = await import("@layr-labs/ecloud-sdk");
-  const result = await getPrivateKeyWithSource({ privateKey: void 0 });
+  const { getPrivateKeyWithSource: getPrivateKeyWithSource2 } = await import("@layr-labs/ecloud-sdk");
+  const result = await getPrivateKeyWithSource2({ privateKey: void 0 });
   if (result) {
     return result.key;
   }
@@ -723,6 +771,50 @@ async function getPrivateKeyInteractive(privateKey) {
   });
   return key.trim();
 }
+async function getEnvironmentInteractive(environment) {
+  if (environment) {
+    try {
+      getEnvironmentConfig(environment);
+      if (!isEnvironmentAvailable(environment)) {
+        throw new Error(`Environment ${environment} is not available in this build`);
+      }
+      return environment;
+    } catch {
+    }
+  }
+  const availableEnvs = getAvailableEnvironments();
+  let defaultEnv;
+  const configDefaultEnv = getDefaultEnvironment();
+  if (configDefaultEnv && availableEnvs.includes(configDefaultEnv)) {
+    try {
+      getEnvironmentConfig(configDefaultEnv);
+      defaultEnv = configDefaultEnv;
+    } catch {
+    }
+  }
+  const choices = [];
+  if (availableEnvs.includes("sepolia")) {
+    choices.push({ name: "sepolia - Ethereum Sepolia testnet", value: "sepolia" });
+  }
+  if (availableEnvs.includes("sepolia-dev")) {
+    choices.push({ name: "sepolia-dev - Ethereum Sepolia testnet (dev)", value: "sepolia-dev" });
+  }
+  if (availableEnvs.includes("mainnet-alpha")) {
+    choices.push({
+      name: "mainnet-alpha - Ethereum mainnet (\u26A0\uFE0F  uses real funds)",
+      value: "mainnet-alpha"
+    });
+  }
+  if (choices.length === 0) {
+    throw new Error("No environments available in this build");
+  }
+  const env = await select({
+    message: "Select environment:",
+    choices,
+    default: defaultEnv
+  });
+  return env;
+}
 var MAX_DESCRIPTION_LENGTH = 1e3;
 var MAX_IMAGE_SIZE = 4 * 1024 * 1024;
 var VALID_IMAGE_EXTENSIONS = [".jpg", ".jpeg", ".png"];
@@ -985,7 +1077,8 @@ var commonFlags = {
   environment: Flags.string({
     required: false,
     description: "Deployment environment to use",
-    env: "ECLOUD_ENV"
+    env: "ECLOUD_ENV",
+    default: async () => getDefaultEnvironment() || (getBuildType2() === "dev" ? "sepolia-dev" : "sepolia")
   }),
   "private-key": Flags.string({
     required: false,
@@ -1003,6 +1096,41 @@ var commonFlags = {
     default: false
   })
 };
+async function validateCommonFlags(flags) {
+  flags["environment"] = await getEnvironmentInteractive(flags["environment"]);
+  flags["private-key"] = await getPrivateKeyInteractive(flags["private-key"]);
+  return flags;
+}
+
+// src/client.ts
+import {
+  createComputeModule,
+  createBillingModule,
+  getEnvironmentConfig as getEnvironmentConfig2,
+  requirePrivateKey,
+  getPrivateKeyWithSource
+} from "@layr-labs/ecloud-sdk";
+async function createComputeClient(flags) {
+  flags = await validateCommonFlags(flags);
+  const environment = flags.environment;
+  const environmentConfig = getEnvironmentConfig2(environment);
+  const rpcUrl = flags["rpc-url"] || environmentConfig.defaultRPCURL;
+  const { key: privateKey, source } = await requirePrivateKey({
+    privateKey: flags["private-key"]
+  });
+  if (flags.verbose) {
+    console.log(`Using private key from: ${source}`);
+  }
+  return createComputeModule({
+    verbose: flags.verbose,
+    privateKey,
+    rpcUrl,
+    environment,
+    clientId: getClientId(),
+    skipTelemetry: true
+    // CLI already has telemetry, skip SDK telemetry
+  });
+}
 
 // src/commands/compute/app/profile/set.ts
 import chalk from "chalk";
@@ -1015,7 +1143,7 @@ import {
   addMetric,
   addMetricWithDimensions,
   emitMetrics,
-  getBuildType as getBuildType2
+  getBuildType as getBuildType3
 } from "@layr-labs/ecloud-sdk";
 function createCLITelemetryClient() {
   const userUUID = getOrCreateUserUUID();
@@ -1033,7 +1161,7 @@ async function withTelemetry(command, action) {
   metrics.properties["command"] = command.id || command.constructor.name;
   const environment = getDefaultEnvironment() || "sepolia";
   metrics.properties["environment"] = environment;
-  const buildType = getBuildType2() || "prod";
+  const buildType = getBuildType3() || "prod";
   metrics.properties["build_type"] = buildType;
   const cliVersion = command.config.version;
   if (cliVersion) {
@@ -1100,10 +1228,11 @@ var ProfileSet = class _ProfileSet extends Command {
   async run() {
     return withTelemetry(this, async () => {
       const { args, flags } = await this.parse(_ProfileSet);
-      const environment = flags.environment || "sepolia";
-      const environmentConfig = getEnvironmentConfig2(environment);
+      const compute = await createComputeClient(flags);
+      const environment = flags.environment;
+      const environmentConfig = getEnvironmentConfig3(environment);
       const rpcUrl = flags["rpc-url"] || environmentConfig.defaultRPCURL;
-      const privateKey = await getPrivateKeyInteractive(flags["private-key"]);
+      const privateKey = flags["private-key"];
       const resolver = createAppResolver(environment, environmentConfig, privateKey, rpcUrl);
       const appId = await getOrPromptAppID({
         appID: args["app-id"],
@@ -1143,16 +1272,8 @@ ${chalk.gray("Profile setup cancelled")}`);
         }
       }
       this.log("\nUploading app profile...");
-      const userApiClient = new UserApiClient3(environmentConfig, privateKey, rpcUrl);
       try {
-        const response = await userApiClient.uploadAppProfile(
-          appId,
-          profile.name,
-          profile.website,
-          profile.description,
-          profile.xURL,
-          profile.imagePath
-        );
+        const response = await compute.app.setProfile(appId, profile);
         resolver.updateCacheEntry(appId, response.name);
         invalidateProfileCache(environment);
         this.log(`