@geekmidas/cli 0.14.0 → 0.16.0

package/dist/index.mjs

@@ -5,7 +5,7 @@ import { DokployApi } from "./dokploy-api-CaETb2L6.mjs";
 import { generateReactQueryCommand } from "./openapi-react-query-CM2_qlW9.mjs";
 import { maskPassword, readStageSecrets, secretsExist, setCustomSecret, writeStageSecrets } from "./storage-BaOP55oq.mjs";
 import { createRequire } from "node:module";
-import { copyFileSync, existsSync, mkdirSync, unlinkSync } from "node:fs";
+import { copyFileSync, existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
 import { basename, dirname, join, parse, relative, resolve } from "node:path";
 import { Command } from "commander";
 import { stdin, stdout } from "node:process";
@@ -29,7 +29,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 //#endregion
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "0.14.0";
+var version = "0.16.0";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -1297,7 +1297,7 @@ async function buildForProvider(provider, context, rootOutputDir, endpointGenera
 		let masterKey;
 		if (context.production?.bundle && !skipBundle) {
 			logger$6.log(`\n📦 Bundling production server...`);
-			const { bundleServer } = await import("./bundler-DWctKN1z.mjs");
+			const { bundleServer } = await import("./bundler-B6z6HEeh.mjs");
 			const allConstructs = [
 				...endpoints.map((e) => e.construct),
 				...functions.map((f) => f.construct),
@@ -2084,6 +2084,36 @@ async function pushDockerImage(imageName, options) {
 
 //#endregion
 //#region src/deploy/docker.ts
+/**
+* Get app name from package.json in the current working directory
+* Used for Dokploy app/project naming
+*/
+function getAppNameFromCwd() {
+	const packageJsonPath = join(process.cwd(), "package.json");
+	if (!existsSync(packageJsonPath)) return void 0;
+	try {
+		const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+		if (pkg.name) return pkg.name.replace(/^@[^/]+\//, "");
+	} catch {}
+	return void 0;
+}
+/**
+* Get app name from package.json adjacent to the lockfile (project root)
+* Used for Docker image naming
+*/
+function getAppNameFromPackageJson() {
+	const cwd = process.cwd();
+	const lockfilePath = findLockfilePath(cwd);
+	if (!lockfilePath) return void 0;
+	const projectRoot = dirname(lockfilePath);
+	const packageJsonPath = join(projectRoot, "package.json");
+	if (!existsSync(packageJsonPath)) return void 0;
+	try {
+		const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+		if (pkg.name) return pkg.name.replace(/^@[^/]+\//, "");
+	} catch {}
+	return void 0;
+}
 const logger$4 = console;
 /**
 * Get the full image reference
@@ -2148,7 +2178,7 @@ async function pushImage(imageRef) {
 */
 async function deployDocker(options) {
 	const { stage, tag, skipPush, masterKey, config: config$1 } = options;
-	const imageName = config$1.imageName ?? "app";
+	const imageName = config$1.imageName;
 	const imageRef = getImageRef(config$1.registry, imageName, tag);
 	await buildImage(imageRef);
 	if (!skipPush) if (!config$1.registry) logger$4.warn("\n⚠️  No registry configured. Use --skip-push or configure docker.registry in gkm.config.ts");
@@ -2170,11 +2200,19 @@ async function deployDocker(options) {
 }
 /**
 * Resolve Docker deploy config from gkm config
+* - imageName: from config, or cwd package.json, or 'app' (for Docker image)
+* - projectName: from root package.json, or 'app' (for Dokploy project)
+* - appName: from cwd package.json, or projectName (for Dokploy app within project)
 */
 function resolveDockerConfig(config$1) {
+	const projectName = getAppNameFromPackageJson() ?? "app";
+	const appName = getAppNameFromCwd() ?? projectName;
+	const imageName = config$1.docker?.imageName ?? appName;
 	return {
 		registry: config$1.docker?.registry,
-		imageName: config$1.docker?.imageName
+		imageName,
+		projectName,
+		appName
 	};
 }
 
@@ -2502,8 +2540,13 @@ async function provisionServices(api, projectId, environmentId, appName, service
 			logger$1.log(`   ✓ Created PostgreSQL: ${postgres.postgresId}`);
 			await api.deployPostgres(postgres.postgresId);
 			logger$1.log("   ✓ PostgreSQL deployed");
+			serviceUrls.DATABASE_HOST = postgres.appName;
+			serviceUrls.DATABASE_PORT = "5432";
+			serviceUrls.DATABASE_NAME = postgres.databaseName;
+			serviceUrls.DATABASE_USER = postgres.databaseUser;
+			serviceUrls.DATABASE_PASSWORD = postgres.databasePassword;
 			serviceUrls.DATABASE_URL = `postgresql://${postgres.databaseUser}:${postgres.databasePassword}@${postgres.appName}:5432/${postgres.databaseName}`;
-			logger$1.log(`   ✓ DATABASE_URL configured`);
+			logger$1.log(`   ✓ Database credentials configured`);
 		} catch (error) {
 			const message = error instanceof Error ? error.message : "Unknown error";
 			if (message.includes("already exists") || message.includes("duplicate")) logger$1.log(`   ℹ PostgreSQL already exists`);
@@ -2521,9 +2564,12 @@ async function provisionServices(api, projectId, environmentId, appName, service
 			logger$1.log(`   ✓ Created Redis: ${redis.redisId}`);
 			await api.deployRedis(redis.redisId);
 			logger$1.log("   ✓ Redis deployed");
+			serviceUrls.REDIS_HOST = redis.appName;
+			serviceUrls.REDIS_PORT = "6379";
+			if (redis.databasePassword) serviceUrls.REDIS_PASSWORD = redis.databasePassword;
 			const password = redis.databasePassword ? `:${redis.databasePassword}@` : "";
 			serviceUrls.REDIS_URL = `redis://${password}${redis.appName}:6379`;
-			logger$1.log(`   ✓ REDIS_URL configured`);
+			logger$1.log(`   ✓ Redis credentials configured`);
 		} catch (error) {
 			const message = error instanceof Error ? error.message : "Unknown error";
 			if (message.includes("already exists") || message.includes("duplicate")) logger$1.log(`   ℹ Redis already exists`);
@@ -2585,7 +2631,7 @@ async function ensureDokploySetup(config$1, dockerConfig, stage, services) {
 			}
 			const environmentId$1 = environment.environmentId;
 			logger$1.log(`   Services config: ${JSON.stringify(services)}, envId: ${environmentId$1}`);
-			const serviceUrls$1 = await provisionServices(api, existingConfig.projectId, environmentId$1, dockerConfig.imageName || "app", services, existingUrls);
+			const serviceUrls$1 = await provisionServices(api, existingConfig.projectId, environmentId$1, dockerConfig.appName, services, existingUrls);
 			return {
 				config: {
 					endpoint: existingConfig.endpoint,
@@ -2601,7 +2647,7 @@ async function ensureDokploySetup(config$1, dockerConfig, stage, services) {
 		}
 	}
 	logger$1.log("\n📁 Looking for project...");
-	const projectName = dockerConfig.imageName || "app";
+	const projectName = dockerConfig.projectName;
 	const projects = await api.listProjects();
 	let project = projects.find((p) => p.name.toLowerCase() === projectName.toLowerCase());
 	let environmentId;
@@ -2632,7 +2678,7 @@ async function ensureDokploySetup(config$1, dockerConfig, stage, services) {
 		logger$1.log(`   ✓ Using environment: ${stage}`);
 	}
 	logger$1.log("\n📦 Looking for application...");
-	const appName = dockerConfig.imageName || projectName;
+	const appName = dockerConfig.appName;
 	let applicationId;
 	if (existingConfig && typeof existingConfig !== "boolean" && existingConfig.applicationId) {
 		applicationId = existingConfig.applicationId;
@@ -2701,7 +2747,7 @@ async function ensureDokploySetup(config$1, dockerConfig, stage, services) {
 	logger$1.log(`   Project: ${project.projectId}`);
 	logger$1.log(`   Application: ${applicationId}`);
 	if (registryId) logger$1.log(`   Registry: ${registryId}`);
-	const serviceUrls = await provisionServices(api, project.projectId, environmentId, dockerConfig.imageName || "app", services, existingUrls);
+	const serviceUrls = await provisionServices(api, project.projectId, environmentId, dockerConfig.appName, services, existingUrls);
 	return {
 		config: dokployConfig,
 		serviceUrls
@@ -2725,7 +2771,7 @@ async function deployCommand(options) {
 	const imageTag = tag ?? generateTag(stage);
 	logger$1.log(`   Tag: ${imageTag}`);
 	const dockerConfig = resolveDockerConfig(config$1);
-	const imageName = dockerConfig.imageName ?? "app";
+	const imageName = dockerConfig.imageName;
 	const registry = dockerConfig.registry;
 	const imageRef = registry ? `${registry}/${imageName}:${imageTag}` : `${imageName}:${imageTag}`;
 	let dokployConfig;
@@ -2753,11 +2799,23 @@ async function deployCommand(options) {
 				secrets = initStageSecrets(stage);
 			}
 			let updated = false;
+			const urlFields = [
+				"DATABASE_URL",
+				"REDIS_URL",
+				"RABBITMQ_URL"
+			];
 			for (const [key, value] of Object.entries(setupResult.serviceUrls)) {
-				const urlKey = key;
-				if (value && !secrets.urls[urlKey] && !secrets.custom[key]) {
-					secrets.urls[urlKey] = value;
-					logger$1.log(`   Saved ${key} to secrets`);
+				if (!value) continue;
+				if (urlFields.includes(key)) {
+					const urlKey = key;
+					if (!secrets.urls[urlKey]) {
+						secrets.urls[urlKey] = value;
+						logger$1.log(`   Saved ${key} to secrets.urls`);
+						updated = true;
+					}
+				} else if (!secrets.custom[key]) {
+					secrets.custom[key] = value;
+					logger$1.log(`   Saved ${key} to secrets.custom`);
 					updated = true;
 				}
 			}