cdd-cli 3.1.7 → 3.2.0

package/test/containerOptionsBuilder.test.js

@@ -0,0 +1,36 @@
+let buildContainerOptions;
+
+beforeAll(async () => {
+  const mod = await import('../src/helpers/containerOptionsBuilder.js');
+  buildContainerOptions = mod.buildContainerOptions;
+});
+
+describe('buildContainerOptions', () => {
+  test('basic image only sets Tty', () => {
+    const opts = buildContainerOptions({ imageName: 'nginx' });
+    expect(opts.Tty).toBe(true);
+    expect(opts.Env).toBeUndefined();
+  });
+
+  test('env var with value containing = is preserved intact', () => {
+    const opts = buildContainerOptions({ imageName: 'nginx', envInput: 'TOKEN=a=b' });
+    expect(opts.Env).toEqual(['TOKEN=a=b']);
+  });
+
+  test('multiple env vars with = in values are all preserved', () => {
+    const opts = buildContainerOptions({ imageName: 'nginx', envInput: 'TOKEN=a=b,DSN=user:pass@host/db?opt=1' });
+    expect(opts.Env).toContain('TOKEN=a=b');
+    expect(opts.Env).toContain('DSN=user:pass@host/db?opt=1');
+  });
+
+  test('port input builds ExposedPorts and PortBindings', () => {
+    const opts = buildContainerOptions({ imageName: 'nginx', portInput: '8080:80' });
+    expect(opts.ExposedPorts).toEqual({ '80/tcp': {} });
+    expect(opts.HostConfig.PortBindings['80/tcp']).toEqual([{ HostPort: '8080' }]);
+  });
+
+  test('container name is included when provided', () => {
+    const opts = buildContainerOptions({ imageName: 'nginx', containerName: 'my-nginx' });
+    expect(opts.name).toBe('my-nginx');
+  });
+});

package/test/useContainerCreation.dom.test.js

@@ -1,9 +1,13 @@
+/**
+ * @jest-environment jsdom
+ */
 import React, { useEffect } from 'react';
 import { render, act } from '@testing-library/react';
 import { useContainerCreation } from '../src/hooks/creation/useContainerCreation.js';
+import { IMAGE_PROFILES } from '../src/helpers/constants.js';
 
-function HookTester({ onCreate, onCancel, dbImages, expose }) {
-  const hook = useContainerCreation({ onCreate, onCancel, dbImages });
+function HookTester({ onCreate, onCancel, dbImages, imageProfiles, expose }) {
+  const hook = useContainerCreation({ onCreate, onCancel, dbImages, imageProfiles });
   // keep exposing the latest hook values on every render
   useEffect(() => {
     if (expose) expose.current = hook;
@@ -94,4 +98,44 @@ describe('useContainerCreation (DOM render)', () => {
       expect(created.length).toBe(1);
       expect(created[0]).toEqual({ imageName: 'redis', containerName: '', portInput: '', envInput: 'FOO=bar' });
   });
+
+  test('step 3 with mysql image: missing MYSQL_ROOT_PASSWORD blocks creation', () => {
+    const created = [];
+    const expose = { current: null };
+
+    render(<HookTester onCreate={(d) => created.push(d)} onCancel={() => {}} dbImages={[]} imageProfiles={IMAGE_PROFILES} expose={expose} />);
+
+    // advance to step 3 (env) with mysql image
+    act(() => { expose.current.setImageName('mysql:8'); });
+    act(() => { expose.current.nextStep(); }); // step 0 → 1
+    act(() => { expose.current.nextStep(); }); // step 1 → 2
+    act(() => { expose.current.nextStep(); }); // step 2 → 3
+
+    expect(expose.current.step).toBe(3);
+
+    // try to advance without required env var
+    act(() => { expose.current.nextStep(); });
+
+    expect(expose.current.step).toBe(3); // still blocked
+    expect(expose.current.message).toMatch(/MYSQL_ROOT_PASSWORD/i);
+    expect(created.length).toBe(0);
+  });
+
+  test('step 3 with mysql image: valid env advances and calls onCreate', () => {
+    const created = [];
+    const expose = { current: null };
+
+    render(<HookTester onCreate={(d) => created.push(d)} onCancel={() => {}} dbImages={[]} imageProfiles={IMAGE_PROFILES} expose={expose} />);
+
+    act(() => { expose.current.setImageName('mysql:8'); });
+    act(() => { expose.current.nextStep(); });
+    act(() => { expose.current.nextStep(); });
+    act(() => { expose.current.nextStep(); }); // at step 3
+
+    act(() => { expose.current.setEnvInput('MYSQL_ROOT_PASSWORD=secret'); });
+    act(() => { expose.current.nextStep(); }); // should call onCreate
+
+    expect(created.length).toBe(1);
+    expect(created[0].imageName).toBe('mysql:8');
+  });
 });

package/test/useControls.dom.test.js

@@ -0,0 +1,117 @@
+/**
+ * @jest-environment jsdom
+ */
+import React, { useEffect } from 'react';
+import { render, act } from '@testing-library/react';
+import { jest } from '@jest/globals';
+
+// Mock ink so that useInput and useApp are no-ops (require real TTY in production)
+await jest.unstable_mockModule('ink', () => ({
+  useInput: () => {},
+  useApp: () => ({ exit: () => {} }),
+}));
+
+// Mock containerActions — expose all named exports so dependents don't break
+const mockSvcCreateContainer = jest.fn();
+await jest.unstable_mockModule(
+  '../src/helpers/dockerService/serviceComponents/containerActions.js',
+  () => ({
+    createContainer: mockSvcCreateContainer,
+    removeContainer: jest.fn().mockResolvedValue(undefined),
+    startContainer: jest.fn().mockResolvedValue(undefined),
+    stopContainer: jest.fn().mockResolvedValue(undefined),
+    restartContainer: jest.fn().mockResolvedValue(undefined),
+  })
+);
+
+// Mock getLogsStream to avoid side effects
+await jest.unstable_mockModule(
+  '../src/helpers/dockerService/serviceComponents/containerLogs.js',
+  () => ({ getLogsStream: () => {} })
+);
+
+const { useControls } = await import('../src/hooks/useControls.js');
+
+function HookTester({ containers, expose }) {
+  const hook = useControls(containers);
+  useEffect(() => {
+    if (expose) expose.current = hook;
+  });
+  return null;
+}
+
+// Helper: advance creation wizard to the final step and trigger onCreate
+async function completeCreationWizard(expose, imageName = 'nginx') {
+  act(() => { expose.current.creation.setImageName(imageName); });
+  act(() => { expose.current.creation.nextStep(); }); // step 0 → 1
+  act(() => { expose.current.creation.nextStep(); }); // step 1 → 2
+  act(() => { expose.current.creation.nextStep(); }); // step 2 → 3
+  // step 3: call nextStep to trigger onCreate (async)
+  await act(async () => { expose.current.creation.nextStep(); });
+}
+
+describe('useControls (FR6 — port mapping in success message)', () => {
+  beforeEach(() => {
+    mockSvcCreateContainer.mockReset();
+  });
+
+  test('success message includes port mapping after container creation', async () => {
+    const ports = [
+      { containerPort: '3306', hostPort: '3306', protocol: 'tcp', source: 'auto' },
+    ];
+    mockSvcCreateContainer.mockResolvedValue({ id: 'cid-abc', ports });
+
+    const expose = { current: null };
+    render(<HookTester containers={[]} expose={expose} />);
+
+    await completeCreationWizard(expose, 'nginx');
+
+    expect(expose.current.actions.message).toBe(
+      'Created container cid-abc | Ports: 3306→3306/tcp'
+    );
+    expect(expose.current.actions.messageColor).toBe('green');
+  });
+
+  test('success message has no port section when ports array is empty', async () => {
+    mockSvcCreateContainer.mockResolvedValue({ id: 'cid-xyz', ports: [] });
+
+    const expose = { current: null };
+    render(<HookTester containers={[]} expose={expose} />);
+
+    await completeCreationWizard(expose, 'alpine');
+
+    expect(expose.current.actions.message).toBe('Created container cid-xyz');
+    expect(expose.current.actions.messageColor).toBe('green');
+  });
+
+  test('success message includes multiple port mappings', async () => {
+    const ports = [
+      { containerPort: '80', hostPort: '8080', protocol: 'tcp', source: 'user' },
+      { containerPort: '443', hostPort: '8443', protocol: 'tcp', source: 'user' },
+    ];
+    mockSvcCreateContainer.mockResolvedValue({ id: 'cid-multi', ports });
+
+    const expose = { current: null };
+    render(<HookTester containers={[]} expose={expose} />);
+
+    await completeCreationWizard(expose, 'nginx');
+
+    expect(expose.current.actions.message).toBe(
+      'Created container cid-multi | Ports: 8080→80/tcp, 8443→443/tcp'
+    );
+  });
+
+  test('error message is shown when svcCreateContainer rejects', async () => {
+    mockSvcCreateContainer.mockRejectedValue(new Error('pull access denied'));
+
+    const expose = { current: null };
+    render(<HookTester containers={[]} expose={expose} />);
+
+    await completeCreationWizard(expose, 'badimage');
+
+    expect(expose.current.actions.message).toBe(
+      'Error creating container: pull access denied'
+    );
+    expect(expose.current.actions.messageColor).toBe('red');
+  });
+});

package/test/validationHelpers.test.js

@@ -1,10 +1,13 @@
 let validatePorts;
 let validateEnvVars;
+let IMAGE_PROFILES;
 
 beforeAll(async () => {
   const mod = await import('../src/helpers/validationHelpers.js');
   validatePorts = mod.validatePorts;
   validateEnvVars = mod.validateEnvVars;
+  const constants = await import('../src/helpers/constants.js');
+  IMAGE_PROFILES = constants.IMAGE_PROFILES;
 });
 
 describe('validatePorts', () => {
@@ -58,3 +61,51 @@ describe('validateEnvVars', () => {
     expect(validateEnvVars('MY-VAR=value')).toBe(false);
   });
 });
+
+describe('validateEnvVars — contextual validation with IMAGE_PROFILES', () => {
+  test('mysql:8 — missing MYSQL_ROOT_PASSWORD is invalid', () => {
+    const result = validateEnvVars('FOO=bar', 'mysql:8', IMAGE_PROFILES);
+    expect(result.valid).toBe(false);
+    expect(result.errors.some(e => e.includes('MYSQL_ROOT_PASSWORD'))).toBe(true);
+  });
+
+  test('mysql:8 — with MYSQL_ROOT_PASSWORD is valid', () => {
+    const result = validateEnvVars('MYSQL_ROOT_PASSWORD=secret', 'mysql:8', IMAGE_PROFILES);
+    expect(result.valid).toBe(true);
+    expect(result.errors).toHaveLength(0);
+  });
+
+  test('docker.io/library/postgres:16 — missing POSTGRES_PASSWORD is invalid', () => {
+    const result = validateEnvVars('', 'docker.io/library/postgres:16', IMAGE_PROFILES);
+    expect(result.valid).toBe(false);
+    expect(result.errors.some(e => e.includes('POSTGRES_PASSWORD'))).toBe(true);
+  });
+
+  test('docker.io/library/postgres:16 — with POSTGRES_PASSWORD is valid', () => {
+    const result = validateEnvVars('POSTGRES_PASSWORD=pass', 'docker.io/library/postgres:16', IMAGE_PROFILES);
+    expect(result.valid).toBe(true);
+  });
+
+  test('TOKEN=a=b is preserved (split on first = only)', () => {
+    const result = validateEnvVars('TOKEN=a=b', 'nginx', IMAGE_PROFILES);
+    expect(result.valid).toBe(true);
+    expect(result.parsedEnv['TOKEN']).toBe('a=b');
+  });
+
+  test('image not in profiles — only syntactic validation applies', () => {
+    const result = validateEnvVars('FOO=bar', 'nginx', IMAGE_PROFILES);
+    expect(result.valid).toBe(true);
+    expect(result.parsedEnv['FOO']).toBe('bar');
+  });
+
+  test('empty input for image not in profiles — valid', () => {
+    const result = validateEnvVars('', 'nginx', IMAGE_PROFILES);
+    expect(result.valid).toBe(true);
+    expect(result.parsedEnv).toEqual({});
+  });
+
+  test('syntactically invalid var is still rejected', () => {
+    const result = validateEnvVars('INVALID-VAR=x', 'nginx', IMAGE_PROFILES);
+    expect(result.valid).toBe(false);
+  });
+});

package/.babelrc

@@ -1,6 +0,0 @@
-{
-  "presets": [
-    ["@babel/preset-env", { "modules": false }],
-    "@babel/preset-react"
-  ]
-}

package/FIXES_APPLIED.md

@@ -1,419 +0,0 @@
-# Applied Fixes - CDD CLI
-
-**Date:** 2025-10-17  
-**Project:** CDD-CLI (CLI Docker Dashboard)
-
----
-
-## Fixes Summary
-
-A total of 11 critical fixes were applied to address security, stability, and portability issues identified during the code audit.
-
----
-
-## 1. APPLIED CRITICAL FIXES
-
-### ✅ 1.1. Import Order Fix
-
-**File:** `src/helpers/dockerService/serviceComponents/containerActions.js`
-
-**Issue:** Imports were declared after exports.
-
-**Applied fix:**
-```javascript
-// BEFORE (incorrect):
-export async function removeContainer(containerId) { ... }
-import { docker } from "../dockerService";
-
-// AFTER (correct):
-import { docker } from "../dockerService";
-import { imageExists, pullImage } from "./imageUtils.js";
-export async function removeContainer(containerId) { ... }
-```
-
-**Impact:** Removes potential reference errors and follows ES6 standards.
-
----
-
-### ✅ 1.2. Optional Ports in Container Creation
-
-**File:** `src/hooks/creation/useContainerCreation.js`
-
-**Issue:** Users were forced to specify ports, but many containers don’t need them.
-
-**Applied fix:**
-```javascript
-// BEFORE:
-if (!portInput.trim()) {
-  setMessage("You must specify at least one port to expose");
-  return;
-}
-
-// AFTER:
-// Ports are optional — only validate if provided
-if (portInput.trim() && !validatePorts(portInput)) {
-  setMessage("Port format must be host:container...");
-  return;
-}
-```
-
-**Impact:** Allows creating containers without exposed ports (workers, internal services, etc.).
-
----
-
-### ✅ 1.3. Error Handling in getLogsStream
-
-**File:** `src/helpers/dockerService/serviceComponents/containerLogs.js`
-
-**Issue:** No try-catch to handle synchronous exceptions.
-
-**Applied fix:**
-```javascript
-export function getLogsStream(containerId, onData, onEnd, onError) {
-  try {
-    const container = docker.getContainer(containerId);
-    // ... rest of the code
-  } catch (err) {
-    onError?.(err);
-  }
-}
-```
-
-**Impact:** Prevents crashes when the container doesn’t exist or connection errors occur.
-
----
-
-### ✅ 1.4. Cross-Platform Docker Socket Configuration
-
-**File:** `src/helpers/dockerService/dockerService.js`
-
-**Issue:** Hardcoded path `/var/run/docker.sock` only works on Linux/macOS.
-
-**Applied fix:**
-```javascript
-// BEFORE:
-const docker = new Docker({ socketPath: "/var/run/docker.sock" });
-
-// AFTER:
-// Use default configuration that automatically handles:
-// - /var/run/docker.sock on Linux/macOS
-// - //./pipe/docker_engine on Windows
-const docker = new Docker();
-```
-
-**Impact:** Works on Windows, Linux, and macOS without manual changes.
-
----
-
-### ✅ 1.5. Race Condition Prevention in Stats
-
-**File:** `src/components/ContainerRow.jsx`
-
-**Issue:** State updates on unmounted components caused memory leaks.
-
-**Applied fix:**
-```javascript
-useEffect(() => {
-  if (state !== "running") return;
-  
-  let isMounted = true;  // ← Mount flag
-  
-  const fetchStats = async () => {
-    try {
-      const s = await getStats(id);
-      if (isMounted) {  // ← Only update if mounted
-        setStats(s);
-      }
-    } catch (err) {
-      if (isMounted) {
-        setStatsError("Error fetching stats");
-      }
-    }
-  };
-  
-  fetchStats();
-  const timer = setInterval(fetchStats, 1500);
-  
-  return () => {
-    isMounted = false;  // ← Cleanup
-    clearInterval(timer);
-  };
-}, [id, state]);
-```
-
-**Impact:** Eliminates React warnings and prevents memory leaks.
-
----
-
-### ✅ 1.6. Environment Variables Validation
-
-**File:** `src/helpers/validationHelpers.js`
-
-**Issue:** `validateEnvVars` always returned `true`.
-
-**Applied fix:**
-```javascript
-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("=");
-    if (parts.length < 2) return true;  // Must be VAR=value
-    const varName = parts[0].trim();
-    // Names must be alphanumeric with underscores
-    if (!/^[A-Z_][A-Z0-9_]*$/i.test(varName)) return true;
-    return false;
-  });
-  
-  return !invalid;
-}
-```
-
-**Impact:** Detects malformed variables before sending them to Docker.
-
----
-
-### ✅ 1.7. CPU Stats Calculation Fix
-
-**File:** `src/helpers/dockerService/serviceComponents/containerStats.js`
-
-**Issue:** Not normalized by number of CPUs, producing wrong values on multi-core hosts.
-
-**Applied fix:**
-```javascript
-// Determine number of CPUs
-const numCpus = stream.cpu_stats.online_cpus || 
-                stream.cpu_stats.cpu_usage.percpu_usage?.length || 1;
-
-// Compute normalized percentage
-const cpuPercent = systemDelta > 0 
-  ? ((cpuDelta / systemDelta) * numCpus * 100) 
-  : 0;
-```
-
-**Impact:** Correct CPU stats on multi-core systems.
-
----
-
-### ✅ 1.8. Timeouts in Docker Operations
-
-**File:** `src/helpers/dockerService/serviceComponents/containerActions.js`
-
-**Issue:** Operations without timeouts could freeze the UI indefinitely.
-
-**Applied fix:**
-```javascript
-function withTimeout(promise, ms = 30000) {
-  return Promise.race([
-    promise,
-    new Promise((_, reject) => 
-      setTimeout(() => reject(new Error('Operation timed out')), ms)
-    )
-  ]);
-}
-
-export async function startContainer(containerId) {
-  const container = docker.getContainer(containerId);
-  await withTimeout(container.start(), 30000);
-}
-```
-
-**Impact:** Prevents frozen UI during long or failing operations.
-
----
-
-### ✅ 1.9. In-Memory Log Limit
-
-**File:** `src/hooks/useControls.js`
-
-**Issue:** Logs accumulated indefinitely causing a memory leak.
-
-**Applied fix:**
-```javascript
-getLogsStream(
-  containers[selected].id,
-  (data) => logsViewer.setLogs((prev) => {
-    const newLogs = [...prev, ...data.split("\n").filter(Boolean)];
-    // Limit to last 1000 lines
-    return newLogs.slice(-1000);
-  }),
-  // ...
-);
-```
-
-**Impact:** Prevents memory leaks on long-running log streams.
-
----
-
-### ✅ 1.10. Duplicate Message Fix
-
-**File:** `src/helpers/actionHelpers.js`
-
-**Issue:** Success message was identical to the start message.
-
-**Applied fix:**
-```javascript
-// BEFORE:
-setMessage(`${actionLabel} container...`); // start
-await actionFn(c.id);
-setMessage(`${actionLabel} container...`); // success (duplicate)
-
-// AFTER:
-setMessage(`${actionLabel} container...`); // start
-await actionFn(c.id);
-setMessage(`${actionLabel} container completed successfully`); // success
-```
-
-**Impact:** Clear feedback that the operation completed.
-
----
-
-### ✅ 1.11. Container Names Validation
-
-**File:** `src/helpers/dockerService/serviceComponents/containerList.js`
-
-**Issue:** Didn’t validate when `Names` was empty.
-
-**Applied fix:**
-```javascript
-// BEFORE:
-name: container.Names[0].replace("/", ""),
-
-// AFTER:
-name: (container.Names && container.Names[0] || 'Unknown').replace("/", ""),
-```
-
-**Impact:** Prevents crashes when Docker returns unexpected data.
-
----
-
-## 2. TEST IMPROVEMENTS
-
-### ✅ Tests for validateEnvVars
-
-**File:** `test/validationHelpers.test.js`
-
-**New tests added:**
-- Empty input is valid
-- Valid single env var
-- Valid multiple env vars
-- Valid env var with underscores
-- Invalid env var without equals sign
-- Invalid env var with invalid name
-- Invalid env var with special characters in name
-
-**Result:**
-```
-Test Suites: 1 passed, 1 total
-Tests:       12 passed, 12 total (previously: 5)
-```
-
----
-
-## 3. SECURITY ANALYSIS
-
-### ✅ CodeQL Security Scan
-
-**Result:** ✅ 0 vulnerabilities found
-
-```
-Analysis Result for 'javascript'. Found 0 alert(s):
-- javascript: No alerts found.
-```
-
----
-
-## 4. BUILD VERIFICATION
-
-### ✅ Successful Build
-
-```bash
-$ npm run build
-Successfully compiled 28 files with Babel (815ms).
-```
-
----
-
-## 5. OVERALL IMPACT OF FIXES
-
-### Security
-- ✅ No security vulnerabilities detected
-- ✅ Improved input validation
-- ✅ Robust error handling
-
-### Stability
-- ✅ Memory leak prevention
-- ✅ Race condition prevention
-- ✅ Crash prevention due to unhandled errors
-- ✅ Timeouts for potentially long operations
-
-### Portability
-- ✅ Windows compatibility
-- ✅ Linux compatibility
-- ✅ macOS compatibility
-
-### User Experience
-- ✅ Optional ports in container creation
-- ✅ Clearer feedback messages
-- ✅ Correct CPU statistics
-- ✅ Better error handling with informative messages
-
-### Code Quality
-- ✅ ES6 compliant
-- ✅ Better test coverage (5 → 12 tests)
-- ✅ More maintainable code
-
----
-
-## 6. MODIFIED FILES
-
-1. `src/helpers/dockerService/serviceComponents/containerActions.js`
-2. `src/hooks/creation/useContainerCreation.js`
-3. `src/helpers/dockerService/serviceComponents/containerLogs.js`
-4. `src/helpers/dockerService/dockerService.js`
-5. `src/components/ContainerRow.jsx`
-6. `src/helpers/validationHelpers.js`
-7. `src/helpers/dockerService/serviceComponents/containerStats.js`
-8. `src/hooks/useControls.js`
-9. `src/helpers/actionHelpers.js`
-10. `src/helpers/dockerService/serviceComponents/containerList.js`
-11. `test/validationHelpers.test.js`
-
----
-
-## 7. FUTURE RECOMMENDATIONS
-
-While the critical issues have been addressed, the internal audit yielded additional recommendations for future improvements:
-
-### Medium Priority
-- Add more unit tests
-- Implement PropTypes or migrate to TypeScript
-- Extract magic numbers into constants
-- Improve the logging system
-
-### Low Priority
-- Implement i18n (internationalization)
-- Improve JSDoc documentation
-- Consider websockets for real-time updates
-- Implement retry logic for Docker reconnection
-
----
-
-## 8. CONCLUSION
-
-We applied 11 critical fixes that significantly improve:
-
-- Security: 0 vulnerabilities
-- Stability: Prevention of memory leaks and race conditions
-- Portability: Works on Windows, Linux, and macOS
-- Quality: +140% more tests (5 → 12)
-
-All fixes have been tested and verified via:
-- ✅ Unit tests (12/12 passing)
-- ✅ Successful build
-- ✅ CodeQL security analysis (0 alerts)
-
----
-
-**End of fixes document**