vibora 7.1.2 → 7.1.3

package/bin/vibora.js

@@ -32629,7 +32629,7 @@ function installUv() {
 var package_default = {
   name: "vibora",
   private: true,
-  version: "7.1.2",
+  version: "7.1.3",
   description: "Harness Attention. Orchestrate Agents. Ship.",
   license: "PolyForm-Shield-1.0.0",
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibora",
-  "version": "7.1.2",
+  "version": "7.1.3",
   "description": "Harness Attention. Orchestrate Agents. Ship.",
   "license": "PolyForm-Shield-1.0.0",
   "repository": {

package/server/index.js

@@ -176605,17 +176605,15 @@ async function fetchDockerApiStats() {
     if (!listResponse.ok)
       return null;
     const containerList = await listResponse.json();
-    const containers = [];
-    for (const container of containerList) {
-      if (container.State !== "running")
-        continue;
+    const runningContainers = containerList.filter((c) => c.State === "running");
+    const statsPromises = runningContainers.map(async (container) => {
       try {
         const statsUrl = `http://localhost/containers/${container.Id}/stats?stream=false`;
         const statsResponse = await fetch(statsUrl, {
           unix: socketPath
         });
         if (!statsResponse.ok)
-          continue;
+          return null;
         const stats = await statsResponse.json();
         const cpuDelta = stats.cpu_stats.cpu_usage.total_usage - stats.precpu_stats.cpu_usage.total_usage;
         const systemDelta = stats.cpu_stats.system_cpu_usage - stats.precpu_stats.system_cpu_usage;
@@ -176625,18 +176623,20 @@ async function fetchDockerApiStats() {
         const memoryMB = memoryBytes / (1024 * 1024);
         const memoryLimitMB = memoryLimit / (1024 * 1024);
         const memoryPercent = memoryLimit > 0 ? memoryBytes / memoryLimit * 100 : 0;
-        containers.push({
+        return {
           id: container.Id.slice(0, 12),
           name: (container.Names[0] || "unknown").replace(/^\//, ""),
           cpuPercent: Math.round(cpuPercent * 10) / 10,
           memoryMB: Math.round(memoryMB * 10) / 10,
           memoryLimit: Math.round(memoryLimitMB * 10) / 10,
           memoryPercent: Math.round(memoryPercent * 10) / 10
-        });
+        };
       } catch {
-        continue;
+        return null;
       }
-    }
+    });
+    const results = await Promise.all(statsPromises);
+    const containers = results.filter((c) => c !== null);
     return containers;
   } catch {
     return null;
@@ -177308,6 +177308,60 @@ var nanoid = (size = 21) => {
 import { readFile as readFile2, access } from "fs/promises";
 import { join as join16 } from "path";
 init_logger2();
+
+// server/lib/env-expand.ts
+function expandEnvVar(str, env) {
+  const braceMatch = str.match(/^\$\{([A-Za-z_][A-Za-z0-9_]*)(?:(:?[-=])(.+))?\}$/);
+  if (braceMatch) {
+    const varName = braceMatch[1];
+    const operator = braceMatch[2];
+    const defaultValue = braceMatch[3];
+    if (env && varName in env) {
+      const value = env[varName];
+      if (operator?.startsWith(":") && value === "") {
+        return defaultValue ?? null;
+      }
+      return value;
+    }
+    if (defaultValue !== undefined) {
+      return defaultValue;
+    }
+    return null;
+  }
+  const simpleMatch = str.match(/^\$([A-Za-z_][A-Za-z0-9_]*)$/);
+  if (simpleMatch) {
+    const varName = simpleMatch[1];
+    if (env && varName in env) {
+      return env[varName];
+    }
+    return null;
+  }
+  return str;
+}
+function splitRespectingEnvVars(str, delimiter = ":") {
+  const parts = [];
+  let current = "";
+  let braceDepth = 0;
+  for (let i = 0;i < str.length; i++) {
+    const char = str[i];
+    if (char === "{" && i > 0 && str[i - 1] === "$") {
+      braceDepth++;
+      current += char;
+    } else if (char === "}" && braceDepth > 0) {
+      braceDepth--;
+      current += char;
+    } else if (char === delimiter && braceDepth === 0) {
+      parts.push(current);
+      current = "";
+    } else {
+      current += char;
+    }
+  }
+  parts.push(current);
+  return parts;
+}
+
+// server/services/compose-parser.ts
 var COMPOSE_FILE_NAMES = ["compose.yml", "compose.yaml", "docker-compose.yml", "docker-compose.yaml"];
 async function findComposeFile(repoPath) {
   for (const fileName of COMPOSE_FILE_NAMES) {
@@ -177319,8 +177373,23 @@ async function findComposeFile(repoPath) {
   }
   return null;
 }
+function parsePortValue(value) {
+  const expanded = expandEnvVar(value);
+  if (expanded === null) {
+    return null;
+  }
+  const port = parseInt(expanded, 10);
+  if (isNaN(port) || port <= 0 || port > 65535) {
+    return null;
+  }
+  return port;
+}
 function parsePort(port) {
   if (typeof port === "number") {
+    if (port <= 0 || port > 65535) {
+      log2.deploy.warn("Invalid port number", { port });
+      return null;
+    }
     return { container: port };
   }
   if (typeof port === "string") {
@@ -177333,28 +177402,34 @@ function parsePort(port) {
       protocol = "udp";
       portStr = port.slice(0, -4);
     }
-    if (portStr.includes(":")) {
-      const parts = portStr.split(":");
-      const containerPort = parseInt(parts[parts.length - 1], 10);
-      const hostPort = parseInt(parts[parts.length - 2], 10);
-      if (!isNaN(containerPort)) {
+    const parts = splitRespectingEnvVars(portStr);
+    if (parts.length >= 2) {
+      const containerPort = parsePortValue(parts[parts.length - 1]);
+      const hostPort = parsePortValue(parts[parts.length - 2]);
+      if (containerPort !== null) {
         return {
           container: containerPort,
-          host: isNaN(hostPort) ? undefined : hostPort,
+          host: hostPort ?? undefined,
           protocol
         };
       }
+      log2.deploy.warn("Could not parse port with env var reference", { port: portStr });
     } else {
-      const containerPort = parseInt(portStr, 10);
-      if (!isNaN(containerPort)) {
+      const containerPort = parsePortValue(portStr);
+      if (containerPort !== null) {
         return { container: containerPort, protocol };
       }
+      log2.deploy.warn("Could not parse port value", { port: portStr });
     }
   }
   if (typeof port === "object" && port !== null) {
     const portObj = port;
     const target = portObj.target ?? portObj.container_port;
     if (typeof target === "number") {
+      if (target <= 0 || target > 65535) {
+        log2.deploy.warn("Invalid port number in long syntax", { target });
+        return null;
+      }
       return {
         container: target,
         host: typeof portObj.published === "number" ? portObj.published : undefined,
@@ -177978,17 +178053,22 @@ function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
 function resolveVolumePath(volumePath, basePath) {
-  if (!volumePath.includes("/") && !volumePath.startsWith(".")) {
+  const expanded = expandEnvVar(volumePath);
+  const pathToCheck = expanded ?? volumePath;
+  if (!pathToCheck.includes("/") && !pathToCheck.startsWith(".")) {
     return volumePath;
   }
-  if (isAbsolute2(volumePath)) {
+  if (expanded === null && volumePath.includes("${")) {
     return volumePath;
   }
-  return resolve5(basePath, volumePath);
+  if (isAbsolute2(pathToCheck)) {
+    return expanded ?? volumePath;
+  }
+  return resolve5(basePath, pathToCheck);
 }
 function resolveVolumeEntry(volume, basePath) {
   if (typeof volume === "string") {
-    const parts = volume.split(":");
+    const parts = splitRespectingEnvVars(volume);
     if (parts.length >= 2) {
       const hostPath = parts[0];
       const containerPath = parts[1];
@@ -178802,8 +178882,13 @@ async function deployApp(appId, options = {}, onProgress) {
       where: eq(appServices.appId, appId)
     });
     for (const service of services) {
-      if (service.exposed && service.domain && !service.containerPort) {
-        throw new Error(`Service "${service.serviceName}" is exposed with domain "${service.domain}" but has no container port configured. ` + `Add a port mapping to your compose file or configure the container port in the service settings.`);
+      if (service.exposed && service.domain) {
+        if (!service.containerPort) {
+          throw new Error(`Service "${service.serviceName}" is exposed with domain "${service.domain}" but has no container port configured. ` + `Add a port mapping to your compose file or configure the container port in the service settings.`);
+        }
+        if (service.containerPort <= 0 || service.containerPort > 65535) {
+          throw new Error(`Service "${service.serviceName}" has invalid container port ${service.containerPort}. ` + `Port must be between 1 and 65535. Check your compose file port configuration.`);
+        }
       }
     }
     const serviceStatuses = await stackServices(projectName);