@shadowob/cli 1.1.6 → 1.1.8

package/dist/{chunk-E364BDQO.js → chunk-S6XCO6ZW.js}

@@ -8,6 +8,11 @@ import { homedir } from "os";
 import { dirname, join } from "path";
 var DEFAULT_CONFIG_DIR = join(homedir(), ".shadowob");
 var _DEFAULT_CONFIG_FILE = join(DEFAULT_CONFIG_DIR, "shadowob.config.json");
+function expandEnvPlaceholders(value) {
+  return value.replace(/\$\{(?:env:)?([A-Za-z_][A-Za-z0-9_]*)\}/g, (_match, key) => {
+    return process.env[key] ?? "";
+  });
+}
 var ConfigManager = class {
   config = null;
   configFile;
@@ -39,7 +44,12 @@ var ConfigManager = class {
     const config = await this.load();
     const profileName = name ?? config.currentProfile;
     if (!profileName) return null;
-    return config.profiles[profileName] ?? null;
+    const profile = config.profiles[profileName];
+    if (!profile) return null;
+    return {
+      serverUrl: expandEnvPlaceholders(profile.serverUrl),
+      token: expandEnvPlaceholders(profile.token)
+    };
   }
   async getCurrentProfileName() {
     const config = await this.load();
@@ -110,21 +120,23 @@ var ConfigManager = class {
     }
     for (const [name, profile] of Object.entries(config.profiles)) {
       const profileResult = { valid: true };
-      if (!profile.serverUrl) {
+      const serverUrl = expandEnvPlaceholders(profile.serverUrl);
+      const token = expandEnvPlaceholders(profile.token);
+      if (!serverUrl) {
         profileResult.valid = false;
         result.errors.push(`Profile "${name}" missing serverUrl`);
       } else {
         try {
-          new URL(profile.serverUrl);
+          new URL(serverUrl);
         } catch {
           profileResult.valid = false;
-          result.errors.push(`Profile "${name}" has invalid serverUrl: ${profile.serverUrl}`);
+          result.errors.push(`Profile "${name}" has invalid serverUrl: ${serverUrl}`);
         }
       }
-      if (!profile.token) {
+      if (!token) {
         profileResult.valid = false;
         result.errors.push(`Profile "${name}" missing token`);
-      } else if (!profile.token.includes(".")) {
+      } else if (!token.includes(".")) {
         result.warnings.push(`Profile "${name}" token does not look like a JWT`);
       }
       result.profileResults[name] = profileResult;
@@ -164,6 +176,12 @@ var ConfigManager = class {
 var configManager = new ConfigManager();
 
 // src/utils/client.ts
+var DEFAULT_SERVER_URL = "https://shadowob.com";
+function resolveServerFlag(value) {
+  const server = value ?? process.env.SHADOWOB_SERVER_ID;
+  if (!server) throw new Error("Missing server. Pass --server or set SHADOWOB_SERVER_ID.");
+  return server;
+}
 async function getConfig(profile) {
   const config = await configManager.getProfile(profile);
   if (!config) {
@@ -251,6 +269,8 @@ async function handleCommand(fn, options, outputFn, errorFn) {
 
 export {
   configManager,
+  DEFAULT_SERVER_URL,
+  resolveServerFlag,
   getClient,
   getClientWithToken,
   getSocket,

package/dist/{client-ZIUDIQPZ.js → client-VR35GYUZ.js}

@@ -1,4 +1,5 @@
 import {
+  DEFAULT_SERVER_URL,
   formatError,
   getClient,
   getClientWithToken,
@@ -10,9 +11,11 @@ import {
   parseNonNegativeInt,
   parsePositiveInt,
   parsePrice,
-  requireOption
-} from "./chunk-E364BDQO.js";
+  requireOption,
+  resolveServerFlag
+} from "./chunk-S6XCO6ZW.js";
 export {
+  DEFAULT_SERVER_URL,
   formatError,
   getClient,
   getClientWithToken,
@@ -24,5 +27,6 @@ export {
   parseNonNegativeInt,
   parsePositiveInt,
   parsePrice,
-  requireOption
+  requireOption,
+  resolveServerFlag
 };