@geekmidas/cli 0.13.0 → 0.15.0

package/src/auth/credentials.ts

@@ -12,6 +12,8 @@ export interface StoredCredentials {
 		token: string;
 		/** Dokploy endpoint URL */
 		endpoint: string;
+		/** Registry ID in Dokploy (for Docker image pulls) */
+		registryId?: string;
 		/** When the credentials were stored */
 		storedAt: string;
 	};
@@ -112,6 +114,7 @@ export async function getDokployCredentials(
 ): Promise<{
 	token: string;
 	endpoint: string;
+	registryId?: string;
 } | null> {
 	const credentials = await readCredentials(options);
 
@@ -122,6 +125,7 @@ export async function getDokployCredentials(
 	return {
 		token: credentials.dokploy.token,
 		endpoint: credentials.dokploy.endpoint,
+		registryId: credentials.dokploy.registryId,
 	};
 }
 
@@ -185,3 +189,32 @@ export async function getDokployEndpoint(
 	const stored = await getDokployCredentials(options);
 	return stored?.endpoint ?? null;
 }
+
+/**
+ * Store Dokploy registry ID
+ */
+export async function storeDokployRegistryId(
+	registryId: string,
+	options?: CredentialOptions,
+): Promise<void> {
+	const credentials = await readCredentials(options);
+
+	if (!credentials.dokploy) {
+		throw new Error(
+			'Dokploy credentials not found. Run "gkm login --service dokploy" first.',
+		);
+	}
+
+	credentials.dokploy.registryId = registryId;
+	await writeCredentials(credentials, options);
+}
+
+/**
+ * Get Dokploy registry ID from stored credentials
+ */
+export async function getDokployRegistryId(
+	options?: CredentialOptions,
+): Promise<string | undefined> {
+	const stored = await getDokployCredentials(options);
+	return stored?.registryId ?? undefined;
+}

package/src/auth/index.ts

@@ -30,19 +30,9 @@ export async function validateDokployToken(
 	endpoint: string,
 	token: string,
 ): Promise<boolean> {
-	try {
-		const response = await fetch(`${endpoint}/api/project.all`, {
-			method: 'GET',
-			headers: {
-				'Content-Type': 'application/json',
-				Authorization: `Bearer ${token}`,
-			},
-		});
-
-		return response.ok;
-	} catch {
-		return false;
-	}
+	const { DokployApi } = await import('../deploy/dokploy-api');
+	const api = new DokployApi({ baseUrl: endpoint, token });
+	return api.validateToken();
 }
 
 /**
@@ -55,46 +45,60 @@ async function prompt(message: string, hidden = false): Promise<string> {
 		);
 	}
 
-	const rl = readline.createInterface({ input, output });
-
-	try {
-		if (hidden) {
-			// For hidden input, we need to handle it differently
-			process.stdout.write(message);
-
-			return new Promise((resolve) => {
-				let value = '';
-
-				const onData = (char: Buffer) => {
-					const c = char.toString();
-
-					if (c === '\n' || c === '\r') {
-						process.stdin.removeListener('data', onData);
-						process.stdin.setRawMode(false);
-						process.stdout.write('\n');
-						resolve(value);
-					} else if (c === '\u0003') {
-						// Ctrl+C
-						process.exit(1);
-					} else if (c === '\u007F' || c === '\b') {
-						// Backspace
-						if (value.length > 0) {
-							value = value.slice(0, -1);
-						}
-					} else {
-						value += c;
+	if (hidden) {
+		// For hidden input, use raw mode directly without readline
+		process.stdout.write(message);
+
+		return new Promise((resolve, reject) => {
+			let value = '';
+
+			const cleanup = () => {
+				process.stdin.setRawMode(false);
+				process.stdin.pause();
+				process.stdin.removeListener('data', onData);
+				process.stdin.removeListener('error', onError);
+			};
+
+			const onError = (err: Error) => {
+				cleanup();
+				reject(err);
+			};
+
+			const onData = (char: Buffer) => {
+				const c = char.toString();
+
+				if (c === '\n' || c === '\r') {
+					cleanup();
+					process.stdout.write('\n');
+					resolve(value);
+				} else if (c === '\u0003') {
+					// Ctrl+C
+					cleanup();
+					process.stdout.write('\n');
+					process.exit(1);
+				} else if (c === '\u007F' || c === '\b') {
+					// Backspace
+					if (value.length > 0) {
+						value = value.slice(0, -1);
 					}
-				};
-
-				process.stdin.setRawMode(true);
-				process.stdin.resume();
-				process.stdin.on('data', onData);
-			});
-		} else {
+				} else {
+					value += c;
+				}
+			};
+
+			process.stdin.setRawMode(true);
+			process.stdin.resume();
+			process.stdin.on('data', onData);
+			process.stdin.on('error', onError);
+		});
+	} else {
+		// For visible input, use readline
+		const rl = readline.createInterface({ input, output });
+		try {
 			return await rl.question(message);
+		} finally {
+			rl.close();
 		}
-	} finally {
-		rl.close();
 	}
 }
 
@@ -222,5 +226,8 @@ export function maskToken(token: string): string {
 export {
 	getDokployCredentials,
 	getDokployEndpoint,
+	getDokployRegistryId,
 	getDokployToken,
+	storeDokployCredentials,
+	storeDokployRegistryId,
 } from './credentials';

package/src/build/__tests__/bundler.spec.ts

@@ -8,7 +8,7 @@ import { bundleServer } from '../bundler';
 
 // Mock child_process to avoid actually running tsdown
 vi.mock('node:child_process', () => ({
-	execSync: vi.fn(),
+	spawnSync: vi.fn().mockReturnValue({ status: 0, error: null }),
 }));
 
 // Mock construct that returns specific environment variables
@@ -371,10 +371,10 @@ describe('bundleServer environment validation', () => {
 	);
 
 	itWithDir(
-		'should throw when secrets file does not exist',
+		'should auto-initialize secrets and throw for missing env vars',
 		async ({ dir }) => {
 			const entryPoint = await createEntryPoint(dir);
-			// Don't create secrets file
+			// Don't create secrets file - it should be auto-initialized
 
 			const constructs = [createMockConstruct(['DATABASE_URL'])];
 
@@ -382,6 +382,7 @@ describe('bundleServer environment validation', () => {
 			process.chdir(dir);
 
 			try {
+				// Should auto-initialize secrets but then fail because DATABASE_URL is required
 				await expect(
 					bundleServer({
 						entryPoint,
@@ -392,7 +393,7 @@ describe('bundleServer environment validation', () => {
 						stage: 'production',
 						constructs,
 					}),
-				).rejects.toThrow('No secrets found for stage "production"');
+				).rejects.toThrow('Missing environment variables');
 			} finally {
 				process.chdir(originalCwd);
 			}