unitup 0.2.0 → 0.3.0

package/src/platform/macos.js

@@ -13,6 +13,7 @@ import {
   deleteAppMetadata,
   formatRelativeTime,
   getAppsDir,
+  getUnitupBinPath,
   getUnitupDir,
   readAppMetadata,
   sanitizeServiceName,
@@ -175,7 +176,9 @@ export class MacOSAdapter extends ServiceAdapter {
     const safeName = sanitizeServiceName(config.name);
     const label = this.getLabel(safeName);
 
-    const programArguments = [config.command, ...(config.args || [])];
+    const programArguments = config.deploy?.zeroDowntime
+      ? [process.execPath, getUnitupBinPath(), 'supervisor', safeName]
+      : [config.command, ...(config.args || [])];
 
     // Ensure log directory exists
     const stdoutLog = config.logs?.stdout || path.join(getUnitupDir(), 'logs', `${safeName}.log`);

package/src/platform/windows.js

@@ -14,6 +14,7 @@ import {
   deleteAppMetadata,
   formatRelativeTime,
   getAppsDir,
+  getUnitupBinPath,
   getUnitupDir,
   readAppMetadata,
   sanitizeServiceName,
@@ -75,7 +76,9 @@ export class WindowsAdapter extends ServiceAdapter {
     const safeName = sanitizeServiceName(config.name);
     const serviceName = this.getServiceName(safeName);
     const nodeExec = process.execPath;
-    const binPath = `"${nodeExec}" "${WINDOWS_HOST_PATH}" "${safeName}"`;
+    const hostScript = config.deploy?.zeroDowntime ? getUnitupBinPath() : WINDOWS_HOST_PATH;
+    const hostArg = config.deploy?.zeroDowntime ? `supervisor "${safeName}"` : `"${safeName}"`;
+    const binPath = `"${nodeExec}" "${hostScript}" ${hostArg}`;
     const startType = config.autostart !== false ? 'auto' : 'demand';
 
     return {

package/src/service/config.js

@@ -48,6 +48,14 @@ export function mergeConfigWithOptions(opts = {}) {
     memoryHigh: opts.memoryHigh || projectCfg?.resources?.memoryHigh || projectCfg?.memoryHigh || '',
     memoryMax: opts.memoryMax || projectCfg?.resources?.memoryMax || projectCfg?.memoryMax || '',
     memorySwapMax: opts.memorySwapMax || projectCfg?.resources?.memorySwapMax || projectCfg?.memorySwapMax || '',
+    port: opts.port !== undefined ? opts.port : projectCfg.port,
+    deploy: {
+      ...(projectCfg.deploy && typeof projectCfg.deploy === 'object' ? projectCfg.deploy : {}),
+      ...(opts.deploy && typeof opts.deploy === 'object' ? opts.deploy : {}),
+      ...(opts.zeroDowntime !== undefined ? { zeroDowntime: !!opts.zeroDowntime } : {}),
+      ...(opts.ready !== undefined ? { ready: opts.ready } : {}),
+      ...(opts.drain !== undefined ? { drain: opts.drain } : {})
+    },
     ...opts,
     env: { ...(projectCfg.env || {}), ...(opts.env || {}) },
     cwd: targetCwd

package/src/service/normalize.js

@@ -2,7 +2,13 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { ExecutableNotFoundError, InvalidServiceConfigError } from '../errors.js';
 import { detectRuntime, resolveRuntimeConfig } from '../runtimes/index.js';
-import { getUnitupDir, resolveEffectiveMemoryLimits, resolveWorkingDirectory, sanitizeServiceName } from '../utils.js';
+import {
+  getUnitupDir,
+  parseDurationMs,
+  resolveEffectiveMemoryLimits,
+  resolveWorkingDirectory,
+  sanitizeServiceName
+} from '../utils.js';
 
 /**
  * Resolves a binary or command name to an absolute executable path.
@@ -187,6 +193,27 @@ export async function normalizeServiceConfig(rawOpts = {}) {
   // Memory and resource limits
   const resources = resolveEffectiveMemoryLimits(rawOpts);
 
+  // Port and Deploy normalization
+  const port =
+    rawOpts.port !== undefined && rawOpts.port !== null && rawOpts.port !== '' ? Number(rawOpts.port) : undefined;
+
+  const rawDeploy = rawOpts.deploy && typeof rawOpts.deploy === 'object' ? rawOpts.deploy : {};
+  const zeroDowntime = !!(rawOpts.deploy === true || rawDeploy.zeroDowntime || rawOpts.zeroDowntime);
+  const readyPath =
+    typeof rawDeploy.ready === 'string'
+      ? rawDeploy.ready
+      : typeof rawOpts.ready === 'string'
+        ? rawOpts.ready
+        : undefined;
+  const drainRaw = rawDeploy.drain !== undefined ? rawDeploy.drain : rawOpts.drain;
+  const drainTimeout = drainRaw !== undefined ? parseDurationMs(drainRaw) : 10000;
+  const deploy = {
+    zeroDowntime,
+    ready: readyPath,
+    drain: drainRaw,
+    drainTimeout
+  };
+
   return {
     name,
     displayName,
@@ -196,6 +223,8 @@ export async function normalizeServiceConfig(rawOpts = {}) {
     args,
     script: rawOpts.script ? path.resolve(cwd, rawOpts.script) : undefined,
     cwd,
+    port,
+    deploy,
     env,
     envFile: rawOpts.envFile ? path.resolve(cwd, rawOpts.envFile) : undefined,
     autostart,

package/src/unit.js

@@ -9,6 +9,7 @@ import {
   getServiceNameFromUnit,
   getTimerFilename,
   getUnitFilename,
+  getUnitupBinPath,
   resolveAbsolutePath,
   resolveEffectiveMemoryLimits,
   resolveWorkingDirectory,
@@ -73,7 +74,10 @@ export function generateUnitContent(opts) {
   let commandExec = '';
   let execArgs = [];
 
-  if (opts.command) {
+  if (opts.deploy?.zeroDowntime) {
+    commandExec = process.execPath;
+    execArgs = [getUnitupBinPath(), 'supervisor', safeName];
+  } else if (opts.command) {
     commandExec = resolveAbsolutePath(opts.command);
     execArgs = Array.isArray(opts.args) ? [...opts.args] : [];
   } else if (opts.script) {

package/src/utils.js

@@ -1,6 +1,16 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+/**
+ * Returns the absolute path to the unitup CLI binary.
+ * @returns {string}
+ */
+export function getUnitupBinPath() {
+  const currentDir = path.dirname(fileURLToPath(import.meta.url));
+  return path.resolve(currentDir, '../bin/unitup.js');
+}
 
 /**
  * Returns the base unitup config directory (~/.config/unitup).
@@ -170,6 +180,8 @@ export function saveAppMetadata(meta) {
     args,
     cwd,
     group: meta.group || 'default',
+    ...(meta.port !== undefined ? { port: meta.port } : {}),
+    ...(meta.deploy ? { deploy: meta.deploy } : {}),
     // Optional resources section
     ...(Object.keys(resources).length > 0 ? { resources } : {}),
     // Backward compatibility fields
@@ -415,6 +427,32 @@ export function formatRelativeTime(timestamp) {
   return `${days} day${days === 1 ? '' : 's'} ago`;
 }
 
+/**
+ * Formats duration in milliseconds into a concise human-readable string (e.g. "23s", "2 mins", "3 hours", "2 days").
+ *
+ * @param {number} ms
+ * @returns {string}
+ */
+export function formatDuration(ms) {
+  if (typeof ms !== 'number' || isNaN(ms) || ms < 0) {
+    return '-';
+  }
+  const seconds = Math.floor(ms / 1000);
+  if (seconds < 60) {
+    return `${seconds}s`;
+  }
+  const minutes = Math.floor(seconds / 60);
+  if (minutes < 60) {
+    return `${minutes} min${minutes === 1 ? '' : 's'}`;
+  }
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) {
+    return `${hours} hour${hours === 1 ? '' : 's'}`;
+  }
+  const days = Math.floor(hours / 24);
+  return `${days} day${days === 1 ? '' : 's'}`;
+}
+
 /**
  * Formats data rows into a text table.
  *
@@ -603,6 +641,48 @@ export function validateDuration(val, paramName = 'Duration') {
   return str;
 }
 
+/**
+ * Parses a duration string (e.g. '30s', '500ms', '1m') into milliseconds.
+ * @param {string|number} val
+ * @param {number} [defaultMs=10000]
+ * @returns {number}
+ */
+export function parseDurationMs(val, defaultMs = 10000) {
+  if (typeof val === 'number') return val;
+  if (!val || typeof val !== 'string') return defaultMs;
+  const str = val.trim().toLowerCase();
+  const match = str.match(/^(\d+(?:\.\d+)?)\s*(ms|msec|s|sec|seconds?|m|min|minutes?|h|hr|hours?|d|day|days?)?$/);
+  if (!match) return defaultMs;
+  const num = Number.parseFloat(match[1]);
+  const unit = match[2] || 's';
+  switch (unit) {
+    case 'ms':
+    case 'msec':
+      return num;
+    case 's':
+    case 'sec':
+    case 'second':
+    case 'seconds':
+      return num * 1000;
+    case 'm':
+    case 'min':
+    case 'minute':
+    case 'minutes':
+      return num * 60 * 1000;
+    case 'h':
+    case 'hr':
+    case 'hour':
+    case 'hours':
+      return num * 60 * 60 * 1000;
+    case 'd':
+    case 'day':
+    case 'days':
+      return num * 24 * 60 * 60 * 1000;
+    default:
+      return num * 1000;
+  }
+}
+
 /**
  * Formats a future date/timestamp into relative human readable string (e.g. "in 12 minutes", "tomorrow").
  * @param {string|number|Date} dateVal