openship 0.6.6 → 0.6.7

package/dist/{chunk-2YM3NI2E.js → chunk-GIPJNNI5.js}

@@ -5,12 +5,22 @@ const require = __ospCreateRequire(import.meta.url);
 import {
   describeProcess,
   probeListeningPort,
-  tryExec,
   waitForPortFree
-} from "./chunk-SM26HDS2.js";
+} from "./chunk-VSTFHUCV.js";
 import {
-  AppError
-} from "./chunk-UJ6JZM65.js";
+  EDGE_CONTAINER_NAME,
+  classifyProxy,
+  describeContainerById,
+  isOurEdgeContainer,
+  mayStopUnitForEdgeTakeover,
+  resolveContainerPublishingPort,
+  stopContainerDurably,
+  tryExec
+} from "./chunk-UWEV6XTS.js";
+import {
+  AppError,
+  shellQuote
+} from "./chunk-2VSW6Q6C.js";
 
 // ../../packages/adapters/src/system/proxy/detect.ts
 var EDGE_PORTS = [80, 443];
@@ -34,23 +44,7 @@ var EdgeMigrateRequested = class extends Error {
     this.name = "EdgeMigrateRequested";
   }
 };
-function classifyProxy(text) {
-  if (!text) return void 0;
-  const t = text.toLowerCase();
-  if (t.includes("openresty")) return "openresty";
-  if (/(^|[\s/:])nginx/.test(t)) return "nginx";
-  if (/(^|[\s/:])caddy/.test(t)) return "caddy";
-  if (/(apache2|httpd)/.test(t)) return "apache";
-  if (/(^|[\s/:])traefik/.test(t)) return "traefik";
-  if (/(^|[\s/:])haproxy/.test(t)) return "haproxy";
-  return void 0;
-}
-function sq(value) {
-  return `'${value.replace(/'/g, "'\\''")}'`;
-}
-function isOurEdgeContainer(name, image) {
-  return /openship-edge/i.test(`${name ?? ""} ${image ?? ""}`);
-}
+var sq = shellQuote;
 function vhostLog(message, level = "info") {
   return { timestamp: (/* @__PURE__ */ new Date()).toISOString(), message, level };
 }
@@ -115,7 +109,6 @@ function edgeFailureReason(containerLog) {
   if (emerg) return emerg.replace(/^.*\[emerg\]\s*\d*#\d*:\s*/, "");
   return null;
 }
-var EDGE_CONTAINER_NAME = "openship-edge";
 async function ourEdgeContainerRunning(executor) {
   return Boolean(await resolveOurEdgeContainer(executor));
 }
@@ -172,15 +165,9 @@ async function probeOurEdgeContainer(executor) {
   return null;
 }
 async function detectDockerOnPort(executor, port) {
-  const out = await tryExec(
-    executor,
-    `docker ps --filter publish=${port} --format '{{.Names}}	{{.Image}}' 2>/dev/null | head -1`
-  );
-  const line = out?.trim();
-  if (!line) return null;
-  const [name, image] = line.split("	");
-  if (!name) return null;
-  return { name, image: image ?? "" };
+  const onPort = await resolveContainerPublishingPort(executor, port);
+  const container = onPort.kind === "one" ? onPort.container : onPort.kind === "ambiguous" ? onPort.containers[0] : null;
+  return container ? { id: container.id, name: container.name, image: container.image } : null;
 }
 var WORKER_RE = /\b(?:nginx|openresty)\s*:\s*worker process/i;
 var MASTER_RE = /\b(?:nginx|openresty)\s*:\s*master process/i;
@@ -203,10 +190,11 @@ async function probeEdgePort(executor, port, ours) {
   const listener = await resolveProxyMaster(executor, await probeListeningPort(executor, port));
   const docker = await detectDockerOnPort(executor, port);
   if (!listener && !docker) return null;
+  const cgroupContainer = !docker && listener?.containerId ? await describeContainerById(executor, listener.containerId) : null;
   const proxy = classifyProxy(
     [
-      docker?.image,
-      docker?.name,
+      docker?.image ?? cgroupContainer?.image,
+      docker?.name ?? cgroupContainer?.name,
       listener?.rawCommand,
       listener?.command,
       listener?.systemdUnit
@@ -221,8 +209,12 @@ async function probeEdgePort(executor, port, ours) {
     rawCommand: listener?.rawCommand,
     systemdUnit: listener?.systemdUnit,
     systemdDescription: listener?.systemdDescription,
-    isDocker: Boolean(docker),
-    containerName: docker?.name,
+    isDocker: Boolean(docker) || Boolean(listener?.dockerPublished) || Boolean(listener?.containerId),
+    containerName: docker?.name ?? cgroupContainer?.name,
+    // Without a container the takeover falls through to `kill -9` on a process INSIDE
+    // somebody's container, which frees nothing durably.
+    containerId: docker?.id ?? listener?.containerId,
+    dockerPublished: listener?.dockerPublished,
     proxy,
     managedByOpenship
   };
@@ -251,14 +243,18 @@ function stopTargetsForStatus(status) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   for (const o of status.occupants) {
-    const identity = o.systemdUnit ?? o.containerName ?? (o.pid ? `pid:${o.pid}` : `port:${o.port}`);
+    const identity = o.containerName ?? o.containerId ?? o.systemdUnit ?? (o.pid ? `pid:${o.pid}` : `port:${o.port}`);
     if (seen.has(identity)) continue;
     seen.add(identity);
     out.push({
       port: o.port,
       unit: o.systemdUnit,
-      pid: o.pid,
-      container: o.containerName,
+      // A forwarder's pid is dockerd's, not the workload's: killing it severs a live
+      // container's port mapping and frees nothing durably. With no container resolved
+      // there is nothing here to stop, and freeEdgeTargets reports the port still bound
+      // rather than claiming a takeover that did not happen.
+      pid: o.dockerPublished && !o.containerName && !o.containerId ? void 0 : o.pid,
+      container: o.containerName ?? o.containerId,
       // Prefer the proxy kind over the raw cmdline — `nginx (PID 123)` reads
       // better in "Stopping …" than `nginx: master process /usr/sbin/nginx …`.
       label: o.proxy && o.pid ? `${o.proxy} (PID ${o.pid})` : o.command
@@ -271,14 +267,15 @@ async function freeEdgeTargets(executor, targets, onLog, opts = {}) {
     const where = t.port ? ` (port ${t.port})` : "";
     if (t.container) {
       onLog(`Stopping container ${t.container}${where}...`, "warn");
-      await tryExec(executor, `docker update --restart=no ${sq(t.container)} 2>/dev/null || true`);
-      await tryExec(executor, `docker stop ${sq(t.container)} 2>/dev/null || true`);
-    } else if (t.unit) {
+      await stopContainerDurably(executor, t.container);
+    } else if (t.unit && mayStopUnitForEdgeTakeover(t.unit)) {
       onLog(`Stopping & disabling service ${t.unit}${where}...`, "warn");
       await tryExec(
         executor,
         `systemctl disable --now ${sq(t.unit)} 2>/dev/null || systemctl stop ${sq(t.unit)} 2>/dev/null || true; systemctl reset-failed ${sq(t.unit)} 2>/dev/null || true`
       );
+    } else if (t.unit) {
+      onLog(`Refusing to stop ${t.unit}${where} \u2014 free that port manually.`, "error");
     } else if (t.pid) {
       onLog(`Stopping ${t.label ?? `process ${t.pid}`}${where}...`, "warn");
       await tryExec(executor, `kill ${t.pid} 2>/dev/null || true`);
@@ -307,14 +304,11 @@ async function freeEdgeTargets(executor, targets, onLog, opts = {}) {
 export {
   EdgeConflictError,
   EdgeMigrateRequested,
-  classifyProxy,
   sq,
-  isOurEdgeContainer,
   sanitizeEdgeVhosts,
   edgeIsBroken,
   edgeCrashReason,
   edgeFailureReason,
-  EDGE_CONTAINER_NAME,
   ourEdgeContainerRunning,
   invalidateEdgeContainer,
   resolveOurEdgeContainer,

package/dist/{chunk-ZFJXPCQP.js → chunk-H3WT3A6R.js}

@@ -2,6 +2,9 @@
 ":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
+import {
+  shellQuote
+} from "./chunk-2VSW6Q6C.js";
 
 // ../../packages/adapters/src/system/local-shell.ts
 import { execFile } from "child_process";
@@ -28,9 +31,7 @@ var LOCAL_BUILD_ENV_KEYS = [
   "XDG_CACHE_HOME",
   "XDG_DATA_HOME"
 ];
-function sq(value) {
-  return `'${value.replace(/'/g, "'\\''")}'`;
-}
+var sq = shellQuote;
 function logEntry(message, level = "info", rawData) {
   return { timestamp: (/* @__PURE__ */ new Date()).toISOString(), message, level, ...rawData ? { rawData } : {} };
 }