cdd-cli 3.1.3 → 3.1.5

package/dist/helpers/dockerService/serviceComponents/containerActions.js

@@ -10,15 +10,20 @@ function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 import { docker } from "../dockerService.js";
 import { imageExists, pullImage } from "./imageUtils.js";
+import { TIMEOUTS } from "../../constants.js";
+import { logger } from "../../logger.js";
 
 /**
- * Helper to add timeout to promises
- * @param {Promise} promise - Promise to wrap
- * @param {number} ms - Timeout in milliseconds
- * @returns {Promise}
+ * Helper to add timeout to promises. If the provided promise does not settle
+ * within `ms` milliseconds it will reject with an Error.
+ *
+ * @template T
+ * @param {Promise<T>} promise - Promise to wrap
+ * @param {number} [ms=TIMEOUTS.CONTAINER_OP] - Timeout in milliseconds
+ * @returns {Promise<T>} The original promise result or a rejection on timeout
  */
 function withTimeout(promise) {
-  var ms = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 30000;
+  var ms = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : TIMEOUTS.CONTAINER_OP;
   return Promise.race([promise, new Promise(function (_, reject) {
     return setTimeout(function () {
       return reject(new Error('Operation timed out'));
@@ -51,18 +56,21 @@ function _removeContainer() {
     return _regenerator().w(function (_context) {
       while (1) switch (_context.p = _context.n) {
         case 0:
+          logger.debug("Removing container %s", containerId);
           container = docker.getContainer(containerId);
           _context.p = 1;
           _context.n = 2;
           return withTimeout(container.remove({
             force: true
-          }), 30000);
+          }), TIMEOUTS.CONTAINER_OP);
         case 2:
+          logger.info("Removed container %s", containerId);
           _context.n = 4;
           break;
         case 3:
           _context.p = 3;
           _t = _context.v;
+          logger.error("Failed to remove container %s", containerId, _t);
           throw new Error('Error removing container: ' + _t.message);
         case 4:
           return _context.a(2);
@@ -85,15 +93,30 @@ function _createContainer() {
     var options,
       exists,
       createOpts,
+      hasUserDefinedPorts,
+      image,
+      _inspectData$Config,
+      _inspectData$Containe,
+      usedHostPorts,
+      containers,
+      reservePort,
+      pickNextAvailablePort,
+      inspectData,
+      exposed,
+      exposedKeys,
       container,
+      containerId,
       _args2 = arguments,
       _t2,
       _t3,
-      _t4;
+      _t4,
+      _t5,
+      _t6;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.p = _context2.n) {
         case 0:
           options = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {};
+          logger.info("Creating container from image %s", imageName);
           _context2.p = 1;
           _context2.n = 2;
           return withTimeout(imageExists(imageName), 10000);
@@ -104,41 +127,144 @@ function _createContainer() {
         case 3:
           _context2.p = 3;
           _t2 = _context2.v;
+          logger.error("Could not check local images for %s", imageName, _t2);
           throw new Error('Error listing local images: ' + _t2.message);
         case 4:
           if (exists) {
             _context2.n = 8;
             break;
           }
+          logger.info("Image %s not found locally, pulling", imageName);
           _context2.p = 5;
           _context2.n = 6;
-          return withTimeout(pullImage(imageName), 300000);
+          return withTimeout(pullImage(imageName), TIMEOUTS.PULL_IMAGE);
         case 6:
+          logger.info("Pulled image %s", imageName);
           _context2.n = 8;
           break;
         case 7:
           _context2.p = 7;
           _t3 = _context2.v;
+          logger.error("Failed to pull image %s", imageName, _t3);
           throw new Error('Could not pull image: ' + _t3.message);
         case 8:
           createOpts = _objectSpread({
             Image: imageName,
             Tty: true
           }, options);
+          hasUserDefinedPorts = Boolean(createOpts.ExposedPorts && Object.keys(createOpts.ExposedPorts).length);
+          if (hasUserDefinedPorts) {
+            _context2.n = 17;
+            break;
+          }
           _context2.p = 9;
-          _context2.n = 10;
-          return withTimeout(docker.createContainer(createOpts), 30000);
-        case 10:
-          container = _context2.v;
-          return _context2.a(2, container.id || container.Id);
+          image = docker.getImage(imageName);
+          if (!(image && typeof image.inspect === "function")) {
+            _context2.n = 15;
+            break;
+          }
+          usedHostPorts = new Set();
+          if (!(typeof docker.listContainers === "function")) {
+            _context2.n = 13;
+            break;
+          }
+          _context2.p = 10;
+          _context2.n = 11;
+          return withTimeout(docker.listContainers({
+            all: true
+          }), TIMEOUTS.CONTAINER_OP);
         case 11:
-          _context2.p = 11;
-          _t4 = _context2.v;
-          throw new Error('Error creating container: ' + _t4.message);
+          containers = _context2.v;
+          containers.forEach(function (container) {
+            (container.Ports || []).forEach(function (portInfo) {
+              if (portInfo && portInfo.PublicPort) {
+                usedHostPorts.add(String(portInfo.PublicPort));
+              }
+            });
+          });
+          _context2.n = 13;
+          break;
         case 12:
+          _context2.p = 12;
+          _t4 = _context2.v;
+          logger.warn("Could not inspect existing containers to auto-map ports", _t4);
+        case 13:
+          reservePort = function reservePort(port) {
+            var portStr = String(port);
+            usedHostPorts.add(portStr);
+          };
+          pickNextAvailablePort = function pickNextAvailablePort(base) {
+            var numericBase = Number.parseInt(base, 10);
+            if (Number.isNaN(numericBase)) {
+              // If the base port is non-numeric, just return the base.
+              if (!usedHostPorts.has(base)) {
+                usedHostPorts.add(base);
+                return base;
+              }
+              var counter = 1;
+              var _candidate = "".concat(base, "-").concat(counter);
+              while (usedHostPorts.has(_candidate)) {
+                counter += 1;
+                _candidate = "".concat(base, "-").concat(counter);
+              }
+              usedHostPorts.add(_candidate);
+              return _candidate;
+            }
+            var candidate = numericBase;
+            while (usedHostPorts.has(String(candidate))) {
+              candidate += 1;
+            }
+            reservePort(candidate);
+            return String(candidate);
+          };
+          _context2.n = 14;
+          return withTimeout(image.inspect(), TIMEOUTS.CONTAINER_OP);
+        case 14:
+          inspectData = _context2.v;
+          exposed = (inspectData === null || inspectData === void 0 || (_inspectData$Config = inspectData.Config) === null || _inspectData$Config === void 0 ? void 0 : _inspectData$Config.ExposedPorts) || (inspectData === null || inspectData === void 0 || (_inspectData$Containe = inspectData.ContainerConfig) === null || _inspectData$Containe === void 0 ? void 0 : _inspectData$Containe.ExposedPorts) || {};
+          exposedKeys = Object.keys(exposed || {});
+          if (exposedKeys.length) {
+            createOpts.ExposedPorts = createOpts.ExposedPorts || {};
+            createOpts.HostConfig = _objectSpread({}, createOpts.HostConfig || {});
+            createOpts.HostConfig.PortBindings = _objectSpread({}, createOpts.HostConfig.PortBindings || {});
+            exposedKeys.forEach(function (portKey) {
+              if (!createOpts.ExposedPorts[portKey]) {
+                createOpts.ExposedPorts[portKey] = exposed[portKey] || {};
+              }
+              if (!createOpts.HostConfig.PortBindings[portKey] || !createOpts.HostConfig.PortBindings[portKey].length) {
+                var containerPort = portKey.split("/")[0];
+                var hostPort = pickNextAvailablePort(containerPort);
+                createOpts.HostConfig.PortBindings[portKey] = [{
+                  HostPort: hostPort
+                }];
+              }
+            });
+          }
+        case 15:
+          _context2.n = 17;
+          break;
+        case 16:
+          _context2.p = 16;
+          _t5 = _context2.v;
+          logger.warn("Could not inspect image %s for default ports", imageName, _t5);
+        case 17:
+          _context2.p = 17;
+          _context2.n = 18;
+          return withTimeout(docker.createContainer(createOpts), TIMEOUTS.CONTAINER_OP);
+        case 18:
+          container = _context2.v;
+          containerId = container.id || container.Id;
+          logger.info("Created container %s from image %s", containerId, imageName);
+          return _context2.a(2, container.id || container.Id);
+        case 19:
+          _context2.p = 19;
+          _t6 = _context2.v;
+          logger.error("Failed to create container from image %s", imageName, _t6);
+          throw new Error('Error creating container: ' + _t6.message);
+        case 20:
           return _context2.a(2);
       }
-    }, _callee2, null, [[9, 11], [5, 7], [1, 3]]);
+    }, _callee2, null, [[17, 19], [10, 12], [9, 16], [5, 7], [1, 3]]);
   }));
   return _createContainer.apply(this, arguments);
 }
@@ -153,17 +279,28 @@ export function startContainer(_x3) {
  */
 function _startContainer() {
   _startContainer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(containerId) {
-    var container;
+    var container, _t7;
     return _regenerator().w(function (_context3) {
-      while (1) switch (_context3.n) {
+      while (1) switch (_context3.p = _context3.n) {
         case 0:
           container = docker.getContainer(containerId);
-          _context3.n = 1;
-          return withTimeout(container.start(), 30000);
-        case 1:
+          logger.debug("Starting container %s", containerId);
+          _context3.p = 1;
+          _context3.n = 2;
+          return withTimeout(container.start(), TIMEOUTS.CONTAINER_OP);
+        case 2:
+          logger.info("Started container %s", containerId);
+          _context3.n = 4;
+          break;
+        case 3:
+          _context3.p = 3;
+          _t7 = _context3.v;
+          logger.error("Failed to start container %s", containerId, _t7);
+          throw _t7;
+        case 4:
           return _context3.a(2);
       }
-    }, _callee3);
+    }, _callee3, null, [[1, 3]]);
   }));
   return _startContainer.apply(this, arguments);
 }
@@ -178,17 +315,28 @@ export function stopContainer(_x4) {
  */
 function _stopContainer() {
   _stopContainer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(containerId) {
-    var container;
+    var container, _t8;
     return _regenerator().w(function (_context4) {
-      while (1) switch (_context4.n) {
+      while (1) switch (_context4.p = _context4.n) {
         case 0:
           container = docker.getContainer(containerId);
-          _context4.n = 1;
-          return withTimeout(container.stop(), 30000);
-        case 1:
+          logger.debug("Stopping container %s", containerId);
+          _context4.p = 1;
+          _context4.n = 2;
+          return withTimeout(container.stop(), TIMEOUTS.CONTAINER_OP);
+        case 2:
+          logger.info("Stopped container %s", containerId);
+          _context4.n = 4;
+          break;
+        case 3:
+          _context4.p = 3;
+          _t8 = _context4.v;
+          logger.error("Failed to stop container %s", containerId, _t8);
+          throw _t8;
+        case 4:
           return _context4.a(2);
       }
-    }, _callee4);
+    }, _callee4, null, [[1, 3]]);
   }));
   return _stopContainer.apply(this, arguments);
 }
@@ -197,17 +345,28 @@ export function restartContainer(_x5) {
 }
 function _restartContainer() {
   _restartContainer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(containerId) {
-    var container;
+    var container, _t9;
     return _regenerator().w(function (_context5) {
-      while (1) switch (_context5.n) {
+      while (1) switch (_context5.p = _context5.n) {
         case 0:
           container = docker.getContainer(containerId);
-          _context5.n = 1;
-          return withTimeout(container.restart(), 30000);
-        case 1:
+          logger.debug("Restarting container %s", containerId);
+          _context5.p = 1;
+          _context5.n = 2;
+          return withTimeout(container.restart(), TIMEOUTS.CONTAINER_OP);
+        case 2:
+          logger.info("Restarted container %s", containerId);
+          _context5.n = 4;
+          break;
+        case 3:
+          _context5.p = 3;
+          _t9 = _context5.v;
+          logger.error("Failed to restart container %s", containerId, _t9);
+          throw _t9;
+        case 4:
           return _context5.a(2);
       }
-    }, _callee5);
+    }, _callee5, null, [[1, 3]]);
   }));
   return _restartContainer.apply(this, arguments);
 }

package/dist/helpers/dockerService/serviceComponents/containerList.js

@@ -9,6 +9,33 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 import { docker } from "../dockerService.js";
+import { logger } from "../../logger.js";
+var DEFAULT_CONTAINER_NAME = "Unknown";
+
+/**
+ * Produce a safe, display-friendly container name from the raw Docker payload.
+ *
+ * @param {Object} container Docker container summary as returned by dockerode.
+ * @returns {string} Normalized name without leading slashes and with a fallback applied.
+ */
+function normalizeContainerName(container) {
+  var names = container === null || container === void 0 ? void 0 : container.Names;
+  var rawName;
+  if (Array.isArray(names) && names.length > 0 && typeof names[0] === "string") {
+    rawName = names[0];
+  } else if (typeof names === "string" && names.trim().length > 0) {
+    rawName = names;
+  } else if (typeof (container === null || container === void 0 ? void 0 : container.Name) === "string" && container.Name.trim().length > 0) {
+    rawName = container.Name;
+  } else {
+    rawName = DEFAULT_CONTAINER_NAME;
+  }
+  if (typeof rawName !== "string") {
+    return DEFAULT_CONTAINER_NAME;
+  }
+  var cleanedName = rawName.replace(/^\/+/, "").trim();
+  return cleanedName.length > 0 ? cleanedName : DEFAULT_CONTAINER_NAME;
+}
 
 /**
  * Return a list of containers with normalized fields for the UI.
@@ -19,20 +46,23 @@ export function getContainers() {
 }
 function _getContainers() {
   _getContainers = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-    var containers;
+    var containers, _t;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
-          _context.n = 1;
+          logger.debug("Listing containers");
+          _context.p = 1;
+          _context.n = 2;
           return docker.listContainers({
             all: true
           });
-        case 1:
+        case 2:
           containers = _context.v;
+          logger.debug("Retrieved %d containers", containers.length);
           return _context.a(2, containers.map(function (container) {
             return {
               id: container.Id,
-              name: (container.Names && container.Names[0] || 'Unknown').replace("/", ""),
+              name: normalizeContainerName(container),
               image: container.Image,
               state: container.State,
               status: container.Status,
@@ -45,18 +75,25 @@ function _getContainers() {
                 if (publicPorts.length > 0) {
                   return _toConsumableArray(new Set(publicPorts));
                 }
-                // If there are no public ports, show private exposed ports
+                // Fall back to exposed private ports when there are no bindings.
                 var privatePorts = container.Ports.filter(function (port) {
                   return port.PrivatePort;
                 }).map(function (port) {
-                  return ":".concat(port.PrivatePort);
+                  return "".concat(port.PrivatePort);
                 });
                 return _toConsumableArray(new Set(privatePorts));
               }()
             };
           }));
+        case 3:
+          _context.p = 3;
+          _t = _context.v;
+          logger.error("Failed to list containers", _t);
+          throw _t;
+        case 4:
+          return _context.a(2);
       }
-    }, _callee);
+    }, _callee, null, [[1, 3]]);
   }));
   return _getContainers.apply(this, arguments);
 }

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

@@ -1,4 +1,6 @@
 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.
@@ -9,8 +11,11 @@ import { docker } from "../dockerService.js";
  * @param {Function} onError - Called on error
  */
 export function getLogsStream(containerId, onData, onEnd, onError) {
+  // Use shared safeCall util to call optional callbacks safely
+
   try {
     var container = docker.getContainer(containerId);
+    logger.debug("Opening logs stream for container %s", containerId);
     container.logs({
       follow: true,
       stdout: true,
@@ -18,20 +23,25 @@ export function getLogsStream(containerId, onData, onEnd, onError) {
       tail: 100
     }, function (err, stream) {
       if (err) {
-        onError === null || onError === void 0 || onError(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', function (chunk) {
-        return onData === null || onData === void 0 ? void 0 : onData(chunk.toString());
+        return safeCall(onData, chunk.toString());
       });
       stream.on('end', function () {
-        return onEnd === null || onEnd === void 0 ? void 0 : onEnd();
+        logger.debug("Logs stream ended for container %s", containerId);
+        safeCall(onEnd);
       });
-      stream.on('error', function (err) {
-        return onError === null || onError === void 0 ? void 0 : onError(err);
+      stream.on('error', function (streamErr) {
+        logger.error("Logs stream error for container %s", containerId, streamErr);
+        safeCall(onError, streamErr);
       });
     });
   } catch (err) {
-    onError === null || onError === void 0 || onError(err);
+    logger.error("Unexpected error while opening logs stream for container %s", containerId, err);
+    safeCall(onError, err);
   }
 }

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

@@ -3,6 +3,7 @@ function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try {
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 import { docker } from "../dockerService.js";
+import { logger } from "../../logger.js";
 
 /**
  * Retrieve a snapshot of container resource usage (CPU, memory, network).
@@ -15,21 +16,37 @@ export function getStats(_x) {
 }
 function _getStats() {
   _getStats = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(containerId) {
-    var _stream$cpu_stats$cpu;
-    var container, stream, cpuDelta, systemDelta, numCpus, cpuPercent, memUsage, memLimit, memPercent, rx, tx;
+    var container, stream, cpuDelta, systemDelta, numCpus, cpuPercent, memUsage, memLimit, memPercent, rx, tx, snapshot, _t;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
           container = docker.getContainer(containerId);
-          _context.n = 1;
+          logger.debug("Fetching stats for container %s", containerId);
+          _context.p = 1;
+          _context.n = 2;
           return container.stats({
             stream: false
           });
-        case 1:
+        case 2:
           stream = _context.v;
+          _context.n = 4;
+          break;
+        case 3:
+          _context.p = 3;
+          _t = _context.v;
+          logger.error("Failed to fetch stats for container %s", containerId, _t);
+          throw _t;
+        case 4:
           cpuDelta = stream.cpu_stats.cpu_usage.total_usage - stream.precpu_stats.cpu_usage.total_usage;
           systemDelta = stream.cpu_stats.system_cpu_usage - stream.precpu_stats.system_cpu_usage; // Get number of CPUs for proper normalization
-          numCpus = stream.cpu_stats.online_cpus || ((_stream$cpu_stats$cpu = stream.cpu_stats.cpu_usage.percpu_usage) === null || _stream$cpu_stats$cpu === void 0 ? void 0 : _stream$cpu_stats$cpu.length) || 1; // Calculate normalized CPU percentage
+          numCpus = 1;
+          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 && Array.isArray(stream.cpu_stats.cpu_usage.percpu_usage) && stream.cpu_stats.cpu_usage.percpu_usage.length > 0) {
+            numCpus = stream.cpu_stats.cpu_usage.percpu_usage.length;
+          }
+
+          // Calculate normalized CPU percentage
           cpuPercent = systemDelta > 0 ? cpuDelta / systemDelta * numCpus * 100 : 0;
           memUsage = stream.memory_stats.usage || 0;
           memLimit = stream.memory_stats.limit || 1;
@@ -44,16 +61,18 @@ function _getStats() {
           }).reduce(function (a, b) {
             return a + b;
           }, 0) : 0;
-          return _context.a(2, {
+          snapshot = {
             cpuPercent: cpuPercent.toFixed(1),
             memPercent: memPercent.toFixed(1),
             netIO: {
               rx: rx,
               tx: tx
             }
-          });
+          };
+          logger.debug("Stats fetched for container %s", containerId, snapshot);
+          return _context.a(2, snapshot);
       }
-    }, _callee);
+    }, _callee, null, [[1, 3]]);
   }));
   return _getStats.apply(this, arguments);
 }

package/dist/helpers/exitWithMessage.js

@@ -1,4 +1,5 @@
 import { spawn } from "child_process";
+import { EXIT_DELAY } from "./constants.js";
 
 /**
  * Show an exit message using provided setters, clear the terminal and exit after a delay.
@@ -18,7 +19,7 @@ export function exitWithMessage(_ref) {
     _ref$color = _ref.color,
     color = _ref$color === void 0 ? "yellow" : _ref$color,
     _ref$delay = _ref.delay,
-    delay = _ref$delay === void 0 ? 1500 : _ref$delay;
+    delay = _ref$delay === void 0 ? EXIT_DELAY : _ref$delay;
   setMessage(message);
   setMessageColor(color);
   setTimeout(function () {