cdd-cli 3.1.9 → 3.2.2

package/src/helpers/dockerService/serviceComponents/containerLogs.js

@@ -1,6 +1,6 @@
-import { docker } from "../dockerService.js";
-import { safeCall } from "../../safeCall.js";
-import { logger } from "../../logger.js";
+import { docker } from '../dockerService.js';
+import { safeCall } from '../../safeCall.js';
+import { logger } from '../../logger.js';
 
 /**
  * Return a stream of logs from a container and call callbacks for events.
@@ -15,31 +15,46 @@ export function getLogsStream(containerId, onData, onEnd, onError) {
 
   try {
     const container = docker.getContainer(containerId);
-    logger.debug("Opening logs stream for container %s", containerId);
-    container.logs({
-      follow: true,
-      stdout: true,
-      stderr: true,
-      tail: 100
-    }, (err, stream) => {
-      if (err) {
-        logger.error("Failed to open logs stream for container %s", containerId, err);
-        safeCall(onError, err);
-        return;
+    logger.debug('Opening logs stream for container %s', containerId);
+    container.logs(
+      {
+        follow: true,
+        stdout: true,
+        stderr: true,
+        tail: 100,
+      },
+      (err, stream) => {
+        if (err) {
+          logger.error(
+            'Failed to open logs stream for container %s',
+            containerId,
+            err
+          );
+          safeCall(onError, err);
+          return;
+        }
+        logger.info('Logs stream established for container %s', containerId);
+        stream.on('data', (chunk) => safeCall(onData, chunk.toString()));
+        stream.on('end', () => {
+          logger.debug('Logs stream ended for container %s', containerId);
+          safeCall(onEnd);
+        });
+        stream.on('error', (streamErr) => {
+          logger.error(
+            'Logs stream error for container %s',
+            containerId,
+            streamErr
+          );
+          safeCall(onError, streamErr);
+        });
       }
-      logger.info("Logs stream established for container %s", containerId);
-      stream.on('data', chunk => safeCall(onData, chunk.toString()));
-      stream.on('end', () => {
-        logger.debug("Logs stream ended for container %s", containerId);
-        safeCall(onEnd);
-      });
-      stream.on('error', streamErr => {
-        logger.error("Logs stream error for container %s", containerId, streamErr);
-        safeCall(onError, streamErr);
-      });
-    });
+    );
   } catch (err) {
-    logger.error("Unexpected error while opening logs stream for container %s", containerId, err);
+    logger.error(
+      'Unexpected error while opening logs stream for container %s',
+      containerId,
+      err
+    );
     safeCall(onError, err);
   }
 }

package/src/helpers/dockerService/serviceComponents/containerStats.js

@@ -1,5 +1,5 @@
-import { docker } from "../dockerService.js";
-import { logger } from "../../logger.js";
+import { docker } from '../dockerService.js';
+import { logger } from '../../logger.js';
 
 /**
  * Retrieve a snapshot of container resource usage (CPU, memory, network).
@@ -9,12 +9,12 @@ import { logger } from "../../logger.js";
  */
 export async function getStats(containerId) {
   const container = docker.getContainer(containerId);
-  logger.debug("Fetching stats for container %s", containerId);
+  logger.debug('Fetching stats for container %s', containerId);
   let stream;
   try {
     stream = await container.stats({ stream: false });
   } catch (err) {
-    logger.error("Failed to fetch stats for container %s", containerId, err);
+    logger.error('Failed to fetch stats for container %s', containerId, err);
     throw err;
   }
 
@@ -23,10 +23,13 @@ export async function getStats(containerId) {
     stream.precpu_stats.cpu_usage.total_usage;
   const systemDelta =
     stream.cpu_stats.system_cpu_usage - stream.precpu_stats.system_cpu_usage;
-  
+
   // Get number of CPUs for proper normalization
   let numCpus = 1;
-  if (typeof stream.cpu_stats.online_cpus === 'number' && stream.cpu_stats.online_cpus > 0) {
+  if (
+    typeof stream.cpu_stats.online_cpus === 'number' &&
+    stream.cpu_stats.online_cpus > 0
+  ) {
     numCpus = stream.cpu_stats.online_cpus;
   } else if (
     stream.cpu_stats.cpu_usage &&
@@ -35,11 +38,10 @@ export async function getStats(containerId) {
   ) {
     numCpus = stream.cpu_stats.cpu_usage.percpu_usage.length;
   }
-  
+
   // Calculate normalized CPU percentage
-  const cpuPercent = systemDelta > 0 
-    ? ((cpuDelta / systemDelta) * numCpus * 100) 
-    : 0;
+  const cpuPercent =
+    systemDelta > 0 ? (cpuDelta / systemDelta) * numCpus * 100 : 0;
 
   const memUsage = stream.memory_stats.usage || 0;
   const memLimit = stream.memory_stats.limit || 1;
@@ -62,6 +64,6 @@ export async function getStats(containerId) {
     netIO: { rx, tx },
   };
 
-  logger.debug("Stats fetched for container %s", containerId, snapshot);
+  logger.debug('Stats fetched for container %s', containerId, snapshot);
   return snapshot;
 }

package/src/helpers/dockerService/serviceComponents/imageUtils.js

@@ -1,4 +1,4 @@
-import { docker } from "../dockerService.js";
+import { docker } from '../dockerService.js';
 
 /**
  * Check whether an image exists locally.
@@ -7,9 +7,10 @@ import { docker } from "../dockerService.js";
  */
 export async function imageExists(imageName) {
   const images = await docker.listImages();
-  return images.some(img =>
-    (img.RepoTags || []).includes(imageName) ||
-    (img.RepoDigests || []).some(d => d.includes(imageName))
+  return images.some(
+    (img) =>
+      (img.RepoTags || []).includes(imageName) ||
+      (img.RepoDigests || []).some((d) => d.includes(imageName))
   );
 }
 

package/src/helpers/exitWithMessage.js

@@ -1,5 +1,5 @@
-import { spawn } from "child_process";
-import { EXIT_DELAY } from "./constants";
+import { spawn } from 'child_process';
+import { EXIT_DELAY } from './constants';
 
 /**
  * Show an exit message using provided setters, clear the terminal and exit after a delay.
@@ -11,15 +11,21 @@ import { EXIT_DELAY } from "./constants";
  * @param {string} [params.color] - Color for the message
  * @param {number} [params.delay] - Delay in milliseconds before exiting
  */
-export function exitWithMessage({ setMessage, setMessageColor, message = "Exiting...", color = "yellow", delay = EXIT_DELAY }) {
+export function exitWithMessage({
+  setMessage,
+  setMessageColor,
+  message = 'Exiting...',
+  color = 'yellow',
+  delay = EXIT_DELAY,
+}) {
   setMessage(message);
   setMessageColor(color);
   setTimeout(() => {
-    setMessage("");
-    if (process.platform === "win32") {
-      spawn("cmd", ["/c", "cls"], { stdio: "inherit" });
+    setMessage('');
+    if (process.platform === 'win32') {
+      spawn('cmd', ['/c', 'cls'], { stdio: 'inherit' });
     } else {
-      spawn("clear", [], { stdio: "inherit" });
+      spawn('clear', [], { stdio: 'inherit' });
     }
     process.exit();
   }, delay);

package/src/helpers/imageNameUtils.js

@@ -0,0 +1,32 @@
+/**
+ * Utility for normalizing Docker image names.
+ * Extracted from validationHelpers.js and containerActions.js — both had
+ * identical implementations; consolidated here to avoid duplication.
+ */
+
+/**
+ * Normalize an image name to its base name (strips registry prefix and tag).
+ *
+ * Examples:
+ *   "docker.io/library/postgres:16-alpine" → "postgres"
+ *   "nginx:alpine"                         → "nginx"
+ *   "myregistry.io/myorg/myapp:latest"     → "myapp"
+ *
+ * @param {string} imageName - Raw image name (from user input or Docker API)
+ * @returns {string} Base image name in lowercase, empty string if input is falsy
+ */
+export function normalizeImageName(imageName) {
+  if (!imageName) return '';
+  // Remove registry prefix (everything up to and including the last '/')
+  let name = imageName;
+  const slashIdx = name.lastIndexOf('/');
+  if (slashIdx !== -1) {
+    name = name.slice(slashIdx + 1);
+  }
+  // Remove tag (everything from the first ':' onward)
+  const colonIdx = name.indexOf(':');
+  if (colonIdx !== -1) {
+    name = name.slice(0, colonIdx);
+  }
+  return name.toLowerCase();
+}

package/src/helpers/logger.js

@@ -6,7 +6,7 @@ const LOG_LEVELS = {
   error: 0,
   warn: 1,
   info: 2,
-  debug: 3
+  debug: 3,
 };
 
 /**
@@ -24,7 +24,7 @@ const LOG_LEVELS = {
  */
 
 function parseLevel(value) {
-  if (typeof value !== "string") {
+  if (typeof value !== 'string') {
     return null;
   }
   const normalized = value.trim().toLowerCase();
@@ -39,13 +39,13 @@ const envLevel =
   parseLevel(process.env.LOG_LEVEL) ??
   LOG_LEVELS.info;
 
-const currentLevel = typeof envLevel === "number" ? envLevel : LOG_LEVELS.info;
+const currentLevel = typeof envLevel === 'number' ? envLevel : LOG_LEVELS.info;
 
 const listeners = new Set();
 
 function shouldLog(level) {
   const target = LOG_LEVELS[level];
-  return typeof target === "number" && target <= currentLevel;
+  return typeof target === 'number' && target <= currentLevel;
 }
 
 function log(level, message, ...args) {
@@ -59,11 +59,11 @@ function log(level, message, ...args) {
   const entry = { level, message, args, timestamp, formatted };
 
   const shouldWriteToConsole =
-    listeners.size === 0 || level === "error" || level === "warn";
+    listeners.size === 0 || level === 'error' || level === 'warn';
 
   if (shouldWriteToConsole) {
-    const method = level === "debug" ? "log" : level;
-    if (typeof console[method] === "function") {
+    const method = level === 'debug' ? 'log' : level;
+    if (typeof console[method] === 'function') {
       console[method](formatted, ...args);
     } else {
       console.log(formatted, ...args);
@@ -86,28 +86,28 @@ function log(level, message, ...args) {
  */
 export const logger = {
   debug(message, ...args) {
-    log("debug", message, ...args);
+    log('debug', message, ...args);
   },
   info(message, ...args) {
-    log("info", message, ...args);
+    log('info', message, ...args);
   },
   warn(message, ...args) {
-    log("warn", message, ...args);
+    log('warn', message, ...args);
   },
   error(message, ...args) {
-    log("error", message, ...args);
+    log('error', message, ...args);
   },
   /**
    * Subscribe to log events.
    *
-  * @param {LogListener} listener Listener invoked for every log entry that passes the current level filter.
-  * @returns {function(): void} Cleanup function that removes the listener when called.
+   * @param {LogListener} listener Listener invoked for every log entry that passes the current level filter.
+   * @returns {function(): void} Cleanup function that removes the listener when called.
    */
   subscribe(listener) {
-    if (typeof listener !== "function") {
+    if (typeof listener !== 'function') {
       return () => {};
     }
     listeners.add(listener);
     return () => listeners.delete(listener);
-  }
+  },
 };

package/src/helpers/safeCall.js

@@ -1,4 +1,4 @@
-import { logger } from "./logger.js";
+import { logger } from './logger.js';
 
 /**
  * Call a function safely: if it's a function call it with provided args and
@@ -12,7 +12,7 @@ export function safeCall(fn, ...args) {
     try {
       return fn(...args);
     } catch (e) {
-      logger.error("safeCall caught error", e);
+      logger.error('safeCall caught error', e);
     }
   }
 }

package/src/helpers/validationHelpers.js

@@ -1,4 +1,5 @@
 // Reusable validations for ports and environment variables
+import { normalizeImageName } from './imageNameUtils.js';
 
 /**
  * Validate a comma-separated list of port mappings in the form "host:container".
@@ -10,10 +11,13 @@
 export function validatePorts(portInput) {
   // Empty or whitespace-only input is considered valid (ports are optional)
   if (!portInput || !portInput.trim()) return true;
-  const ports = portInput.split(",").map(p => p.trim()).filter(Boolean);
+  const ports = portInput
+    .split(',')
+    .map((p) => p.trim())
+    .filter(Boolean);
   if (ports.length === 0) return true;
-  const invalid = ports.find(pair => {
-    const [host, cont] = pair.split(":");
+  const invalid = ports.find((pair) => {
+    const [host, cont] = pair.split(':');
     return !host || !cont || isNaN(Number(host)) || isNaN(Number(cont));
   });
   return !invalid;
@@ -21,26 +25,63 @@ export function validatePorts(portInput) {
 
 /**
  * Validate environment variable input as comma-separated VAR=value pairs.
- * Empty or whitespace-only input is considered valid (no env vars).
- * Variable names must start with a letter or underscore and contain only
- * alphanumeric characters and underscores.
+ *
+ * When called with 3 arguments (envInput, imageName, imageProfiles), performs
+ * contextual validation: checks that all required env vars for the given image
+ * are present and non-empty. Returns an object { valid, errors, parsedEnv }.
+ *
+ * When called with 1 argument (legacy), returns a boolean for backward compatibility.
  *
  * @param {string} envInput - Comma-separated environment variable assignments
- * @returns {boolean} True when all env var assignments are valid, false otherwise
+ * @param {string} [imageName] - Optional Docker image name for contextual validation
+ * @param {Object} [imageProfiles] - Optional map of image profiles (from constants.js)
+ * @returns {boolean|{valid: boolean, errors: string[], parsedEnv: Record<string,string>}}
  */
-export function validateEnvVars(envInput) {
-  if (!envInput || !envInput.trim()) return true; // Empty is valid
-
-  const vars = envInput.split(",").map(v => v.trim()).filter(Boolean);
-  const invalid = vars.find(v => {
-    const parts = v.split("=");
-    // Must have at least VAR=value format
-    if (parts.length < 2) return true;
-    const varName = parts[0].trim();
-    // Variable names should be alphanumeric with underscores
-    if (!/^[A-Z_][A-Z0-9_]*$/i.test(varName)) return true;
-    return false;
-  });
+export function validateEnvVars(envInput, imageName, imageProfiles) {
+  const contextual = imageName !== undefined && imageProfiles !== undefined;
 
-  return !invalid;
+  // Parse: split on FIRST '=' only
+  const parsedEnv = {};
+  const syntaxErrors = [];
+
+  if (envInput && envInput.trim()) {
+    const vars = envInput
+      .split(',')
+      .map((v) => v.trim())
+      .filter(Boolean);
+    for (const v of vars) {
+      const eqIdx = v.indexOf('=');
+      if (eqIdx === -1) {
+        syntaxErrors.push(`"${v}" is missing an '=' sign`);
+        continue;
+      }
+      const varName = v.slice(0, eqIdx).trim();
+      const varValue = v.slice(eqIdx + 1);
+      if (!/^[A-Z_][A-Z0-9_]*$/i.test(varName)) {
+        syntaxErrors.push(`"${varName}" is not a valid variable name`);
+        continue;
+      }
+      parsedEnv[varName] = varValue;
+    }
+  }
+
+  if (!contextual) {
+    // Legacy: return boolean
+    return syntaxErrors.length === 0;
+  }
+
+  // Contextual: also check required env vars from the profile
+  const errors = [...syntaxErrors];
+  const baseName = normalizeImageName(imageName);
+  const profile = imageProfiles[baseName];
+
+  if (profile && profile.requiredEnv && profile.requiredEnv.length) {
+    for (const required of profile.requiredEnv) {
+      if (!parsedEnv[required] || parsedEnv[required].trim() === '') {
+        errors.push(`Missing required env var: ${required}`);
+      }
+    }
+  }
+
+  return { valid: errors.length === 0, errors, parsedEnv };
 }

package/src/hooks/creation/useContainerActions.js

@@ -1,6 +1,11 @@
-import { useState } from "react";
-import { safeCall } from "../../helpers/safeCall.js";
-import { startContainer as svcStartContainer, stopContainer as svcStopContainer, restartContainer as svcRestartContainer, removeContainer as svcRemoveContainer } from "../../helpers/dockerService/serviceComponents/containerActions.js";
+import { useState } from 'react';
+import { safeCall } from '../../helpers/safeCall.js';
+import {
+  startContainer as svcStartContainer,
+  stopContainer as svcStopContainer,
+  restartContainer as svcRestartContainer,
+  removeContainer as svcRemoveContainer,
+} from '../../helpers/dockerService/serviceComponents/containerActions.js';
 
 /**
  * Custom hook to manage container actions (start, stop, restart, remove).
@@ -12,8 +17,8 @@ import { startContainer as svcStartContainer, stopContainer as svcStopContainer,
  * @returns {Object} Action helpers and feedback state
  */
 export function useContainerActions({ containers, onAction }) {
-  const [message, setMessage] = useState("");
-  const [messageColor, setMessageColor] = useState("yellow");
+  const [message, setMessage] = useState('');
+  const [messageColor, setMessageColor] = useState('yellow');
 
   /**
    * Handles a generic container action and sets feedback.
@@ -29,20 +34,22 @@ export function useContainerActions({ containers, onAction }) {
       const checkMsg = stateCheck(container);
       if (checkMsg) {
         setMessage(checkMsg);
-        setMessageColor("yellow");
+        setMessageColor('yellow');
         return;
       }
     }
     setMessage(`${actionLabel} container...`);
-    setMessageColor("yellow");
+    setMessageColor('yellow');
     try {
       await actionFn(container.id);
-  setMessage(`${actionLabel} container successful.`);
-  setMessageColor("green");
-  safeCall(onAction);
+      setMessage(`${actionLabel} container successful.`);
+      setMessageColor('green');
+      safeCall(onAction);
     } catch (err) {
-      setMessage(`Failed to ${actionLabel.toLowerCase()} container: ${err.message}`);
-      setMessageColor("red");
+      setMessage(
+        `Failed to ${actionLabel.toLowerCase()} container: ${err.message}`
+      );
+      setMessageColor('red');
     }
   }