@geekmidas/cli 1.10.16 → 1.10.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekmidas/cli",
-  "version": "1.10.16",
+  "version": "1.10.17",
   "description": "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs",
   "private": false,
   "type": "module",
@@ -56,11 +56,11 @@
     "prompts": "~2.4.2",
     "tsx": "~4.20.3",
     "yaml": "~2.8.2",
-    "@geekmidas/envkit": "~1.0.3",
+    "@geekmidas/envkit": "~1.0.4",
     "@geekmidas/constructs": "~3.0.2",
+    "@geekmidas/errors": "~1.0.0",
     "@geekmidas/logger": "~1.0.0",
-    "@geekmidas/schema": "~1.0.0",
-    "@geekmidas/errors": "~1.0.0"
+    "@geekmidas/schema": "~1.0.0"
   },
   "devDependencies": {
     "@types/lodash.kebabcase": "^4.1.9",

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

@@ -1237,6 +1237,28 @@ describe('replacePortInUrl', () => {
 		// Only the :5432 before / should be replaced
 		expect(result).toBe('postgresql://app:pass5432@localhost:5433/db5432');
 	});
+
+	it('should replace port followed by query string', () => {
+		const url = 'pgboss://pgboss:pass@localhost:5432/mydb?schema=pgboss';
+		expect(replacePortInUrl(url, 5432, 5433)).toBe(
+			'pgboss://pgboss:pass@localhost:5433/mydb?schema=pgboss',
+		);
+	});
+
+	it('should replace port in SNS URL with query params and no path', () => {
+		const url = 'sns://key:secret@localhost:4566?region=us-east-1';
+		expect(replacePortInUrl(url, 4566, 4567)).toBe(
+			'sns://key:secret@localhost:4567?region=us-east-1',
+		);
+	});
+
+	it('should replace URL-encoded port in query params', () => {
+		const url =
+			'sns://key:secret@localhost:4566?region=us-east-1&endpoint=http%3A%2F%2Flocalhost%3A4566';
+		expect(replacePortInUrl(url, 4566, 4567)).toBe(
+			'sns://key:secret@localhost:4567?region=us-east-1&endpoint=http%3A%2F%2Flocalhost%3A4567',
+		);
+	});
 });
 
 describe('rewriteUrlsWithPorts', () => {
@@ -1384,6 +1406,52 @@ describe('rewriteUrlsWithPorts', () => {
 		expect(result.POSTGRES_HOST).toBe('localhost');
 	});
 
+	it('should rewrite EVENT_PUBLISHER_CONNECTION_STRING and EVENT_SUBSCRIBER_CONNECTION_STRING', () => {
+		const secrets = {
+			EVENT_PUBLISHER_CONNECTION_STRING:
+				'pgboss://pgboss:pass@localhost:5432/mydb?schema=pgboss',
+			EVENT_SUBSCRIBER_CONNECTION_STRING:
+				'pgboss://pgboss:pass@localhost:5432/mydb?schema=pgboss',
+		};
+		const result = rewriteUrlsWithPorts(secrets, {
+			dockerEnv: { POSTGRES_HOST_PORT: '5433' },
+			ports: { POSTGRES_HOST_PORT: 5433 },
+			mappings: [pgMapping],
+		});
+		expect(result.EVENT_PUBLISHER_CONNECTION_STRING).toBe(
+			'pgboss://pgboss:pass@localhost:5433/mydb?schema=pgboss',
+		);
+		expect(result.EVENT_SUBSCRIBER_CONNECTION_STRING).toBe(
+			'pgboss://pgboss:pass@localhost:5433/mydb?schema=pgboss',
+		);
+	});
+
+	it('should rewrite SNS connection strings with encoded endpoint port', () => {
+		const localstackMapping = {
+			service: 'localstack',
+			envVar: 'LOCALSTACK_PORT',
+			defaultPort: 4566,
+			containerPort: 4566,
+		};
+		const secrets = {
+			EVENT_PUBLISHER_CONNECTION_STRING:
+				'sns://LSIAkey:secret@localhost:4566?region=us-east-1&endpoint=http%3A%2F%2Flocalhost%3A4566',
+			EVENT_SUBSCRIBER_CONNECTION_STRING:
+				'sqs://LSIAkey:secret@localhost:4566?region=us-east-1&endpoint=http%3A%2F%2Flocalhost%3A4566',
+		};
+		const result = rewriteUrlsWithPorts(secrets, {
+			dockerEnv: { LOCALSTACK_PORT: '4567' },
+			ports: { LOCALSTACK_PORT: 4567 },
+			mappings: [localstackMapping],
+		});
+		expect(result.EVENT_PUBLISHER_CONNECTION_STRING).toBe(
+			'sns://LSIAkey:secret@localhost:4567?region=us-east-1&endpoint=http%3A%2F%2Flocalhost%3A4567',
+		);
+		expect(result.EVENT_SUBSCRIBER_CONNECTION_STRING).toBe(
+			'sqs://LSIAkey:secret@localhost:4567?region=us-east-1&endpoint=http%3A%2F%2Flocalhost%3A4567',
+		);
+	});
+
 	it('should return empty for no mappings', () => {
 		const result = rewriteUrlsWithPorts(
 			{},

package/src/dev/index.ts

@@ -348,7 +348,17 @@ export function replacePortInUrl(
 	newPort: number,
 ): string {
 	if (oldPort === newPort) return url;
-	return url.replace(new RegExp(`:${oldPort}(?=/|$)`, 'g'), `:${newPort}`);
+	// Replace literal :port (in authority section)
+	let result = url.replace(
+		new RegExp(`:${oldPort}(?=[/?#]|$)`, 'g'),
+		`:${newPort}`,
+	);
+	// Replace URL-encoded :port (e.g., in query params like endpoint=http%3A%2F%2Flocalhost%3A4566)
+	result = result.replace(
+		new RegExp(`%3A${oldPort}(?=[%/?#&]|$)`, 'gi'),
+		`%3A${newPort}`,
+	);
+	return result;
 }
 
 /**
@@ -402,6 +412,7 @@ export function rewriteUrlsWithPorts(
 		if (
 			!key.endsWith('_URL') &&
 			!key.endsWith('_ENDPOINT') &&
+			!key.endsWith('_CONNECTION_STRING') &&
 			key !== 'DATABASE_URL'
 		)
 			continue;
@@ -2246,20 +2257,17 @@ export async function execCommand(
 		logger.log(`🔐 Loaded ${secretCount} secret(s)`);
 	}
 
-	// Rewrite URLs with resolved Docker ports (from gkm dev)
-	const composePath = join(secretsRoot, 'docker-compose.yml');
-	const mappings = parseComposePortMappings(composePath);
-	if (mappings.length > 0) {
-		const ports = await loadPortState(secretsRoot);
-		if (Object.keys(ports).length > 0) {
-			const rewritten = rewriteUrlsWithPorts(credentials, {
-				dockerEnv: {},
-				ports,
-				mappings,
-			});
-			Object.assign(credentials, rewritten);
-			logger.log(`🔌 Applied ${Object.keys(ports).length} port mapping(s)`);
-		}
+	// Resolve actual Docker ports from running containers (not just saved state)
+	const resolvedPorts = await resolveServicePorts(secretsRoot);
+	if (
+		resolvedPorts.mappings.length > 0 &&
+		Object.keys(resolvedPorts.ports).length > 0
+	) {
+		const rewritten = rewriteUrlsWithPorts(credentials, resolvedPorts);
+		Object.assign(credentials, rewritten);
+		logger.log(
+			`🔌 Applied ${Object.keys(resolvedPorts.ports).length} port mapping(s)`,
+		);
 	}
 
 	// Inject dependency URLs (works for both frontend and backend apps)

package/src/init/versions.ts

@@ -35,7 +35,7 @@ export const GEEKMIDAS_VERSIONS = {
 	'@geekmidas/constructs': '~3.0.2',
 	'@geekmidas/db': '~1.0.0',
 	'@geekmidas/emailkit': '~1.0.0',
-	'@geekmidas/envkit': '~1.0.3',
+	'@geekmidas/envkit': '~1.0.4',
 	'@geekmidas/errors': '~1.0.0',
 	'@geekmidas/events': '~1.1.0',
 	'@geekmidas/logger': '~1.0.0',