openship 0.4.6 → 0.4.8

package/dist/{chunk-4TJC4JZQ.js → chunk-XPPZ7B2J.js}

@@ -30,7 +30,7 @@ import {
 } from "./chunk-6APULWSU.js";
 
 // ../../packages/adapters/src/system/executor.ts
-import { readFileSync } from "fs";
+import { existsSync, readFileSync } from "fs";
 
 // ../../packages/adapters/src/system/ssh-executor.ts
 import { createReadStream } from "fs";
@@ -1508,6 +1508,18 @@ function createExecutor(ssh) {
 function hostControlDisabled() {
   return process.env.OPENSHIP_HOST_CONTROL?.trim().toLowerCase() === "false";
 }
+function runningInContainer() {
+  if (process.env.OPENSHIP_IN_CONTAINER?.trim().toLowerCase() === "true") return true;
+  try {
+    if (existsSync("/.dockerenv")) return true;
+  } catch {
+  }
+  try {
+    return /\b(docker|containerd|podman|kubepods)\b/.test(readFileSync("/proc/1/cgroup", "utf8"));
+  } catch {
+    return false;
+  }
+}
 function createHostExecutor() {
   if (hostControlDisabled()) {
     throw new Error(
@@ -1515,7 +1527,14 @@ function createHostExecutor() {
     );
   }
   const host = process.env.OPENSHIP_HOST_SSH_HOST?.trim();
-  if (!host) return localExecutor;
+  if (!host) {
+    if (runningInContainer()) {
+      throw new Error(
+        "This operation targets the HOST machine, but no host channel is configured (OPENSHIP_HOST_SSH_HOST is unset) and Openship is running in a container \u2014 so it would have run inside the container instead, against the wrong filesystem. Re-run `openship up` to provision the host channel."
+      );
+    }
+    return localExecutor;
+  }
   const keyPath = process.env.OPENSHIP_HOST_SSH_KEY?.trim();
   const portRaw = Number(process.env.OPENSHIP_HOST_SSH_PORT || "22");
   const port = Number.isInteger(portRaw) && portRaw > 0 && portRaw < 65536 ? portRaw : 22;

package/dist/{cloud-ZSKOS4GY.js → cloud-KYWY3RP4.js}

@@ -6,19 +6,19 @@ import {
   CloudRuntime,
   PAGE_CONTAINER_PREFIX,
   provisionCloudWorkspace
-} from "./chunk-5FNIWBFI.js";
-import "./chunk-SQ77DZOI.js";
+} from "./chunk-5NYUCONN.js";
+import "./chunk-SLTYVHU7.js";
 import "./chunk-V6AN6XLZ.js";
 import "./chunk-MZ2WEHHY.js";
 import "./chunk-L2VOGB2X.js";
 import "./chunk-4Z5QO7N6.js";
-import "./chunk-4TJC4JZQ.js";
+import "./chunk-XPPZ7B2J.js";
 import "./chunk-OXWDY22G.js";
 import "./chunk-RPHRPFEH.js";
 import "./chunk-TYVME3XD.js";
 import "./chunk-FXTBHTWY.js";
 import "./chunk-FPRHYBY2.js";
-import "./chunk-FQGJZ2HS.js";
+import "./chunk-2D3I5G6P.js";
 import "./chunk-ILFETZOM.js";
 import "./chunk-VFINNTUL.js";
 import "./chunk-6APULWSU.js";

package/dist/{detect-SH4FHFBI.js → detect-AZLOHUFX.js}

@@ -3,9 +3,13 @@
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
+  EDGE_CONTAINER_NAME,
   EdgeConflictError,
   EdgeMigrateRequested,
   classifyProxy,
+  edgeCrashReason,
+  edgeFailureReason,
+  edgeIsBroken,
   freeEdgeTargets,
   invalidateEdgeContainer,
   isOurEdgeContainer,
@@ -13,17 +17,22 @@ import {
   ourLuaOnHost,
   probeEdge,
   resolveOurEdgeContainer,
+  sanitizeEdgeVhosts,
   sq,
   stopTargetsForStatus
-} from "./chunk-FQGJZ2HS.js";
+} from "./chunk-2D3I5G6P.js";
 import "./chunk-ILFETZOM.js";
 import "./chunk-VFINNTUL.js";
 import "./chunk-6APULWSU.js";
 import "./chunk-KI2EY3WB.js";
 export {
+  EDGE_CONTAINER_NAME,
   EdgeConflictError,
   EdgeMigrateRequested,
   classifyProxy,
+  edgeCrashReason,
+  edgeFailureReason,
+  edgeIsBroken,
   freeEdgeTargets,
   invalidateEdgeContainer,
   isOurEdgeContainer,
@@ -31,6 +40,7 @@ export {
   ourLuaOnHost,
   probeEdge,
   resolveOurEdgeContainer,
+  sanitizeEdgeVhosts,
   sq,
   stopTargetsForStatus
 };

package/dist/{docker-U7AF5PTA.js → docker-LODK5Y2S.js}

@@ -4,7 +4,7 @@ import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   DockerRuntime
-} from "./chunk-2ZLR7ULL.js";
+} from "./chunk-SJIFLLX4.js";
 import "./chunk-V6AN6XLZ.js";
 import "./chunk-4Z5QO7N6.js";
 import "./chunk-OXWDY22G.js";

package/dist/{edge-import-V5CBA47C.js → edge-import-ABUDKKJI.js}

@@ -5,7 +5,7 @@ const require = __ospCreateRequire(import.meta.url);
 import {
   importMigratedSites,
   waitForApiHealth
-} from "./chunk-3JQTL4R4.js";
+} from "./chunk-BBHX7T4R.js";
 import "./chunk-FRNAR33O.js";
 import "./chunk-EI575GHN.js";
 import "./chunk-6APIPIJY.js";
@@ -14,27 +14,27 @@ import "./chunk-OWED2GRM.js";
 import "./chunk-VWPEKOH6.js";
 import "./chunk-W73X43R7.js";
 import "./chunk-TGIINPVM.js";
-import "./chunk-5FNIWBFI.js";
+import "./chunk-5NYUCONN.js";
 import "./chunk-AVIB7CT7.js";
 import "./chunk-5MZ624VX.js";
 import "./chunk-Q2CIRAOK.js";
-import "./chunk-C5OHTYEF.js";
-import "./chunk-SQ77DZOI.js";
+import "./chunk-GKHUSZCD.js";
+import "./chunk-SLTYVHU7.js";
 import "./chunk-O6ZZF52V.js";
 import "./chunk-JYGD5WSN.js";
-import "./chunk-2ZLR7ULL.js";
+import "./chunk-SJIFLLX4.js";
 import "./chunk-V6AN6XLZ.js";
 import "./chunk-VDMQJHPI.js";
 import "./chunk-MZ2WEHHY.js";
 import "./chunk-L2VOGB2X.js";
 import "./chunk-4Z5QO7N6.js";
-import "./chunk-4TJC4JZQ.js";
+import "./chunk-XPPZ7B2J.js";
 import "./chunk-OXWDY22G.js";
 import "./chunk-RPHRPFEH.js";
 import "./chunk-TYVME3XD.js";
 import "./chunk-FXTBHTWY.js";
 import "./chunk-FPRHYBY2.js";
-import "./chunk-FQGJZ2HS.js";
+import "./chunk-2D3I5G6P.js";
 import "./chunk-ILFETZOM.js";
 import "./chunk-VFINNTUL.js";
 import "./chunk-6APULWSU.js";

package/dist/{ensure-container-edge-CMYROUSI.js → ensure-container-edge-SW6HENSG.js}

@@ -3,7 +3,6 @@
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
-  EDGE_CONTAINER_NAME,
   buildEdgeRunCommand,
   containerEdgeProvider,
   dockerAvailable,
@@ -11,18 +10,17 @@ import {
   localContainerEdgeProvider,
   resolveEdgeImage,
   setDefaultEdgeImage
-} from "./chunk-SQ77DZOI.js";
+} from "./chunk-SLTYVHU7.js";
 import "./chunk-L2VOGB2X.js";
 import "./chunk-RPHRPFEH.js";
 import "./chunk-FXTBHTWY.js";
 import "./chunk-FPRHYBY2.js";
-import "./chunk-FQGJZ2HS.js";
+import "./chunk-2D3I5G6P.js";
 import "./chunk-ILFETZOM.js";
 import "./chunk-VFINNTUL.js";
 import "./chunk-6APULWSU.js";
 import "./chunk-KI2EY3WB.js";
 export {
-  EDGE_CONTAINER_NAME,
   buildEdgeRunCommand,
   containerEdgeProvider,
   dockerAvailable,

package/dist/{executor-YPT6RH6O.js → executor-XJ6RP4Q2.js}

@@ -8,7 +8,7 @@ import {
   createExecutor,
   createHostExecutor,
   hostControlDisabled
-} from "./chunk-4TJC4JZQ.js";
+} from "./chunk-XPPZ7B2J.js";
 import "./chunk-OXWDY22G.js";
 import "./chunk-RPHRPFEH.js";
 import {

package/dist/index.js

@@ -8,6 +8,7 @@ import {
   composeDown,
   composeInternalToken,
   composeIsViableDefault,
+  composePrefetch,
   composePs,
   composeRestart,
   composeRunning,
@@ -25,7 +26,7 @@ import {
   remoteSha,
   shortSha,
   sourceBuildDir
-} from "./chunk-3JQTL4R4.js";
+} from "./chunk-BBHX7T4R.js";
 import "./chunk-FRNAR33O.js";
 import "./chunk-EI575GHN.js";
 import "./chunk-6APIPIJY.js";
@@ -34,11 +35,11 @@ import "./chunk-OWED2GRM.js";
 import "./chunk-VWPEKOH6.js";
 import "./chunk-W73X43R7.js";
 import "./chunk-TGIINPVM.js";
-import "./chunk-5FNIWBFI.js";
+import "./chunk-5NYUCONN.js";
 import "./chunk-AVIB7CT7.js";
 import "./chunk-5MZ624VX.js";
 import "./chunk-Q2CIRAOK.js";
-import "./chunk-C5OHTYEF.js";
+import "./chunk-GKHUSZCD.js";
 import {
   beginEdgeTakeover,
   collectProxyCerts,
@@ -51,16 +52,16 @@ import {
   recoverInterruptedTakeover,
   rollbackEdgeTakeover,
   scanImportableSites
-} from "./chunk-SQ77DZOI.js";
+} from "./chunk-SLTYVHU7.js";
 import "./chunk-O6ZZF52V.js";
 import "./chunk-JYGD5WSN.js";
-import "./chunk-2ZLR7ULL.js";
+import "./chunk-SJIFLLX4.js";
 import "./chunk-V6AN6XLZ.js";
 import "./chunk-VDMQJHPI.js";
 import "./chunk-MZ2WEHHY.js";
 import "./chunk-L2VOGB2X.js";
 import "./chunk-4Z5QO7N6.js";
-import "./chunk-4TJC4JZQ.js";
+import "./chunk-XPPZ7B2J.js";
 import "./chunk-OXWDY22G.js";
 import "./chunk-RPHRPFEH.js";
 import {
@@ -69,8 +70,10 @@ import {
 import "./chunk-FXTBHTWY.js";
 import "./chunk-FPRHYBY2.js";
 import {
+  edgeCrashReason,
+  edgeIsBroken,
   ourEdgeContainerRunning
-} from "./chunk-FQGJZ2HS.js";
+} from "./chunk-2D3I5G6P.js";
 import "./chunk-ILFETZOM.js";
 import "./chunk-VFINNTUL.js";
 import {
@@ -1681,6 +1684,25 @@ async function runCompose(opts) {
     );
     process.exit(1);
   }
+  const publicUrl = effectivePublicUrl(opts.publicUrl);
+  const prefetch = ora(
+    sourceBuildDir() ? "Building images before touching :80/:443\u2026" : "Pulling images before touching :80/:443\u2026"
+  ).start();
+  const fetched = composePrefetch({
+    apiPort: opts.port,
+    dashboardPort: opts.dashboardPort,
+    publicUrl,
+    trustProxy: opts.trustProxy,
+    noHostControl: opts.hostControl === false ? true : void 0
+  });
+  if (!fetched) {
+    prefetch.fail("Couldn't fetch the stack's images \u2014 nothing was changed on this box.");
+    console.error(
+      chalk6.dim("\n  Your current proxy is untouched and still serving. Fix the pull/build error above and re-run.\n")
+    );
+    process.exit(1);
+  }
+  prefetch.succeed("Images ready \u2014 nothing on :80/:443 has changed yet.");
   let edgePlan;
   try {
     edgePlan = await planAndApplyHostEdge({ edge: opts.edge });
@@ -1698,12 +1720,13 @@ async function runCompose(opts) {
     );
     process.exit(1);
   }
-  const publicUrl = effectivePublicUrl(opts.publicUrl);
   const fromSource = sourceBuildDir();
   const spinner5 = ora(
     fromSource ? `Building Openship from ${fromSource} and starting the stack\u2026` : "Starting Openship via Docker Compose\u2026"
   ).start();
-  const res = composeUp({
+  const res = await composeUp({
+    // Prefetched above, before the preflight stopped anything.
+    alreadyFetched: true,
     apiPort: opts.port,
     dashboardPort: opts.dashboardPort,
     publicUrl,
@@ -1722,6 +1745,27 @@ async function runCompose(opts) {
     process.exit(1);
   }
   spinner5.succeed("Openship is running via Docker Compose.");
+  if (edgePlan.action && await edgeIsBroken(new LocalExecutor())) {
+    const reason = await edgeCrashReason(new LocalExecutor());
+    console.error(
+      chalk6.red(`
+  Openship's edge container is not running${reason ? ` \u2014 ${reason}` : "."}`)
+    );
+    const restored = await rollbackHostEdge();
+    console.error(
+      restored ? chalk6.yellow(
+        `  Your previous proxy has been restarted \u2014 the box is serving again, on it.
+  Nothing was migrated. Fix the cause above, then re-run \`openship up\`.
+`
+      ) : chalk6.red(
+        `  AND your previous proxy could NOT be restarted automatically \u2014 the box is
+  serving nothing right now. Start it by hand:
+    docker stop openship-edge && sudo systemctl enable --now nginx
+`
+      )
+    );
+    process.exit(1);
+  }
   let importedOk = true;
   if (edgePlan.action === "migrate" && edgePlan.sites?.length) {
     const outcome = await importMigratedSites(res.apiPort, edgePlan.sites, edgePlan.certPems);
@@ -1973,7 +2017,7 @@ async function runForeground(opts, source) {
     const uiSpinner = ora("Preparing the dashboard\u2026").start();
     try {
       const bundle = await ensureDashboard({
-        tag: source ? "local" : opts.uiVersion || `v${"0.4.6"}`,
+        tag: source ? "local" : opts.uiVersion || `v${"0.4.8"}`,
         onProgress: (received, total) => {
           if (total) {
             uiSpinner.text = `Downloading dashboard\u2026 ${Math.round(received / total * 100)}%`;
@@ -6582,7 +6626,7 @@ function detectPackageManager2(override) {
 var updateCommand = new Command26("update").description("Update the Openship CLI + bundled server to the latest release").option("--check", "Only report the current + latest version; don't install").option("--via <manager>", "Package manager to update with: bun | npm").option("--rebuild", "From-source installs: rebuild even if already at the remote tip").action(async (opts) => {
   const source = readSourceInstall();
   if (source) return runSourceUpdate(source, opts);
-  const current = "0.4.6";
+  const current = "0.4.8";
   let latest;
   try {
     latest = (await resolveLatestTag()).replace(/^v/, "");
@@ -6617,7 +6661,7 @@ var updateCommand = new Command26("update").description("Update the Openship CLI
     return;
   }
   if (readInstallMethod() === "compose") {
-    const applied = composeUpdate(latest);
+    const applied = await composeUpdate(latest);
     if (isJsonMode()) {
       printJson({ updated: true, from: current, to: latest, via: pm, method: "compose", applied });
     } else if (applied) {
@@ -7149,7 +7193,7 @@ async function runWizard() {
       }
     }
   }
-  const uiTag = `v${"0.4.6"}`;
+  const uiTag = `v${"0.4.8"}`;
   if (method === "bare") {
     const dl = spinner4();
     dl.start("Pulling the Openship dist from GitHub");
@@ -7203,6 +7247,18 @@ async function runWizard() {
     }
   }
   if (method === "compose") {
+    log5.step(
+      sourceBuildDir() ? "Building the Openship images before touching :80/:443 (first run takes a few minutes)\u2026" : "Pulling images before touching :80/:443\u2026"
+    );
+    if (!composePrefetch({
+      publicUrl,
+      trustProxy: behindProxy,
+      version: "0.4.8",
+      noHostControl: !allowHostControl
+    })) {
+      cancel4("Couldn't fetch the Openship images \u2014 nothing on this box was changed.");
+      process.exit(1);
+    }
     const edgePlan = await planAndApplyHostEdge({});
     if (!edgePlan.proceed) {
       cancel4("Left the existing proxy on 80/443 running \u2014 re-run and choose migrate/takeover when ready.");
@@ -7211,13 +7267,13 @@ async function runWizard() {
     edgeAction = edgePlan.action;
     migratedSites = edgePlan.sites;
     migratedCertPems = edgePlan.certPems;
-    log5.step(
-      sourceBuildDir() ? "Building the Openship images from your source checkout (first run takes a few minutes)\u2026" : "Pulling images and starting the Docker Compose stack\u2026"
-    );
-    const up = composeUp({
+    log5.step("Starting the Docker Compose stack\u2026");
+    const up = await composeUp({
+      // Prefetched above, before the preflight stopped anything.
+      alreadyFetched: true,
       publicUrl,
       trustProxy: behindProxy,
-      version: "0.4.6",
+      version: "0.4.8",
       noHostControl: !allowHostControl
     });
     if (!up.ok) {
@@ -7554,7 +7610,7 @@ ${chalk20.dim("Dashboard".padEnd(11))}${dashUrl}
 
 // src/index.ts
 var program = new Command28();
-program.name("openship").description("Openship CLI \u2014 install, run, and manage Openship from your terminal").version("0.4.6").option("--json", "Machine-readable JSON output (stdout data only)").hook("preAction", (thisCommand) => {
+program.name("openship").description("Openship CLI \u2014 install, run, and manage Openship from your terminal").version("0.4.8").option("--json", "Machine-readable JSON output (stdout data only)").hook("preAction", (thisCommand) => {
   if (thisCommand.opts().json) setJsonMode(true);
 }).action(async () => {
   const installed = serviceStatus().installed || readInstallMethod() === "compose";

package/dist/{nginx-2GTRUIDE.js → nginx-3L4SIBJA.js}

@@ -10,7 +10,7 @@ import {
   summarizeCertbotFailure
 } from "./chunk-FXTBHTWY.js";
 import "./chunk-FPRHYBY2.js";
-import "./chunk-FQGJZ2HS.js";
+import "./chunk-2D3I5G6P.js";
 import "./chunk-ILFETZOM.js";
 import "./chunk-VFINNTUL.js";
 import "./chunk-6APULWSU.js";