openship 0.6.9 → 0.7.1

package/dist/{chunk-IAMOUDHY.js → chunk-ETK6IBCH.js}

@@ -19,7 +19,7 @@ import {
   isCloudFrontedHost,
   luaSourceAvailable,
   reloadBareOpenResty
-} from "./chunk-7PEXM2UI.js";
+} from "./chunk-DQR5TPFB.js";
 import {
   edgeDownExplanation,
   explainEdgeDown,
@@ -30,17 +30,17 @@ import {
 } from "./chunk-R4VDPFLS.js";
 import {
   EXECUTOR_DELEGATE
-} from "./chunk-NPSRGIHV.js";
+} from "./chunk-B2BQX6JX.js";
 import {
   logEntry,
   sq
-} from "./chunk-P7RCYELG.js";
+} from "./chunk-2BAKEGGF.js";
 import {
   edgeFailureReason
-} from "./chunk-X53JXRS4.js";
+} from "./chunk-37XZTLBJ.js";
 import {
   probeListeningPort
-} from "./chunk-BO6CY4V2.js";
+} from "./chunk-NF7NQOAP.js";
 import {
   PROXY_DIRECTIVES,
   parseProxyValue,
@@ -48,7 +48,7 @@ import {
   resolveRedirectStatus,
   safeErrorMessage,
   sanitizeProxySettings
-} from "./chunk-WEZFTL4V.js";
+} from "./chunk-COI4VFRW.js";
 
 // ../../packages/adapters/src/infra/nginx.ts
 import {
@@ -92,8 +92,9 @@ async function readMaybeInContainer(exec, path, container) {
   if (!name) return "";
   return exec.exec(containerCommand(name, `cat ${sq(path)}`)).catch(() => "");
 }
-async function writeEdgeFileIn(inner, container, path, content) {
-  await inner.writeFile(path, content);
+async function writeEdgeFileIn(inner, container, path, content, opts) {
+  if (opts === void 0) await inner.writeFile(path, content);
+  else await inner.writeFile(path, content, opts);
   if (!container) return;
   const visible = await inner.exec(containerCommand(container, `test -e ${sq(path)} && echo visible`)).catch(() => "");
   if (visible.trim() === "visible") return;
@@ -149,7 +150,7 @@ ${result.output}` };
   if (opts?.files === "auto") {
     Object.assign(overrides, {
       readFile: (path) => readMaybeInContainer(inner, path, container),
-      writeFile: (path, content) => writeEdgeFileIn(inner, container, path, content),
+      writeFile: (path, content, writeOpts) => writeEdgeFileIn(inner, container, path, content, writeOpts),
       exists: async (path) => {
         if (await inner.exists(path).catch(() => false)) return true;
         const { code } = await inner.streamExec(inContainer(`test -e ${sq(path)}`), () => {
@@ -381,7 +382,13 @@ var WEBHOOK_LOCATION_PREFIX = "/_openship/hooks/";
 function renderProxyLocations(route, opts) {
   if (!route.proxyLocations || route.proxyLocations.length === 0) return "";
   const head = `${opts.httpsUpgrade ? HTTPS_UPGRADE : ""}${renderRedirectRules(route, "        ")}`;
-  const claimed = /* @__PURE__ */ new Set(["/", WEBHOOK_LOCATION_PREFIX]);
+  const claimed = /* @__PURE__ */ new Set([
+    "prefix:/",
+    `prefix:${WEBHOOK_LOCATION_PREFIX}`,
+    // An exact webhook match would not be a duplicate, but it would outrank and
+    // hijack the edge-owned delivery endpoint just as surely as a prefix would.
+    `exact:${WEBHOOK_LOCATION_PREFIX}`
+  ]);
   const blocks = [];
   for (const loc of route.proxyLocations) {
     assertValidUpstream(loc.targetUrl);
@@ -389,10 +396,12 @@ function renderProxyLocations(route, opts) {
     const headers = loc.external ? externalProxyHeaders(loc.targetUrl) : PROXY_HEADERS;
     if (!loc.pattern || !loc.upstreamPath) {
       assertValidLiteralPath(loc.pathPrefix, "proxy location prefix");
-      if (claimed.has(loc.pathPrefix)) continue;
-      claimed.add(loc.pathPrefix);
+      const kind = loc.exact ? "exact" : "prefix";
+      const key = `${kind}:${loc.pathPrefix}`;
+      if (claimed.has(key)) continue;
+      claimed.add(key);
       blocks.push(`
-    location ^~ ${loc.pathPrefix} {
+    location ${loc.exact ? "=" : "^~"} ${loc.pathPrefix} {
         ${head}proxy_pass ${loc.targetUrl};
         ${headers}
     }`);
@@ -403,8 +412,8 @@ function renderProxyLocations(route, opts) {
     assertNoNginxInjection(loc.upstreamPath, "rewrite upstream path");
     assertNoRuntimeVariable(loc.upstreamPath, "rewrite upstream path", true);
     const match = `^${toNginxPattern(loc.pattern)}$`;
-    if (claimed.has(`~ ${match}`)) continue;
-    claimed.add(`~ ${match}`);
+    if (claimed.has(`regex:${match}`)) continue;
+    claimed.add(`regex:${match}`);
     blocks.push(`
     location ~ ${match} {
         ${head}rewrite ${match} ${loc.upstreamPath} break;

package/dist/{chunk-T46BQOLY.js → chunk-FNWNUYS3.js}

@@ -4,15 +4,15 @@ import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   hostRefusal
-} from "./chunk-GNOMEMNI.js";
+} from "./chunk-KATXZ5AB.js";
 import {
   elevatedExecutor,
   resolveEnvironment
-} from "./chunk-NPSRGIHV.js";
+} from "./chunk-B2BQX6JX.js";
 import {
   answered,
   refused
-} from "./chunk-WEZFTL4V.js";
+} from "./chunk-COI4VFRW.js";
 
 // ../../packages/adapters/src/system/privilege.ts
 function rootChecked(executor, why) {