openship 0.4.5 → 0.4.7

package/dist/{chunk-PARRPUXN.js → chunk-IXCHURVK.js}

@@ -1,10 +1,12 @@
+#!/usr/bin/env sh
+":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   decorateServiceException,
   normalizeProvider as normalizeProvider2,
   setCredentialFeature
-} from "./chunk-65KKUJBR.js";
+} from "./chunk-VWPEKOH6.js";
 import {
   HttpRequest,
   HttpResponse,
@@ -15,14 +17,14 @@ import {
   getSmithyContext,
   normalizeProvider,
   toEndpointV1
-} from "./chunk-GHXGCANU.js";
+} from "./chunk-W73X43R7.js";
 import {
   fromHex,
   fromUtf8,
   isArrayBuffer,
   toHex,
   toUint8Array
-} from "./chunk-YJAS5RQX.js";
+} from "./chunk-JYGD5WSN.js";
 
 // ../../node_modules/@smithy/core/dist-es/submodules/schema/schemas/operation.js
 var operation = (namespace, name, traits, input, output) => ({

package/dist/{chunk-YJAS5RQX.js → chunk-JYGD5WSN.js}

@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 

package/dist/{chunk-JWBXYO24.js → chunk-KI2EY3WB.js}

@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 var __create = Object.create;

package/dist/{chunk-YVXF6GGR.js → chunk-L2VOGB2X.js}

@@ -1,112 +1,15 @@
+#!/usr/bin/env sh
+":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   formatDuration,
   isRemoteConnectionError,
   systemDebug
-} from "./chunk-JYAGTMSJ.js";
+} from "./chunk-RPHRPFEH.js";
 import {
   safeErrorMessage
-} from "./chunk-3LCRNQ2C.js";
-
-// ../../packages/adapters/src/system/port-listen.ts
-var PROC_NET_TCP_CMD = "cat /proc/net/tcp 2>/dev/null; cat /proc/net/tcp6 2>/dev/null; true";
-var TCP_LISTEN = "0A";
-function parseListeningPorts(procText) {
-  const ports = /* @__PURE__ */ new Set();
-  for (const rawLine of procText.split("\n")) {
-    const line = rawLine.trim();
-    if (!line) continue;
-    const fields = line.split(/\s+/);
-    if (fields.length < 4) continue;
-    if (fields[3] !== TCP_LISTEN) continue;
-    const local = fields[1];
-    const colon = local.lastIndexOf(":");
-    if (colon === -1) continue;
-    const hexPort = local.slice(colon + 1);
-    if (!/^[0-9A-Fa-f]{1,4}$/.test(hexPort)) continue;
-    const port = parseInt(hexPort, 16);
-    if (port > 0) ports.add(port);
-  }
-  return ports;
-}
-async function probePortListeningOnce(executor, port) {
-  try {
-    const out = await executor.exec(PROC_NET_TCP_CMD, { timeout: 5e3 });
-    return parseListeningPorts(out).has(port);
-  } catch {
-    return null;
-  }
-}
-
-// ../../packages/adapters/src/runtime/port-conflict.ts
-async function tryExec(executor, command) {
-  try {
-    return await executor.exec(command);
-  } catch {
-    return null;
-  }
-}
-async function resolveSystemdUnit(executor, pid) {
-  const cgroup = await tryExec(executor, `cat /proc/${pid}/cgroup 2>/dev/null || true`);
-  const unitMatch = cgroup?.match(/(?:^|\/)([^/\n]+\.service)(?:$|\n|\/)/m) ?? cgroup?.match(/(?:^|\/)([^/\n]+\.service)(?:$|\n|\/)/m);
-  const systemdUnit = unitMatch?.[1]?.trim();
-  if (!systemdUnit || !/^[A-Za-z0-9@._:\\-]+\.service$/.test(systemdUnit)) {
-    return {};
-  }
-  const description = await tryExec(
-    executor,
-    `systemctl show ${systemdUnit} --property=Description --value 2>/dev/null || true`
-  );
-  const managedMatch = systemdUnit.match(/^openship-(.+)\.service$/);
-  return {
-    systemdUnit,
-    systemdDescription: description?.trim() || void 0,
-    deploymentId: managedMatch?.[1],
-    isManagedDeployment: Boolean(managedMatch)
-  };
-}
-async function resolveListener(executor, port) {
-  const out = await tryExec(
-    executor,
-    `ss -tlnp sport = :${port} 2>/dev/null | grep LISTEN || lsof -ti tcp:${port} -sTCP:LISTEN 2>/dev/null || true`
-  );
-  if (out) {
-    const ssMatch = out.match(/pid=(\d+)/);
-    const lsofMatch = !ssMatch ? out.match(/^\s*(\d+)\s*$/m) : null;
-    const pid = ssMatch ? parseInt(ssMatch[1], 10) : lsofMatch ? parseInt(lsofMatch[1], 10) : null;
-    if (pid) return { pid, occupied: true };
-  }
-  const listening = await probePortListeningOnce(executor, port);
-  return { pid: null, occupied: listening === true };
-}
-async function probeListeningPort(executor, port) {
-  try {
-    const { pid, occupied } = await resolveListener(executor, port);
-    if (!occupied) return null;
-    if (pid === null) return { pid: null, command: "unknown listener" };
-    return await describeProcess(executor, pid);
-  } catch {
-    return null;
-  }
-}
-async function describeProcess(executor, pid) {
-  let command = `PID ${pid}`;
-  let rawCommand;
-  const args = await tryExec(executor, `ps -p ${pid} -o args= 2>/dev/null || true`);
-  if (args?.trim()) {
-    rawCommand = args.trim();
-    command = `${rawCommand} (PID ${pid})`;
-  } else {
-    const cmd = await tryExec(executor, `ps -p ${pid} -o comm= 2>/dev/null || true`);
-    if (cmd?.trim()) {
-      rawCommand = cmd.trim();
-      command = `${rawCommand} (PID ${pid})`;
-    }
-  }
-  const systemd = await resolveSystemdUnit(executor, pid);
-  return { pid, command, rawCommand, ...systemd };
-}
+} from "./chunk-6APULWSU.js";
 
 // ../../packages/adapters/src/system/environment.ts
 var profileCache = /* @__PURE__ */ new WeakMap();
@@ -237,7 +140,5 @@ async function resolveEnvironment(executor) {
 }
 
 export {
-  resolveEnvironment,
-  probeListeningPort,
-  describeProcess
+  resolveEnvironment
 };

package/dist/{chunk-K5OH5U7N.js → chunk-MZ2WEHHY.js}

@@ -1,16 +1,18 @@
+#!/usr/bin/env sh
+":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   detectBuildKillHint,
   runBuildPipeline,
   transferLocalDirectory
-} from "./chunk-JXQCFTDV.js";
+} from "./chunk-4Z5QO7N6.js";
 import {
   LocalExecutor
-} from "./chunk-SYCZE6FQ.js";
+} from "./chunk-TYVME3XD.js";
 import {
   wrapLocalBuildCommand
-} from "./chunk-Z6EKX6CX.js";
+} from "./chunk-FPRHYBY2.js";
 
 // ../../packages/adapters/src/runtime/local-build.ts
 var LOCAL_BUILD_DIR = "/tmp/openship/.builds";

package/dist/{chunk-SJBR527P.js → chunk-O6ZZF52V.js}

@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
@@ -5,7 +7,7 @@ import {
   fromUtf8,
   toHex,
   toUtf8
-} from "./chunk-YJAS5RQX.js";
+} from "./chunk-JYGD5WSN.js";
 
 // ../../node_modules/tslib/tslib.es6.mjs
 function __awaiter(thisArg, _arguments, P, generator) {

package/dist/{chunk-VLPJLXXB.js → chunk-OWED2GRM.js}

@@ -1,9 +1,11 @@
+#!/usr/bin/env sh
+":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   HttpResponse,
   buildQueryString
-} from "./chunk-GHXGCANU.js";
+} from "./chunk-W73X43R7.js";
 
 // ../../node_modules/@smithy/node-http-handler/dist-es/build-abort-error.js
 function buildAbortError(abortSignal) {

package/dist/{chunk-C4FOQJ63.js → chunk-OXWDY22G.js}

@@ -1,12 +1,14 @@
+#!/usr/bin/env sh
+":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   isSshAuthError,
   systemDebug
-} from "./chunk-JYAGTMSJ.js";
+} from "./chunk-RPHRPFEH.js";
 import {
   PACKAGE_ROOT_ONLY_EXCLUDES
-} from "./chunk-3LCRNQ2C.js";
+} from "./chunk-6APULWSU.js";
 
 // ../../packages/adapters/src/archive.ts
 import { execFile } from "child_process";

package/dist/{chunk-NPVJYR7M.js → chunk-Q2CIRAOK.js}

@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 

package/dist/chunk-R5BHFFAV.js

@@ -0,0 +1,282 @@
+#!/usr/bin/env sh
+":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+import { createRequire as __ospCreateRequire } from "node:module";
+const require = __ospCreateRequire(import.meta.url);
+import {
+  describeProcess,
+  probeListeningPort
+} from "./chunk-ILFETZOM.js";
+import {
+  OPENRESTY_LUA_DIR
+} from "./chunk-VFINNTUL.js";
+import {
+  AppError
+} from "./chunk-6APULWSU.js";
+
+// ../../packages/adapters/src/system/proxy/detect.ts
+var EDGE_PORTS = [80, 443];
+var EdgeConflictError = class extends AppError {
+  constructor(status) {
+    super(
+      `Ports ${status.occupants.map((o) => o.port).join("/") || "80/443"} are in use by another service (${status.classification}). Accept a migrate or takeover to continue.`,
+      409,
+      "EDGE_CONFLICT"
+    );
+    this.status = status;
+    this.name = "EdgeConflictError";
+  }
+};
+var EdgeMigrateRequested = class extends Error {
+  constructor(status, sites, warnings = []) {
+    super("Edge migration requested by user");
+    this.status = status;
+    this.sites = sites;
+    this.warnings = warnings;
+    this.name = "EdgeMigrateRequested";
+  }
+};
+async function tryExec(executor, command) {
+  try {
+    return await executor.exec(command);
+  } catch {
+    return null;
+  }
+}
+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 ?? ""}`);
+}
+async function edgeIsServing(executor, port = 80) {
+  const running = await tryExec(
+    executor,
+    `docker inspect -f '{{.State.Running}}' ${sq(EDGE_CONTAINER_NAME)} 2>/dev/null`
+  );
+  if ((running ?? "").trim() !== "true") return false;
+  const probe = await tryExec(
+    executor,
+    containerShell(`wget -q -O /dev/null -T 3 http://127.0.0.1:${port}/ >/dev/null 2>&1; echo $?`)
+  );
+  const code = (probe ?? "").trim().split("\n").pop() ?? "1";
+  return code === "0" || code === "8";
+}
+function containerShell(command) {
+  return `docker exec ${sq(EDGE_CONTAINER_NAME)} sh -c ${sq(command)}`;
+}
+async function edgeCrashReason(executor) {
+  const logs = await tryExec(
+    executor,
+    `docker logs --tail 40 ${sq(EDGE_CONTAINER_NAME)} 2>&1`
+  );
+  return logs ? edgeFailureReason(logs) : null;
+}
+function edgeFailureReason(containerLog) {
+  const lines = containerLog.split("\n").map((l) => l.trim()).filter(Boolean);
+  const emerg = lines.find((l) => l.includes("[emerg]"));
+  if (emerg) return emerg.replace(/^.*\[emerg\]\s*\d*#\d*:\s*/, "");
+  return lines.at(-1) ?? null;
+}
+var EDGE_CONTAINER_NAME = "openship-edge";
+async function ourEdgeContainerRunning(executor) {
+  return Boolean(await resolveOurEdgeContainer(executor));
+}
+var EDGE_CONTAINER_TTL_MS = 2e4;
+var edgeContainerMemo = /* @__PURE__ */ new WeakMap();
+var edgeMemoGeneration = 0;
+function invalidateEdgeContainer(executor) {
+  if (executor) edgeContainerMemo.delete(executor);
+  else edgeMemoGeneration++;
+}
+async function resolveOurEdgeContainer(executor, opts) {
+  if (!opts?.fresh) {
+    const hit = edgeContainerMemo.get(executor);
+    if (hit && hit.generation === edgeMemoGeneration && Date.now() - hit.at < EDGE_CONTAINER_TTL_MS) {
+      return hit.value;
+    }
+  }
+  const resolved = await probeOurEdgeContainer(executor);
+  edgeContainerMemo.set(executor, {
+    value: resolved,
+    at: Date.now(),
+    generation: edgeMemoGeneration
+  });
+  return resolved;
+}
+async function probeOurEdgeContainer(executor) {
+  const byName = await tryExec(
+    executor,
+    `docker ps --filter name=openship-edge --format '{{.Names}}' 2>/dev/null | head -1`
+  );
+  if (byName?.trim()) return byName.trim();
+  const all = await tryExec(executor, `docker ps --format '{{.Names}}	{{.Image}}' 2>/dev/null`);
+  if (!all) return null;
+  for (const line of all.split("\n").map((l) => l.trim()).filter(Boolean)) {
+    const [name, image] = line.split("	");
+    if (name && isOurEdgeContainer(name, image)) return name;
+  }
+  return null;
+}
+async function ourLuaOnHost(executor) {
+  const lua = await tryExec(
+    executor,
+    `test -f ${OPENRESTY_LUA_DIR}/site_logger.lua && echo ok`
+  );
+  return Boolean(lua && lua.includes("ok"));
+}
+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 ?? "" };
+}
+async function listenerIsOurOpenResty(executor, listener) {
+  if (!listener) return false;
+  if (/openresty/i.test(`${listener.rawCommand ?? ""} ${listener.command ?? ""}`)) return true;
+  if (listener.pid) {
+    const exe = await tryExec(executor, `readlink -f /proc/${listener.pid}/exe 2>/dev/null || true`);
+    if (exe && /openresty/i.test(exe)) return true;
+  }
+  return false;
+}
+var WORKER_RE = /\b(?:nginx|openresty)\s*:\s*worker process/i;
+var MASTER_RE = /\b(?:nginx|openresty)\s*:\s*master process/i;
+async function resolveProxyMaster(executor, listener) {
+  if (!listener?.pid) return listener;
+  if (!WORKER_RE.test(`${listener.rawCommand ?? ""} ${listener.command ?? ""}`)) return listener;
+  const ppidRaw = await tryExec(
+    executor,
+    `awk '/^PPid:/{print $2}' /proc/${listener.pid}/status 2>/dev/null || true`
+  );
+  const ppid = Number.parseInt((ppidRaw ?? "").trim(), 10);
+  if (!Number.isInteger(ppid) || ppid <= 1) return listener;
+  const master = await describeProcess(executor, ppid);
+  if (!master || !MASTER_RE.test(`${master.rawCommand ?? ""} ${master.command ?? ""}`)) {
+    return listener;
+  }
+  return master;
+}
+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 proxy = classifyProxy(
+    [
+      docker?.image,
+      docker?.name,
+      listener?.rawCommand,
+      listener?.command,
+      listener?.systemdUnit
+    ].filter(Boolean).join(" ")
+  );
+  const foreignDockerProxy = Boolean(docker) && !isOurEdgeContainer(docker?.name, docker?.image);
+  const managedByOpenship = isOurEdgeContainer(docker?.name, docker?.image) || ours.containerRunning && !foreignDockerProxy || !docker && ours.luaOnHost && await listenerIsOurOpenResty(executor, listener);
+  return {
+    port,
+    pid: listener?.pid ?? void 0,
+    command: docker ? `docker container ${docker.name} (${docker.image})` : listener?.command,
+    rawCommand: listener?.rawCommand,
+    systemdUnit: listener?.systemdUnit,
+    systemdDescription: listener?.systemdDescription,
+    isDocker: Boolean(docker),
+    containerName: docker?.name,
+    proxy,
+    managedByOpenship
+  };
+}
+async function probeEdge(executor) {
+  const containerRunning = await ourEdgeContainerRunning(executor);
+  const luaOnHost = await ourLuaOnHost(executor);
+  const all = [];
+  for (const port of EDGE_PORTS) {
+    const occ = await probeEdgePort(executor, port, { containerRunning, luaOnHost });
+    if (occ) all.push(occ);
+  }
+  const foreign = all.filter((o) => !o.managedByOpenship);
+  let classification;
+  if (all.length === 0) classification = "free";
+  else if (foreign.length === 0) classification = "ours";
+  else if (foreign.every((o) => o.proxy && o.proxy !== "openresty")) classification = "known";
+  else classification = "unknown";
+  return {
+    classification,
+    occupants: foreign,
+    canProceedClean: classification === "free" || classification === "ours"
+  };
+}
+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}`);
+    if (seen.has(identity)) continue;
+    seen.add(identity);
+    out.push({
+      port: o.port,
+      unit: o.systemdUnit,
+      pid: o.pid,
+      container: o.containerName,
+      // 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
+    });
+  }
+  return out;
+}
+async function freeEdgeTargets(executor, targets, onLog) {
+  for (const t of targets) {
+    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) {
+      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.pid) {
+      onLog(`Stopping ${t.label ?? `process ${t.pid}`}${where}...`, "warn");
+      await tryExec(executor, `kill ${t.pid} 2>/dev/null || true`);
+      await new Promise((r) => setTimeout(r, 800));
+      await tryExec(executor, `kill -9 ${t.pid} 2>/dev/null || true`);
+    }
+  }
+  await new Promise((r) => setTimeout(r, 1e3));
+}
+
+export {
+  EdgeConflictError,
+  EdgeMigrateRequested,
+  classifyProxy,
+  sq,
+  isOurEdgeContainer,
+  edgeIsServing,
+  edgeCrashReason,
+  edgeFailureReason,
+  EDGE_CONTAINER_NAME,
+  ourEdgeContainerRunning,
+  invalidateEdgeContainer,
+  resolveOurEdgeContainer,
+  ourLuaOnHost,
+  probeEdge,
+  stopTargetsForStatus,
+  freeEdgeTargets
+};

package/dist/{chunk-JYAGTMSJ.js → chunk-RPHRPFEH.js}

@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);