@akash-chowdhury-24/deployhub 2.0.19 → 2.0.20

package/README.md

@@ -618,6 +618,8 @@ All JS frontends share the same install/build flow: `npm ci` → `npm run build`
 - **Install:** Composer (on CI and server).
 - **Deploy:** SSH with PHP-FPM or `php artisan` for Laravel.
 
+> ⚠️ **PHP-FPM deployments restart the FPM service for the ENTIRE host on every deploy.** If you run multiple DeployHub-managed environments on the same server, deploying ANY of them will briefly interrupt in-flight requests for ALL of them. For production use with multiple environments, either use separate hosts per environment, or set up per-environment PHP-FPM pools manually (not yet automated by DeployHub).
+
 ### Java
 
 - **Detect:** `pom.xml` with Spring Boot.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akash-chowdhury-24/deployhub",
-  "version": "2.0.19",
+  "version": "2.0.20",
   "description": "Zero-configuration deployment and artifact manager",
   "type": "module",
   "main": "./src/cli/index.js",

package/src/commands/init.js

@@ -36,7 +36,7 @@ import {
   printDeploymentNextSteps,
   formatSecretChecklistLine,
 } from '../deployment/deployment-env.js';
-import { confirmValueIfContainsSpaces } from '../deployment/init-helpers.js';
+import { confirmValueIfContainsSpaces, normalizeInitHealthCheckUrl } from '../deployment/init-helpers.js';
 
 const FRONTEND_CHOICES = [
   { name: 'React', value: 'react' },
@@ -405,10 +405,13 @@ export function registerInitCommand(program) {
 
           environments[name] = entry;
 
-          if (deployAnswers.healthUrl) {
-            healthUrl = deployAnswers.healthUrl;
-          } else if (!healthUrl && (singleConfig?.port || backendConfig?.port)) {
-            healthUrl = `http://localhost:${singleConfig?.port || backendConfig?.port}/health`;
+          // Only persist a health check URL the user actually entered.
+          // Never synthesize http://localhost:<port>/health — that always fails
+          // from GitHub Actions (remote runner ≠ deploy target) and incorrectly
+          // enables the verify stage when the user left the optional prompt blank.
+          const answered = normalizeInitHealthCheckUrl(deployAnswers.healthUrl);
+          if (answered) {
+            healthUrl = answered;
           }
 
           const secrets = getDockerEnvSecrets(deployAnswers);

package/src/deployment/init-helpers.js

@@ -32,6 +32,18 @@ export function suggestSshUser(osHint) {
   return undefined;
 }
 
+/**
+ * Normalize the optional health-check URL from `deployhub init`.
+ * Blank / whitespace → empty string. Never synthesizes localhost defaults
+ * (those always fail from GitHub Actions runners, which are not the deploy target).
+ *
+ * @param {unknown} answer
+ * @returns {string}
+ */
+export function normalizeInitHealthCheckUrl(answer) {
+  return typeof answer === 'string' && answer.trim() ? answer.trim() : '';
+}
+
 /**
  * @param {string} keyPath
  * @returns {Promise<{ ok: boolean, message: string, fixed?: boolean }>}

package/src/deployment/providers/docker.js

@@ -2,6 +2,7 @@ import { execa } from 'execa';
 import { createLogger } from '../../logger/index.js';
 import { createDockerImageDeployContext } from '../../utils/docker-image-deploy.js';
 import { resolveDockerImageRefForTag } from '../../utils/docker-image.js';
+import { resolveDockerContainerName } from '../../utils/docker-container-name.js';
 import { getEnvSettings, mergeMethodSettingsIntoEnv } from '../../core/environments.js';
 
 /**
@@ -15,6 +16,8 @@ export function createDockerProvider(config, envName, env = process.env) {
   const effectiveEnv = mergeMethodSettingsIntoEnv(env, settings);
   const imageOps = createDockerImageDeployContext(config, effectiveEnv, log);
   const { fullImage, getDockerEnv, ensureImageReadyForDeploy } = imageOps;
+  // Env-scoped like PM2/Nginx — same-daemon multi-env must not share one container name.
+  const containerName = resolveDockerContainerName(config, envName);
 
   /**
    * @param {string} artifactDir
@@ -36,11 +39,11 @@ export function createDockerProvider(config, envName, env = process.env) {
 
     await execa(
       'docker',
-      ['rm', '-f', config.project],
+      ['rm', '-f', containerName],
       { stdio: 'pipe', env: dockerEnv }
     ).catch(() => {});
 
-    await execa('docker', ['run', '-d', '--rm', '--name', config.project, imageRef], {
+    await execa('docker', ['run', '-d', '--rm', '--name', containerName, imageRef], {
       stdio: 'inherit',
       env: dockerEnv,
     });
@@ -81,7 +84,7 @@ export function createDockerProvider(config, envName, env = process.env) {
     try {
       const { stdout } = await execa(
         'docker',
-        ['ps', '--filter', `name=${config.project}`, '--format', '{{.Status}}'],
+        ['ps', '--filter', `name=^/${containerName}$`, '--format', '{{.Status}}'],
         { stdio: 'pipe', env: getDockerEnv() }
       );
       return stdout.includes('Up');

package/src/deployment/providers/kubernetes.js

@@ -8,6 +8,7 @@ import { createDockerImageDeployContext } from '../../utils/docker-image-deploy.
 import { resolveDockerImageRefForTag } from '../../utils/docker-image.js';
 import { ensureKubernetesNamespace } from '../../utils/kubernetes-namespace.js';
 import { syncKubernetesDeploymentImage } from '../../utils/kubernetes-deploy-image.js';
+import { resolveKubeNamespace } from '../../utils/kube-namespace-name.js';
 import { getEnvSettings, mergeMethodSettingsIntoEnv } from '../../core/environments.js';
 
 /**
@@ -24,8 +25,9 @@ export function createKubernetesProvider(config, envName, env = process.env) {
   const kubeconfig =
     effectiveEnv.KUBECONFIG || path.join(os.homedir(), '.kube', 'config');
   const context = effectiveEnv.KUBE_CONTEXT || '';
-  const namespace =
-    effectiveEnv.KUBE_NAMESPACE || config.project || 'default';
+  // Env-scoped like Nginx/PM2 — same-cluster multi-env must not share one namespace
+  // when settings still default to the project name for every environment.
+  const namespace = resolveKubeNamespace(config, envName, effectiveEnv);
   const deploymentName = sanitizeK8sName(config.project || 'app');
 
   function getKubectlEnv() {

package/src/deployment/providers/ssh.js

@@ -10,6 +10,7 @@ import {
   getNginxConfDPath,
   resolveNginxSiteName,
 } from '../../utils/nginx.js';
+import { resolvePm2AppName } from '../../utils/pm2-app-name.js';
 import { shellQuote, formatRemoteCommandFailure } from '../../utils/shell-quote.js';
 
 /** @type {Set<string>} */
@@ -44,8 +45,8 @@ export function createSshProvider(config, envName, env = process.env) {
     settings.frontendDeployPath || deployPath;
   const backendDeployPath =
     settings.backendDeployPath || deployPath;
-  const appName =
-    settings.appName || env.SSH_APP_NAME || config.project;
+  // Env-scoped like Nginx site names — same-host multi-env must not share one PM2 name.
+  const appName = resolvePm2AppName(config, envName, env);
   const port = settings.port || config.port || Number(env.SSH_PORT) || 3000;
   const sshKey = env.SSH_KEY;
   const keyPath = settings.keyPath || env.SSH_KEY_PATH;
@@ -133,6 +134,58 @@ export function createSshProvider(config, envName, env = process.env) {
     );
   }
 
+  /**
+   * Stop a previously managed non-PM2 backend for THIS env only.
+   *
+   * PID-file kill is gated: we only signal a PID if /proc shows our
+   * DEPLOYHUB_APP / deployhub.app marker in cmdline or environ. A stale PID
+   * reused by an unrelated process is left alone (file still removed).
+   * Marker-based pkill remains the primary stop for live processes.
+   *
+   * @param {import('node-ssh').NodeSSH} ssh
+   * @param {string} targetPath
+   */
+  async function stopScopedBackendProcess(ssh, targetPath) {
+    const pidFile = `${targetPath}/.deployhub.pid`;
+    const markerEnv = `DEPLOYHUB_APP=${appName}`;
+    const markerJvm = `deployhub.app=${appName}`;
+    // Verify-then-kill: only signal a PID if /proc shows our marker in cmdline
+    // or environ. A stale PID reused by an unrelated process is left alone
+    // (the pidfile is still removed so the next start writes a fresh one).
+    await exec(
+      ssh,
+      `if [ -f ${sh(pidFile)} ]; then ` +
+        `pid="$(cat ${sh(pidFile)} 2>/dev/null | tr -cd '0-9')"; ` +
+        `if [ -n "$pid" ] && [ -r "/proc/$pid/cmdline" ]; then ` +
+          `if tr '\\0' ' ' < "/proc/$pid/cmdline" 2>/dev/null | grep -q -F ${sh(markerEnv)} ` +
+          `|| tr '\\0' ' ' < "/proc/$pid/cmdline" 2>/dev/null | grep -q -F ${sh(markerJvm)} ` +
+          `|| { [ -r "/proc/$pid/environ" ] && tr '\\0' ' ' < "/proc/$pid/environ" 2>/dev/null | grep -q -F ${sh(markerEnv)}; }; then ` +
+            `kill "$pid" 2>/dev/null || true; ` +
+          `fi; ` +
+        `fi; ` +
+        `rm -f ${sh(pidFile)}; ` +
+      `fi`
+    );
+    // Marker match — covers lost PID files / processes without a readable pidfile.
+    await exec(ssh, `pkill -f ${sh(markerEnv)} || true`);
+    await exec(ssh, `pkill -f ${sh(markerJvm)} || true`);
+  }
+
+  /**
+   * Start a nohup process with DEPLOYHUB_APP marker and write PID file.
+   * @param {import('node-ssh').NodeSSH} ssh
+   * @param {string} targetPath
+   * @param {string} command — command body after `nohup` (no trailing &)
+   */
+  async function startScopedNohup(ssh, targetPath, command) {
+    const pidFile = `${targetPath}/.deployhub.pid`;
+    const dir = sh(targetPath);
+    await exec(
+      ssh,
+      `cd ${dir} && DEPLOYHUB_APP=${sh(appName)} nohup ${command} > app.log 2>&1 & echo $! > ${sh(pidFile)}`
+    );
+  }
+
   /**
    * @param {import('node-ssh').NodeSSH} ssh
    * @param {string} targetPath
@@ -141,6 +194,7 @@ export function createSshProvider(config, envName, env = process.env) {
     const framework = resolveFramework();
     const startCommand = resolveStartCommand();
     const dir = sh(targetPath);
+    const pidFile = `${targetPath}/.deployhub.pid`;
 
     if (NODE_FRAMEWORKS.has(framework)) {
       await exec(ssh, `cd ${dir} && npm install --production`);
@@ -172,25 +226,28 @@ export function createSshProvider(config, envName, env = process.env) {
       if (framework === 'django') {
         await exec(ssh, `cd ${dir} && python manage.py migrate`);
       }
+      await stopScopedBackendProcess(ssh, targetPath);
       if (framework === 'fastapi') {
-        await exec(ssh, 'pkill uvicorn || true');
-        await exec(
+        await startScopedNohup(
           ssh,
-          `cd ${dir} && nohup uvicorn main:app --host 0.0.0.0 --port ${port} > app.log 2>&1 &`
+          targetPath,
+          `uvicorn main:app --host 0.0.0.0 --port ${port}`
         );
       } else {
-        await exec(ssh, 'pkill gunicorn || true');
+        // gunicorn --daemon writes its own PID; still set DEPLOYHUB_APP for pkill fallback.
         const appTarget =
           framework === 'django' ? 'config.wsgi:application' : 'app:app';
         await exec(
           ssh,
-          `cd ${dir} && nohup gunicorn ${appTarget} --bind 0.0.0.0:${port} --daemon`
+          `cd ${dir} && DEPLOYHUB_APP=${sh(appName)} gunicorn ${appTarget} --name ${sh(`deployhub-${appName}`)} --bind 0.0.0.0:${port} --pid ${sh(pidFile)} --daemon`
         );
       }
       return;
     }
 
     if (PHP_FRAMEWORKS.has(framework)) {
+      // PHP uses a host-wide `systemctl restart php*-fpm` (see README PHP warning).
+      // Per-env isolation is Nginx site name + deploy path — not automated FPM pools.
       await exec(ssh, `cd ${dir} && composer install --no-dev`);
       if (framework === 'laravel') {
         await exec(ssh, `cd ${dir} && php artisan migrate --force`);
@@ -202,40 +259,36 @@ export function createSshProvider(config, envName, env = process.env) {
     }
 
     if (framework === 'spring' || framework === 'java') {
-      await exec(ssh, `cd ${dir} && pkill -f "*.jar" || true`);
-      await exec(
+      await stopScopedBackendProcess(ssh, targetPath);
+      // -Ddeployhub.app= embeds the env-scoped identity in the JVM command line
+      // so pkill -f DEPLOYHUB_APP=… and the PID file both target only this env.
+      await startScopedNohup(
         ssh,
-        `cd ${dir} && nohup java -jar target/*.jar > app.log 2>&1 &`
+        targetPath,
+        `java -Ddeployhub.app=${appName} -jar target/*.jar`
       );
       return;
     }
 
     if (framework === 'go') {
-      await exec(ssh, `cd ${dir} && pkill ${sh(appName)} || true`);
-      await exec(
-        ssh,
-        `cd ${dir} && nohup ./bin/app > app.log 2>&1 &`
-      );
+      await stopScopedBackendProcess(ssh, targetPath);
+      // Binary is always ./bin/app — must NOT pkill by appName alone (that never
+      // matched the process) and must NOT pkill a bare "app" (cross-env collision).
+      await startScopedNohup(ssh, targetPath, './bin/app');
       return;
     }
 
     if (framework === 'dotnet') {
-      await exec(ssh, `cd ${dir} && pkill -f "dotnet" || true`);
+      await stopScopedBackendProcess(ssh, targetPath);
       const dll = startCommand?.replace('dotnet ', '') || 'App.dll';
-      await exec(
-        ssh,
-        `cd ${dir} && nohup dotnet ${dll} > app.log 2>&1 &`
-      );
+      await startScopedNohup(ssh, targetPath, `dotnet ${dll}`);
       return;
     }
 
     if (framework === 'rails') {
       await exec(ssh, `cd ${dir} && bundle install --deployment`);
-      await exec(ssh, `cd ${dir} && pkill puma || true`);
-      await exec(
-        ssh,
-        `cd ${dir} && nohup bundle exec puma -p ${port} > app.log 2>&1 &`
-      );
+      await stopScopedBackendProcess(ssh, targetPath);
+      await startScopedNohup(ssh, targetPath, `bundle exec puma -p ${port}`);
       return;
     }
 

package/src/utils/docker-container-name.js

@@ -0,0 +1,51 @@
+import { isGrandfatheredNginxEnv } from './nginx.js';
+
+/**
+ * Sanitize a Docker container name (alphanumeric, underscore, hyphen, period).
+ * @param {string} name
+ * @returns {string}
+ */
+export function sanitizeDockerContainerName(name) {
+  return String(name || 'app')
+    .replace(/[^a-zA-Z0-9_.-]/g, '-')
+    .replace(/^[^a-zA-Z0-9]/, 'a');
+}
+
+/**
+ * Whether this env is the grandfathered / single-env case for container naming.
+ * Reuses the same grandfather rule as Nginx / PM2.
+ *
+ * @param {import('../core/config.js').DeployHubConfig} config
+ * @param {string} envName
+ * @returns {boolean}
+ */
+export function isGrandfatheredDockerContainerEnv(config, envName) {
+  return isGrandfatheredNginxEnv(config, envName);
+}
+
+/**
+ * Resolve the Docker container `--name` for an environment.
+ *
+ * Same risk class as PM2 process names: two docker envs targeting the same
+ * daemon with `docker run --name ${project}` will `docker rm -f` each other.
+ *
+ * - Grandfathered / single-env: `config.project` (unchanged).
+ * - Additional envs: `{project}-{env}`.
+ *
+ * @param {import('../core/config.js').DeployHubConfig} config
+ * @param {string} envName
+ * @returns {string}
+ */
+export function resolveDockerContainerName(config, envName) {
+  const project = sanitizeDockerContainerName(config.project || 'app');
+  if (isGrandfatheredDockerContainerEnv(config, envName)) {
+    return project;
+  }
+  return `${project}-${sanitizeDockerContainerName(envName)}`;
+}
+
+export default {
+  sanitizeDockerContainerName,
+  isGrandfatheredDockerContainerEnv,
+  resolveDockerContainerName,
+};

package/src/utils/kube-namespace-name.js

@@ -0,0 +1,63 @@
+import { isGrandfatheredNginxEnv } from './nginx.js';
+import { getEnvSettings } from '../core/environments.js';
+import { sanitizeK8sName } from './kubernetes-manifests.js';
+
+/**
+ * Whether this env is the grandfathered / single-env case for namespace naming.
+ * @param {import('../core/config.js').DeployHubConfig} config
+ * @param {string} envName
+ * @returns {boolean}
+ */
+export function isGrandfatheredKubeNamespaceEnv(config, envName) {
+  return isGrandfatheredNginxEnv(config, envName);
+}
+
+/**
+ * Resolve the Kubernetes namespace for an environment.
+ *
+ * Deployment *names* stay project-scoped (safe when namespaces differ). Two
+ * environments targeting the same cluster with the same namespace WILL collide
+ * on Deployment/Service objects — same risk class as PM2/Nginx on one host.
+ *
+ * - Grandfathered / single-env: settings.kubeNamespace || KUBE_NAMESPACE || project
+ *   (unchanged).
+ * - Additional envs: if configured namespace is missing or equals the project /
+ *   grandfathered namespace, auto-scope to `{project}-{env}`. An explicitly
+ *   distinct namespace is kept.
+ *
+ * @param {import('../core/config.js').DeployHubConfig} config
+ * @param {string} envName
+ * @param {Record<string, string|undefined>} [env] — already secret-overlaid
+ * @returns {string}
+ */
+export function resolveKubeNamespace(config, envName, env = process.env) {
+  const project = sanitizeK8sName(config.project || 'app');
+  const settings = getEnvSettings(config.environments?.[envName]);
+  const configured = String(
+    settings.kubeNamespace || env.KUBE_NAMESPACE || ''
+  ).trim();
+
+  if (isGrandfatheredKubeNamespaceEnv(config, envName)) {
+    return sanitizeK8sName(configured || project);
+  }
+
+  const grandfather =
+    config.unprefixedSecretEnvironment || config.defaultEnvironment || null;
+  let grandfatherNs = project;
+  if (grandfather && config.environments?.[grandfather]) {
+    const gfSettings = getEnvSettings(config.environments[grandfather]);
+    grandfatherNs = sanitizeK8sName(gfSettings.kubeNamespace || project);
+  }
+
+  const defaults = new Set([project, 'default', grandfatherNs]);
+  if (configured && !defaults.has(sanitizeK8sName(configured))) {
+    return sanitizeK8sName(configured);
+  }
+
+  return sanitizeK8sName(`${project}-${envName}`);
+}
+
+export default {
+  isGrandfatheredKubeNamespaceEnv,
+  resolveKubeNamespace,
+};

package/src/utils/pm2-app-name.js

@@ -0,0 +1,71 @@
+import { isGrandfatheredNginxEnv } from './nginx.js';
+import { getEnvSettings } from '../core/environments.js';
+
+/**
+ * Sanitize a name for PM2 process naming (same charset as Nginx site names).
+ * @param {string} name
+ * @returns {string}
+ */
+export function sanitizePm2AppName(name) {
+  return String(name || 'app').replace(/[^a-zA-Z0-9_-]/g, '-');
+}
+
+/**
+ * Whether this env is the grandfathered / single-env case for process naming.
+ * Reuses the same grandfather rule as Nginx site filenames.
+ *
+ * @param {import('../core/config.js').DeployHubConfig} config
+ * @param {string} envName
+ * @returns {boolean}
+ */
+export function isGrandfatheredPm2Env(config, envName) {
+  return isGrandfatheredNginxEnv(config, envName);
+}
+
+/**
+ * Resolve the PM2 process name for an environment.
+ *
+ * Same risk class as Nginx site filenames: two backend envs on one host with
+ * the same PM2 name will restart/replace each other's process.
+ *
+ * - Grandfathered / single-env: `settings.appName` || `SSH_APP_NAME` || `project`
+ *   (unchanged — existing single-env PM2 processes keep their name).
+ * - Additional envs: auto-scope to `{project}-{env}` when the configured name
+ *   is missing, equals the project default, or collides with the grandfathered
+ *   env's resolved name. An explicitly distinct `appName` / `SSH_APP_NAME` is kept.
+ *
+ * @param {import('../core/config.js').DeployHubConfig} config
+ * @param {string} envName
+ * @param {Record<string, string|undefined>} [env] — already secret-overlaid for this env
+ * @returns {string}
+ */
+export function resolvePm2AppName(config, envName, env = process.env) {
+  const project = sanitizePm2AppName(config.project || 'app');
+  const settings = getEnvSettings(config.environments?.[envName]);
+  const configured = (settings.appName || env.SSH_APP_NAME || '').trim();
+
+  if (isGrandfatheredPm2Env(config, envName)) {
+    return sanitizePm2AppName(configured || project);
+  }
+
+  const grandfather =
+    config.unprefixedSecretEnvironment || config.defaultEnvironment || null;
+  let grandfatherName = project;
+  if (grandfather && config.environments?.[grandfather]) {
+    const gfSettings = getEnvSettings(config.environments[grandfather]);
+    grandfatherName = sanitizePm2AppName(gfSettings.appName || project);
+  }
+
+  const defaults = new Set([project, `${project}-api`, grandfatherName]);
+  if (configured && !defaults.has(sanitizePm2AppName(configured))) {
+    return sanitizePm2AppName(configured);
+  }
+
+  return `${project}-${sanitizePm2AppName(envName)}`;
+}
+
+export default {
+  sanitizePm2AppName,
+  isGrandfatheredPm2Env,
+  resolvePm2AppName,
+};