openship 0.4.7 → 0.5.0

package/README.md

@@ -35,6 +35,7 @@
   <a href="docs/i18n/README.pt.md"><img src="https://img.shields.io/badge/lang-Português-555" alt="Português" /></a>
   <a href="docs/i18n/README.de.md"><img src="https://img.shields.io/badge/lang-Deutsch-555" alt="Deutsch" /></a>
   <a href="docs/i18n/README.tr.md"><img src="https://img.shields.io/badge/lang-Türkçe-555" alt="Türkçe" /></a>
+  <a href="docs/i18n/README.ko.md"><img src="https://img.shields.io/badge/lang-한국어-555" alt="한국어" /></a>
 </p>
 
 <p align="center">

package/dist/{bare-2HYDXQEH.js → bare-VRGE5MXH.js}

@@ -5,17 +5,17 @@ const require = __ospCreateRequire(import.meta.url);
 import {
   BareRuntime,
   STATIC_RELEASE_BASE
-} from "./chunk-VDMQJHPI.js";
-import "./chunk-MZ2WEHHY.js";
-import "./chunk-L2VOGB2X.js";
-import "./chunk-4Z5QO7N6.js";
-import "./chunk-4TJC4JZQ.js";
-import "./chunk-OXWDY22G.js";
+} from "./chunk-YWMODKWL.js";
+import "./chunk-KNTJ7PSF.js";
+import "./chunk-KZOBYJUW.js";
+import "./chunk-I6PSTQIR.js";
+import "./chunk-K2RPVGPN.js";
+import "./chunk-ZCOQJCZO.js";
 import "./chunk-RPHRPFEH.js";
 import "./chunk-TYVME3XD.js";
 import "./chunk-FPRHYBY2.js";
 import "./chunk-ILFETZOM.js";
-import "./chunk-6APULWSU.js";
+import "./chunk-UMQP7SYT.js";
 import "./chunk-KI2EY3WB.js";
 export {
   BareRuntime,

package/dist/{chunk-TGIINPVM.js → chunk-6LKHXB6T.js}

@@ -14,6 +14,15 @@ import {
 import Dockerode from "dockerode";
 import { PassThrough } from "stream";
 var DEFAULT_SOCKET = "/var/run/docker.sock";
+function explainEdgeExecError(err, containerName) {
+  const msg = err?.message ?? String(err);
+  if (/is not running|not running|409/i.test(msg)) {
+    return new Error(
+      `edge container "${containerName}" is not running yet (still starting, or stopped) \u2014 wait for it to be up (docker start ${containerName}) and retry.`
+    );
+  }
+  return err instanceof Error ? err : new Error(msg);
+}
 var WRITE_CHUNK = 6e4;
 var DockerEdgeExecutor = class {
   docker;
@@ -30,13 +39,19 @@ var DockerEdgeExecutor = class {
   /** Run one command inside the edge container, capturing stdout/stderr + exit. */
   async run(command) {
     const container = this.docker.getContainer(this.containerName);
-    const exec = await container.exec({
-      Cmd: ["/bin/sh", "-c", command],
-      AttachStdout: true,
-      AttachStderr: true,
-      Tty: false
-    });
-    const stream = await exec.start({ stdin: false });
+    let exec;
+    let stream;
+    try {
+      exec = await container.exec({
+        Cmd: ["/bin/sh", "-c", command],
+        AttachStdout: true,
+        AttachStderr: true,
+        Tty: false
+      });
+      stream = await exec.start({ stdin: false });
+    } catch (err) {
+      throw explainEdgeExecError(err, this.containerName);
+    }
     const outStream = new PassThrough();
     const errStream = new PassThrough();
     let stdout = "";

package/dist/{chunk-R5BHFFAV.js → chunk-6PIYRG5I.js}

@@ -8,10 +8,10 @@ import {
 } from "./chunk-ILFETZOM.js";
 import {
   OPENRESTY_LUA_DIR
-} from "./chunk-VFINNTUL.js";
+} from "./chunk-EAAGSQXN.js";
 import {
   AppError
-} from "./chunk-6APULWSU.js";
+} from "./chunk-UMQP7SYT.js";
 
 // ../../packages/adapters/src/system/proxy/detect.ts
 var EDGE_PORTS = [80, 443];
@@ -59,21 +59,59 @@ function sq(value) {
 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(
+function vhostLog(message, level = "info") {
+  return { timestamp: (/* @__PURE__ */ new Date()).toISOString(), message, level };
+}
+async function sanitizeEdgeVhosts(executor, sitesDir, onLog) {
+  const script = [
+    `for f in ${sq(sitesDir)}/*.conf; do`,
+    // A host-side vhost may be a symlink into /etc/nginx/sites-available. That
+    // target is deliberately not mounted in the edge container, so leaving the
+    // link here makes nginx's include glob fail at startup. Materialize valid
+    // links before the container mounts this directory; remove dangling ones.
+    `  [ -e "$f" ] || [ -L "$f" ] || continue;`,
+    `  if [ -L "$f" ]; then`,
+    `    if [ ! -e "$f" ]; then`,
+    `      echo "dropped-dangling-link $f"; rm -f "$f"; continue;`,
+    `    fi;`,
+    `    if cat "$f" > "$f.osh-link"; then`,
+    `      rm -f "$f"; mv "$f.osh-link" "$f"; echo "materialized-link $f";`,
+    `    else`,
+    `      rm -f "$f.osh-link"; echo "dropped-unreadable-link $f"; rm -f "$f"; continue;`,
+    `    fi;`,
+    `  fi;`,
+    // A real server_name is anything that isn't the `_` wildcard.
+    `  if ! grep -qE '^[[:space:]]*server_name[[:space:]]+[^_;[:space:]]' "$f"; then`,
+    `    echo "dropped-catchall $f"; rm -f "$f"; continue;`,
+    `  fi;`,
+    `  if grep -qE '[[:space:]]default_server' "$f"; then`,
+    `    sed -E 's/([[:space:]]listen[^;]*)[[:space:]]+default_server/\\1/g' "$f" > "$f.osh" && mv "$f.osh" "$f" && echo "unset-default $f";`,
+    `  fi;`,
+    `done`
+  ].join(" ");
+  const out = await executor.exec(script).catch(() => "");
+  for (const line of out.split("\n").map((l) => l.trim()).filter(Boolean)) {
+    const [action, file] = [line.slice(0, line.indexOf(" ")), line.slice(line.indexOf(" ") + 1)];
+    if (action === "dropped-catchall") {
+      onLog(vhostLog(`Dropped catch-all vhost ${file} \u2014 the edge image provides it.`, "warn"));
+    } else if (action === "unset-default") {
+      onLog(vhostLog(`Removed default_server from ${file} \u2014 the edge image owns it.`, "warn"));
+    } else if (action === "materialized-link") {
+      onLog(vhostLog(`Materialized linked edge vhost ${file} for the container mount.`, "warn"));
+    } else if (action === "dropped-dangling-link") {
+      onLog(vhostLog(`Dropped dangling edge vhost link ${file}.`, "warn"));
+    } else if (action === "dropped-unreadable-link") {
+      onLog(vhostLog(`Dropped unreadable edge vhost link ${file}.`, "warn"));
+    }
+  }
+}
+async function edgeIsBroken(executor) {
+  const status = await tryExec(
     executor,
-    containerShell(`wget -q -O /dev/null -T 3 http://127.0.0.1:${port}/ >/dev/null 2>&1; echo $?`)
+    `docker inspect -f '{{.State.Status}}' ${sq(EDGE_CONTAINER_NAME)} 2>/dev/null`
   );
-  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)}`;
+  const state = (status ?? "").trim();
+  return state === "restarting" || state === "exited" || state === "dead";
 }
 async function edgeCrashReason(executor) {
   const logs = await tryExec(
@@ -86,7 +124,7 @@ 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;
+  return null;
 }
 var EDGE_CONTAINER_NAME = "openship-edge";
 async function ourEdgeContainerRunning(executor) {
@@ -268,7 +306,8 @@ export {
   classifyProxy,
   sq,
   isOurEdgeContainer,
-  edgeIsServing,
+  sanitizeEdgeVhosts,
+  edgeIsBroken,
   edgeCrashReason,
   edgeFailureReason,
   EDGE_CONTAINER_NAME,