@geekmidas/cli 1.10.12 → 1.10.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekmidas/cli",
-  "version": "1.10.12",
+  "version": "1.10.14",
   "description": "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs",
   "private": false,
   "type": "module",
@@ -58,9 +58,9 @@
     "yaml": "~2.8.2",
     "@geekmidas/constructs": "~3.0.2",
     "@geekmidas/envkit": "~1.0.3",
-    "@geekmidas/logger": "~1.0.0",
     "@geekmidas/errors": "~1.0.0",
-    "@geekmidas/schema": "~1.0.0"
+    "@geekmidas/schema": "~1.0.0",
+    "@geekmidas/logger": "~1.0.0"
   },
   "devDependencies": {
     "@types/lodash.kebabcase": "^4.1.9",

package/src/dev/__tests__/index.spec.ts

@@ -1467,8 +1467,8 @@ services:
   mailpit:
     image: axllent/mailpit
     ports:
-      - '\${MAILPIT_SMTP_PORT:-1025}:1025'
-      - '\${MAILPIT_UI_PORT:-8025}:8025'
+      - '\${SMTP_PORT:-1025}:1025'
+      - '\${MAILPIT_PORT:-8025}:8025'
 `,
 		);
 
@@ -1488,13 +1488,13 @@ services:
 			},
 			{
 				service: 'mailpit',
-				envVar: 'MAILPIT_SMTP_PORT',
+				envVar: 'SMTP_PORT',
 				defaultPort: 1025,
 				containerPort: 1025,
 			},
 			{
 				service: 'mailpit',
-				envVar: 'MAILPIT_UI_PORT',
+				envVar: 'MAILPIT_PORT',
 				defaultPort: 8025,
 				containerPort: 8025,
 			},

package/src/docker/__tests__/compose.spec.ts

@@ -946,8 +946,8 @@ describe('generateWorkspaceCompose', () => {
 			expect(yaml).toContain('mailpit:');
 			expect(yaml).toContain('image: axllent/mailpit:latest');
 			expect(yaml).toContain('MP_SMTP_AUTH:');
-			expect(yaml).toContain('${MAILPIT_UI_PORT:-8025}:8025'); // Web UI
-			expect(yaml).toContain('${MAILPIT_SMTP_PORT:-1025}:1025'); // SMTP
+			expect(yaml).toContain('${MAILPIT_PORT:-8025}:8025'); // Web UI / API
+			expect(yaml).toContain('${SMTP_PORT:-1025}:1025'); // SMTP
 		});
 
 		it('should add SMTP env vars for backend apps when mail is enabled', () => {

package/src/docker/compose.ts

@@ -269,8 +269,8 @@ services:
     environment:
       MP_SMTP_AUTH: \${SMTP_USER:-${imageName}}:\${SMTP_PASS:-${imageName}}
     ports:
-      - "\${MAILPIT_UI_PORT:-8025}:8025"  # Web UI
-      - "\${MAILPIT_SMTP_PORT:-1025}:1025"  # SMTP
+      - "\${MAILPIT_PORT:-8025}:8025"  # Web UI / API
+      - "\${SMTP_PORT:-1025}:1025"  # SMTP
     healthcheck:
       test: ["CMD", "wget", "-q", "--spider", "http://localhost:8025"]
       interval: 5s
@@ -457,8 +457,8 @@ services:
     environment:
       MP_SMTP_AUTH: \${SMTP_USER:-${workspace.name}}:\${SMTP_PASS:-${workspace.name}}
     ports:
-      - "\${MAILPIT_UI_PORT:-8025}:8025"  # Web UI
-      - "\${MAILPIT_SMTP_PORT:-1025}:1025"  # SMTP
+      - "\${MAILPIT_PORT:-8025}:8025"  # Web UI / API
+      - "\${SMTP_PORT:-1025}:1025"  # SMTP
     healthcheck:
       test: ["CMD", "wget", "-q", "--spider", "http://localhost:8025"]
       interval: 5s

package/src/init/__tests__/generators.spec.ts

@@ -25,7 +25,7 @@ const baseOptions: TemplateOptions = {
 	apiPath: '',
 	packageManager: 'pnpm',
 	deployTarget: 'dokploy',
-	services: { db: true, cache: true, mail: false },
+	services: { db: true, cache: true, mail: false, storage: false },
 };
 
 describe('generatePackageJson', () => {
@@ -245,15 +245,55 @@ describe('generateDockerFiles', () => {
 	it('should include mailpit with dynamic ports when mail is enabled', () => {
 		const options = {
 			...baseOptions,
-			services: { db: true, cache: true, mail: true },
+			services: { ...baseOptions.services, mail: true },
 		};
 		const files = generateDockerFiles(options, minimalTemplate);
 		expect(files[0].content).toContain('mailpit');
+		expect(files[0].content).toContain("'${SMTP_PORT:-1025}:1025'");
+		expect(files[0].content).toContain("'${MAILPIT_PORT:-8025}:8025'");
+		expect(files[0].content).toContain('MP_SMTP_AUTH:');
+	});
+
+	it('should include minio with dynamic ports when storage is enabled', () => {
+		const options = {
+			...baseOptions,
+			services: { ...baseOptions.services, storage: true },
+		};
+		const files = generateDockerFiles(options, minimalTemplate);
+		expect(files[0].content).toContain('minio');
+		expect(files[0].content).toContain('minio/minio:latest');
+		expect(files[0].content).toContain("'${MINIO_API_HOST_PORT:-9000}:9000'");
 		expect(files[0].content).toContain(
-			"'${MAILPIT_SMTP_HOST_PORT:-1025}:1025'",
+			"'${MINIO_CONSOLE_HOST_PORT:-9001}:9001'",
 		);
-		expect(files[0].content).toContain("'${MAILPIT_UI_HOST_PORT:-8025}:8025'");
-		expect(files[0].content).toContain('MP_SMTP_AUTH:');
+		expect(files[0].content).toContain('MINIO_ROOT_USER:');
+		expect(files[0].content).toContain('MINIO_ROOT_PASSWORD:');
+		expect(files[0].content).toContain('minio_data:');
+	});
+
+	it('should include all services when all are enabled', () => {
+		const options = {
+			...baseOptions,
+			services: { db: true, cache: true, mail: true, storage: true },
+		};
+		const files = generateDockerFiles(options, minimalTemplate);
+		expect(files[0].content).toContain('postgres');
+		expect(files[0].content).toContain('redis');
+		expect(files[0].content).toContain('mailpit');
+		expect(files[0].content).toContain('minio');
+	});
+
+	it('should not include disabled services', () => {
+		const options = {
+			...baseOptions,
+			database: false,
+			services: { db: false, cache: false, mail: false, storage: false },
+		};
+		const files = generateDockerFiles(options, minimalTemplate);
+		expect(files[0].content).not.toContain('postgres');
+		expect(files[0].content).toContain('redis'); // redis is always included
+		expect(files[0].content).not.toContain('mailpit');
+		expect(files[0].content).not.toContain('minio');
 	});
 });
 

package/src/init/generators/docker.ts

@@ -153,12 +153,36 @@ export function generateDockerFiles(
     container_name: ${options.name}-mailpit
     restart: unless-stopped
     ports:
-      - '\${MAILPIT_SMTP_HOST_PORT:-1025}:1025'
-      - '\${MAILPIT_UI_HOST_PORT:-8025}:8025'
+      - '\${SMTP_PORT:-1025}:1025'
+      - '\${MAILPIT_PORT:-8025}:8025'
     environment:
       MP_SMTP_AUTH: \${SMTP_USER:-${options.name}}:\${SMTP_PASS:-${options.name}}`);
 	}
 
+	// MinIO for S3-compatible object storage
+	if (options.services?.storage) {
+		services.push(`  minio:
+    image: minio/minio:latest
+    container_name: ${options.name}-minio
+    restart: unless-stopped
+    entrypoint: sh
+    command: -c 'mkdir -p /data/\${STORAGE_BUCKET:-${options.name}} && /usr/bin/docker-entrypoint.sh server --console-address ":9001" /data'
+    environment:
+      MINIO_ROOT_USER: \${STORAGE_ACCESS_KEY_ID:-${options.name}}
+      MINIO_ROOT_PASSWORD: \${STORAGE_SECRET_ACCESS_KEY:-${options.name}}
+    ports:
+      - '\${MINIO_API_HOST_PORT:-9000}:9000'
+      - '\${MINIO_CONSOLE_HOST_PORT:-9001}:9001'
+    volumes:
+      - minio_data:/data
+    healthcheck:
+      test: ['CMD', 'mc', 'ready', 'local']
+      interval: 10s
+      timeout: 5s
+      retries: 5`);
+		volumes.push('  minio_data:');
+	}
+
 	// Build docker-compose.yml
 	let dockerCompose = `# Use "gkm dev" or "gkm test" to start services.
 # Running "docker compose up" directly will not inject secrets or resolve ports.

package/src/init/index.ts

@@ -181,12 +181,13 @@ export async function initCommand(
 
 	// Parse services selection
 	const servicesArray: string[] = options.yes
-		? ['db', 'cache', 'mail']
+		? ['db', 'cache', 'mail', 'storage']
 		: answers.services || [];
 	const services: ServicesSelection = {
 		db: servicesArray.includes('db'),
 		cache: servicesArray.includes('cache'),
 		mail: servicesArray.includes('mail'),
+		storage: servicesArray.includes('storage'),
 	};
 
 	const pkgManager: PackageManager = options.pm

package/src/init/templates/index.ts

@@ -38,6 +38,7 @@ export interface ServicesSelection {
 	db: boolean;
 	cache: boolean;
 	mail: boolean;
+	storage: boolean;
 }
 
 /**
@@ -247,6 +248,11 @@ export const servicesChoices = [
 		value: 'mail',
 		description: 'Email testing service (dev only)',
 	},
+	{
+		title: 'MinIO',
+		value: 'storage',
+		description: 'S3-compatible object storage (dev only)',
+	},
 ];
 
 /**

package/src/setup/__tests__/reconcile-secrets.spec.ts

@@ -158,6 +158,41 @@ describe('reconcileSecrets', () => {
 		expect(result!.services.postgres).toEqual(secrets.services.postgres);
 	});
 
+	it('should add missing mailpit credentials when mail service is enabled', () => {
+		const workspace = createWorkspace({
+			services: { db: true, mail: true },
+		});
+		// Secrets only have postgres, not mailpit
+		const secrets = createSecrets({
+			NODE_ENV: 'development',
+			PORT: '3000',
+			API_DATABASE_URL: 'postgresql://api:pass@localhost:5432/test_dev',
+			API_DB_PASSWORD: 'pass',
+			AUTH_DATABASE_URL: 'postgresql://auth:pass@localhost:5432/test_dev',
+			AUTH_DB_PASSWORD: 'pass',
+			WEB_URL: 'http://localhost:3002',
+			BETTER_AUTH_SECRET: 'existing',
+			BETTER_AUTH_URL: 'http://localhost:3001',
+			BETTER_AUTH_TRUSTED_ORIGINS:
+				'http://localhost:3000,http://localhost:3001,http://localhost:3002',
+			AUTH_PORT: '3001',
+			AUTH_URL: 'http://localhost:3001',
+		});
+
+		const result = reconcileSecrets(secrets, workspace);
+
+		expect(result).not.toBeNull();
+		expect(result!.services.mailpit).toBeDefined();
+		expect(result!.services.mailpit!.host).toBe('localhost');
+		expect(result!.services.mailpit!.port).toBe(1025);
+		expect(result!.services.mailpit!.username).toBeDefined();
+		expect(result!.services.mailpit!.password).toHaveLength(32);
+		expect(result!.urls.SMTP_HOST).toBe('localhost');
+		expect(result!.urls.SMTP_PORT).toBe('1025');
+		// Existing postgres should be preserved
+		expect(result!.services.postgres).toEqual(secrets.services.postgres);
+	});
+
 	it('should not regenerate credentials for existing services', () => {
 		const workspace = createWorkspace({
 			services: { db: true, storage: true },

package/src/setup/index.ts

@@ -168,6 +168,7 @@ export function reconcileSecrets(
 		{ key: 'db', name: 'postgres' },
 		{ key: 'cache', name: 'redis' },
 		{ key: 'storage', name: 'minio' },
+		{ key: 'mail', name: 'mailpit' },
 	];
 
 	for (const { key, name } of serviceMap) {
@@ -235,6 +236,7 @@ async function generateFreshSecrets(
 	if (workspace.services.db) serviceNames.push('postgres');
 	if (workspace.services.cache) serviceNames.push('redis');
 	if (workspace.services.storage) serviceNames.push('minio');
+	if (workspace.services.mail) serviceNames.push('mailpit');
 
 	// Create base secrets with service credentials
 	const secrets = createStageSecrets(stage, serviceNames, {

package/src/test/__tests__/__fixtures__/workspace.ts

@@ -99,6 +99,6 @@ services:
   mailpit:
     image: axllent/mailpit
     ports:
-      - '\${MAILPIT_SMTP_PORT:-1025}:1025'
-      - '\${MAILPIT_UI_PORT:-8025}:8025'
+      - '\${SMTP_PORT:-1025}:1025'
+      - '\${MAILPIT_PORT:-8025}:8025'
 `;

package/src/test/index.ts

@@ -6,6 +6,7 @@ import { sniffAppEnvironment } from '../deploy/sniffer';
 import {
 	createCredentialsPreload,
 	loadEnvFiles,
+	loadPortState,
 	parseComposePortMappings,
 	resolveServicePorts,
 	rewriteUrlsWithPorts,
@@ -133,6 +134,19 @@ export async function testCommand(options: TestOptions = {}): Promise<void> {
 				console.log(
 					`  🔌 Applied ${Object.keys(resolvedPorts.ports).length} port mapping(s)`,
 				);
+			} else {
+				// Fallback to saved port state from a previous gkm dev run
+				const ports = await loadPortState(cwd);
+				if (Object.keys(ports).length > 0) {
+					secretsEnv = rewriteUrlsWithPorts(secretsEnv, {
+						dockerEnv: {},
+						ports,
+						mappings,
+					});
+					console.log(
+						`  🔌 Applied ${Object.keys(ports).length} port mapping(s)`,
+					);
+				}
 			}
 		}
 	}