@stacksjs/ts-cloud 0.7.60 → 0.7.62

package/dist/{chunk-cz17nhnx.js → chunk-ff77qy0c.js}

@@ -45,7 +45,7 @@ import {
   resolveSiteKind,
   resolveUiSource,
   siteInstallBase
-} from "./chunk-sd9h1baj.js";
+} from "./chunk-vx2yva1a.js";
 import {
   artifactKey,
   buildCloudFormationTemplate,

package/dist/{chunk-sd9h1baj.js → chunk-vx2yva1a.js}

@@ -3808,6 +3808,48 @@ function buildEnsureReleaseLayout(paths, sharedPaths = DEFAULT_SHARED_PATHS) {
   }
   return lines;
 }
+function buildDeployLock(paths, waitSeconds = 900) {
+  const lock = `${deployMetaDir(paths.base)}/deploy.lock`;
+  return [
+    `mkdir -p "$(dirname ${lock})"`,
+    `exec 9>${lock}`,
+    `flock -w ${waitSeconds} 9 || { echo "[ts-cloud] another deploy of this site has held the lock for ${waitSeconds}s — refusing to race it" >&2; exit 1; }`
+  ];
+}
+function buildResetReleaseDir(paths) {
+  const staging = `${paths.release}.incoming`;
+  return [
+    `rm -rf ${staging}`,
+    `mkdir -p ${staging}`,
+    ...buildIsReleaseLive(paths),
+    'if [ "$TS_CLOUD_IS_LIVE" = "yes" ]; then',
+    `  TS_CLOUD_STAGED=${staging}`,
+    "else",
+    `  rm -rf ${paths.release}`,
+    `  mkdir -p ${paths.release}`,
+    `  rmdir ${staging}`,
+    `  TS_CLOUD_STAGED=${paths.release}`,
+    "fi"
+  ];
+}
+function buildIsReleaseLive(paths) {
+  return [
+    `TS_CLOUD_LIVE_PATH="$(readlink -f ${paths.current} 2>/dev/null || true)"`,
+    `TS_CLOUD_RELEASE_PATH="$(readlink -f ${paths.release} 2>/dev/null || echo ${paths.release})"`,
+    'if [ -n "$TS_CLOUD_LIVE_PATH" ] && [ "$TS_CLOUD_LIVE_PATH" = "$TS_CLOUD_RELEASE_PATH" ]; then TS_CLOUD_IS_LIVE=yes; else TS_CLOUD_IS_LIVE=no; fi'
+  ];
+}
+function buildPromoteStagedRelease(paths) {
+  const staging = `${paths.release}.incoming`;
+  return [
+    `if [ "$TS_CLOUD_STAGED" = "${staging}" ]; then`,
+    `  rm -rf ${paths.release}.previous`,
+    `  mv ${paths.release} ${paths.release}.previous`,
+    `  mv ${staging} ${paths.release}`,
+    `  rm -rf ${paths.release}.previous`,
+    "fi"
+  ];
+}
 function buildLinkSharedPaths(paths, sharedPaths = DEFAULT_SHARED_PATHS) {
   const lines = [];
   for (const p of sharedPaths) {
@@ -3921,17 +3963,19 @@ function buildSiteDeployScript(options) {
   const preStart = preStartCommands.length > 0 ? [`cd ${paths.release}`, ...preStartCommands] : [];
   const stageRelease = [
     "set -euo pipefail",
-    `trap 'if [ $? -ne 0 ] && [ "$(readlink -f ${paths.current} 2>/dev/null || true)" != "${paths.release}" ]; then rm -rf ${paths.release}; fi' EXIT`,
+    ...buildDeployLock(paths),
+    ...buildIsReleaseLive(paths),
+    `trap 'if [ $? -ne 0 ] && [ "$TS_CLOUD_IS_LIVE" != "yes" ]; then rm -rf ${paths.release}; fi' EXIT`,
     ...artifactFetch,
     ...buildEnsureReleaseLayout(paths, sharedPaths),
-    `rm -rf ${paths.release}`,
-    `mkdir -p ${paths.release}`,
-    `tar xzf ${tarball} -C ${paths.release}`,
+    ...buildResetReleaseDir(paths),
+    `tar xzf ${tarball} -C "$TS_CLOUD_STAGED"`,
     `rm -f ${tarball}`,
     `cat > ${paths.shared}/.env <<'TS_CLOUD_ENV_EOF'`,
     envFile,
     "TS_CLOUD_ENV_EOF",
     `chmod 600 ${paths.shared}/.env`,
+    ...buildPromoteStagedRelease(paths),
     `for TS_CLOUD_ENV in ${paths.shared}/.env ${paths.release}/.env ${paths.release}/.env.*; do [ -f "$TS_CLOUD_ENV" ] && sed -i -E '/^[[:space:]]*(PORT|PORT_BACKEND|PORT_ADMIN|PORT_FRONTEND)[[:space:]]*=/d' "$TS_CLOUD_ENV" 2>/dev/null || true; done`,
     ...buildLinkSharedPaths(paths, sharedPaths),
     ...preStart
@@ -3962,7 +4006,7 @@ function buildSiteDeployScript(options) {
       "systemctl daemon-reload",
       `TS_CLOUD_OLD_UNITS=$(systemctl list-units --plain --no-legend --type=service "${unitBase}@*.service" 2>/dev/null | awk '{print $1}' | grep -v "^${instance}$" || true)`,
       `if [ -f /etc/systemd/system/${serviceName} ] && systemctl is-active --quiet ${serviceName}; then echo "[ts-cloud] retiring pre-zero-downtime unit ${serviceName} (one-time restart cutover)"; systemctl stop ${serviceName}; fi`,
-      `systemctl start ${instance}`,
+      `systemctl restart ${instance}`,
       `TS_CLOUD_GATE_OK=1; for TS_CLOUD_I in $(seq 1 ${Math.max(1, healthGateSeconds)}); do sleep 1; systemctl is-active --quiet ${instance} || { TS_CLOUD_GATE_OK=0; break; }; done`,
       `if [ "$TS_CLOUD_GATE_OK" -ne 1 ]; then echo "[ts-cloud] release ${releaseId} could not overlap the previous release (no SO_REUSEPORT?) — retiring old instances and retrying" >&2; for TS_CLOUD_RU in \${TS_CLOUD_OLD_UNITS}; do systemctl stop "$TS_CLOUD_RU" 2>/dev/null || true; done; systemctl restart ${instance}; for TS_CLOUD_I in $(seq 1 ${Math.max(1, healthGateSeconds)}); do sleep 1; systemctl is-active --quiet ${instance} || ${failGate}; done; fi`,
       ...gatePath ? [`curl -sf -o /dev/null --max-time 10 "http://127.0.0.1:${port}${gatePath}" || ${failGate}`] : [],
@@ -4009,12 +4053,14 @@ function buildStaticSiteDeployScript(options) {
   const preStart = preStartCommands.length > 0 ? [`cd ${paths.release}`, ...preStartCommands] : [];
   return [
     "set -euo pipefail",
-    `trap 'if [ $? -ne 0 ] && [ "$(readlink -f ${paths.current} 2>/dev/null || true)" != "${paths.release}" ]; then rm -rf ${paths.release}; fi' EXIT`,
+    ...buildDeployLock(paths),
+    ...buildIsReleaseLive(paths),
+    `trap 'if [ $? -ne 0 ] && [ "$TS_CLOUD_IS_LIVE" != "yes" ]; then rm -rf ${paths.release}; fi' EXIT`,
     ...artifactFetch,
     ...buildEnsureReleaseLayout(paths, []),
-    `rm -rf ${paths.release}`,
-    `mkdir -p ${paths.release}`,
-    `tar xzf ${tarball} -C ${paths.release}`,
+    ...buildResetReleaseDir(paths),
+    `tar xzf ${tarball} -C "$TS_CLOUD_STAGED"`,
+    ...buildPromoteStagedRelease(paths),
     `rm -f ${tarball}`,
     ...preStart,
     ...buildActivateRelease(paths),

package/dist/deploy/index.js

@@ -32,7 +32,7 @@ import {
   synchronizeDashboardUsers,
   trackDashboardOperation,
   verifyStaticApiOrigin
-} from "../chunk-cz17nhnx.js";
+} from "../chunk-ff77qy0c.js";
 import {
   deleteStaticSite,
   deployStaticSite,
@@ -65,7 +65,7 @@ import {
   shipsARelease,
   siteInstallBase,
   validateDeploymentConfig
-} from "../chunk-sd9h1baj.js";
+} from "../chunk-vx2yva1a.js";
 import"../chunk-tq46tnxv.js";
 import"../chunk-703nkybg.js";
 import"../chunk-4cjrg98a.js";

package/dist/drivers/index.js

@@ -52,7 +52,7 @@ import {
   waitForCloudInit,
   waitForSsh,
   wrapCloudInitUserData
-} from "../chunk-sd9h1baj.js";
+} from "../chunk-vx2yva1a.js";
 import"../chunk-tq46tnxv.js";
 import"../chunk-703nkybg.js";
 import"../chunk-4cjrg98a.js";

package/dist/drivers/shared/releases.d.ts

@@ -43,6 +43,49 @@ export declare function releasePaths(base: string, releaseId: string): ReleasePa
  * `storage` tree and an empty shared `.env` so symlinks never dangle.
  */
 export declare function buildEnsureReleaseLayout(paths: ReleasePaths, sharedPaths?: readonly string[]): string[];
+/**
+ * Take the site's deploy lock for the rest of the script.
+ *
+ * Two deploys of one site used to be free to run at the same time, and they
+ * write to the same directories: the second one's `rm -rf releases/<id>` ran
+ * against a tree the first was still extracting into, which fails with
+ * "Directory not empty" — an error that reads like a permissions problem and
+ * is really a race. It happens more easily than it sounds, because a deploy
+ * whose *client* is interrupted keeps running on the box; the operator sees a
+ * dead terminal and re-runs.
+ *
+ * `flock` on a descriptor held by the shell serializes them, and the lock is
+ * released when the script exits however it exits. Waiting rather than failing
+ * outright, because the common case is a retry that is only a few seconds
+ * ahead of itself.
+ */
+export declare function buildDeployLock(paths: ReleasePaths, waitSeconds?: number): string[];
+/**
+ * Clear the release directory, unless it is the one currently being served.
+ *
+ * Re-deploying a release id that is already live — the same commit twice, a
+ * retry after an interrupted run — used to `rm -rf` the directory `current`
+ * points at, so the site was serving a half-deleted tree until the new
+ * extraction finished. The replacement is staged beside it and swapped in with
+ * two renames, which is atomic enough that no request lands mid-swap.
+ */
+export declare function buildResetReleaseDir(paths: ReleasePaths): string[];
+/**
+ * Set `TS_CLOUD_IS_LIVE` to "yes" when `current` resolves to this release.
+ *
+ * Both sides are resolved before comparing. Comparing a resolved `current`
+ * against the literal release path looks equivalent and is not: one symlinked
+ * ancestor anywhere above the site — `/var/www` moved onto a data volume, a
+ * `/tmp` that is really `/private/tmp` — makes the two spellings differ, the
+ * guard misses, and the branch it was guarding deletes the directory the site
+ * is being served from.
+ */
+export declare function buildIsReleaseLive(paths: ReleasePaths): string[];
+/**
+ * Move a staged release into place, if it was staged (see
+ * {@link buildResetReleaseDir}). A no-op when the deploy extracted directly.
+ */
+export declare function buildPromoteStagedRelease(paths: ReleasePaths): string[];
 /**
  * Symlink every shared path from `shared/` into the freshly checked-out release,
  * replacing whatever the checkout shipped (e.g. the repo's empty `storage`).

package/dist/index.js

@@ -285,7 +285,7 @@ import {
   volumeCapabilities,
   webhookEndpoint,
   zeroCapacity
-} from "./chunk-cz17nhnx.js";
+} from "./chunk-ff77qy0c.js";
 import {
   deleteStaticSite,
   deployStaticSite,
@@ -398,7 +398,7 @@ import {
   waitForCloudInit,
   waitForSsh,
   wrapCloudInitUserData
-} from "./chunk-sd9h1baj.js";
+} from "./chunk-vx2yva1a.js";
 import {
   ABTestManager,
   AI,