@stacksjs/ts-cloud 0.7.32 → 0.7.34

package/dist/{chunk-dah449r1.js → chunk-e6xhm3qe.js}

@@ -401,7 +401,14 @@ function vhostBody(options) {
   return lines;
 }
 function buildNginxVhost(options) {
-  const serverNames = [options.domain, ...options.aliases || []].filter(Boolean).join(" ");
+  const hosts = [options.domain, ...options.aliases || []].filter(Boolean);
+  for (const host of hosts) {
+    if (!/^(?=.{1,253}$)(?:\*\.)?[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$/i.test(host.trim()))
+      throw new Error(`Refusing to build a vhost: '${host}' is not a valid hostname.`);
+  }
+  if (!hosts.length)
+    throw new Error("Refusing to build a vhost: no server_name (domain) was given.");
+  const serverNames = hosts.join(" ");
   const body = vhostBody(options);
   if (options.ssl) {
     const redirect = [
@@ -1004,6 +1011,8 @@ function buildRpxProvisionScript(options) {
   const poolEnv = [`Environment=RPX_UPSTREAM_TIMEOUT=${upstreamTimeout}`];
   if (typeof proxy.maxUpstreamConns === "number")
     poolEnv.push(`Environment=RPX_MAX_UPSTREAM_CONNS=${proxy.maxUpstreamConns}`);
+  const memoryHigh = proxy.memoryHigh ?? "512M";
+  const memoryMax = proxy.memoryMax ?? "768M";
   return [
     "set -euo pipefail",
     `mkdir -p ${RPX_DIR} ${RPX_SITES_DIR} ${certsDir} ${RPX_INSTALL_DIR}`,
@@ -1028,6 +1037,10 @@ function buildRpxProvisionScript(options) {
       `WorkingDirectory=${RPX_INSTALL_DIR}`,
       `Environment=BUN_INSTALL=/root/.bun`,
       ...poolEnv,
+      "MemoryAccounting=true",
+      `MemoryHigh=${memoryHigh}`,
+      `MemoryMax=${memoryMax}`,
+      "OOMPolicy=stop",
       "Restart=always",
       "RestartSec=5",
       "LimitNOFILE=1048576",
@@ -1469,7 +1482,8 @@ function buildUbuntuBootstrapScript(options = {}) {
     servicesProvision,
     caddyfile,
     rpxProvision,
-    baked = false
+    baked = false,
+    swapGb = 2
   } = options;
   const packages = new Set(systemPackages);
   if (database === "sqlite")
@@ -1481,6 +1495,25 @@ function buildUbuntuBootstrapScript(options = {}) {
   let script = `#!/bin/bash
 set -euo pipefail
 `;
+  const swapSizeGb = Math.floor(swapGb);
+  if (swapSizeGb > 0) {
+    script += `
+# Swap: a swapless box under memory pressure lets the kernel OOM killer choose
+# victims box-wide (the gateway, a tenant app, postgres). A modest swapfile
+# with low swappiness gives the kernel headroom without hurting responsiveness.
+if ! swapon --show=NAME --noheadings 2>/dev/null | grep -qx '/swapfile'; then
+  if [ ! -f /swapfile ]; then
+    fallocate -l ${swapSizeGb}G /swapfile || dd if=/dev/zero of=/swapfile bs=1M count=${swapSizeGb * 1024} status=none
+    chmod 600 /swapfile
+    mkswap /swapfile >/dev/null
+  fi
+  swapon /swapfile
+fi
+grep -qE '^/swapfile\\s' /etc/fstab || echo '/swapfile none swap sw 0 0' >> /etc/fstab
+echo 'vm.swappiness=10' > /etc/sysctl.d/99-ts-cloud-swap.conf
+sysctl -w vm.swappiness=10 >/dev/null
+`;
+  }
   if (!baked) {
     script += `
 export DEBIAN_FRONTEND=noninteractive
@@ -2459,7 +2492,8 @@ class HetznerDriver {
       phpProvision: provision.phpProvision,
       servicesProvision: provision.servicesProvision,
       rpxProvision,
-      baked
+      baked,
+      swapGb: compute.swapGb
     });
     const userData = wrapCloudInitUserData(bootstrap);
     const serverType = resolveHetznerServerType(compute.size);
@@ -2530,7 +2564,7 @@ class HetznerDriver {
       { direction: "in", protocol: "tcp", port: "7700", source_ips: [network.ip_range] }
     ]);
     const servicesProvision = buildFleetServicesBoxProvision(config);
-    const servicesUserData = wrapCloudInitUserData(buildUbuntuBootstrapScript({ runtime: "php", servicesProvision, baked }));
+    const servicesUserData = wrapCloudInitUserData(buildUbuntuBootstrapScript({ runtime: "php", servicesProvision, baked, swapGb: compute.swapGb }));
     const all = await this.client.listServers().catch(() => []);
     const newServerIds = [];
     let svcServer = all.find((s) => matchesTsCloudLabels(s.labels, slug, environment, "services"));
@@ -2566,7 +2600,7 @@ class HetznerDriver {
       optimizeForProduction: compute.php?.optimizeForProduction,
       ini: compute.php?.ini
     });
-    const appUserData = wrapCloudInitUserData(buildUbuntuBootstrapScript({ runtime: "php", phpProvision: appPhp, servicesProvision: appProvision, baked }));
+    const appUserData = wrapCloudInitUserData(buildUbuntuBootstrapScript({ runtime: "php", phpProvision: appPhp, servicesProvision: appProvision, baked, swapGb: compute.swapGb }));
     const existingApp = all.filter((s) => matchesTsCloudLabels(s.labels, slug, environment, "app"));
     const appServerIds = existingApp.map((s) => s.id);
     if (existingApp.length > topology.appServers) {
@@ -2700,7 +2734,7 @@ class HetznerDriver {
         { direction: "in", protocol: "tcp", port: "7700", source_ips: [network.ip_range] }
       ]);
       const servicesProvision = buildFleetServicesBoxProvision(config);
-      const servicesUserData = wrapCloudInitUserData(buildUbuntuBootstrapScript({ runtime: "bun", servicesProvision, baked }));
+      const servicesUserData = wrapCloudInitUserData(buildUbuntuBootstrapScript({ runtime: "bun", servicesProvision, baked, swapGb: compute.swapGb }));
       let svcServer = all.find((s) => matchesTsCloudLabels(s.labels, slug, environment, "services"));
       if (!svcServer) {
         const { server, action } = await this.client.createServer({
@@ -2732,7 +2766,8 @@ class HetznerDriver {
       systemPackages: compute.systemPackages,
       database: config.infrastructure?.database,
       servicesProvision: appProvisionScripts.servicesProvision,
-      baked
+      baked,
+      swapGb: compute.swapGb
     }));
     const existingApp = all.filter((s) => matchesTsCloudLabels(s.labels, slug, environment, "app"));
     const appServerIds = existingApp.map((s) => s.id);
@@ -3712,7 +3747,7 @@ function buildRollbackScript(paths, options = {}) {
   return [
     ...flip,
     `TS_CLOUD_RB_ID=$(basename "$(readlink -f ${paths.current})")`,
-    `if [ -f /etc/systemd/system/${unitBase}@.service ]; then ` + `systemctl start "${unitBase}@\${TS_CLOUD_RB_ID}.service"; sleep 2; ` + `systemctl is-active --quiet "${unitBase}@\${TS_CLOUD_RB_ID}.service" || { echo "rolled-back release failed to start" >&2; exit 1; }; ` + `systemctl enable "${unitBase}@\${TS_CLOUD_RB_ID}.service" 2>/dev/null || true; ` + `systemctl list-units --plain --no-legend --type=service "${unitBase}@*.service" 2>/dev/null | awk '{print $1}' | grep -v "^${unitBase}@\${TS_CLOUD_RB_ID}.service$" | while read -r TS_CLOUD_U; do systemctl stop "$TS_CLOUD_U" 2>/dev/null || true; systemctl disable "$TS_CLOUD_U" 2>/dev/null || true; done; ` + `elif [ -f /etc/systemd/system/${unitBase}.service ]; then systemctl restart ${unitBase}.service; fi`
+    `if [ -f /etc/systemd/system/${unitBase}@.service ]; then ` + `systemctl start "${unitBase}@\${TS_CLOUD_RB_ID}.service"; sleep 2; ` + `systemctl is-active --quiet "${unitBase}@\${TS_CLOUD_RB_ID}.service" || { echo "rolled-back release failed to start" >&2; exit 1; }; ` + `systemctl enable "${unitBase}@\${TS_CLOUD_RB_ID}.service" 2>/dev/null || true; ` + `systemctl list-units --plain --no-legend --type=service "${unitBase}@*.service" 2>/dev/null | awk '{print $1}' | { grep -v "^${unitBase}@\${TS_CLOUD_RB_ID}.service$" || true; } | while read -r TS_CLOUD_U; do systemctl stop "$TS_CLOUD_U" 2>/dev/null || true; systemctl disable "$TS_CLOUD_U" 2>/dev/null || true; done; ` + `elif [ -f /etc/systemd/system/${unitBase}.service ]; then systemctl restart ${unitBase}.service; fi`
   ];
 }
 function buildPruneReleases(paths, keep = DEFAULT_KEEP_RELEASES) {
@@ -3842,7 +3877,7 @@ function buildSiteDeployScript(options) {
       ...buildActivateRelease(paths),
       `systemctl enable ${instance} 2>/dev/null || true`,
       `for TS_CLOUD_U in \${TS_CLOUD_OLD_UNITS}; do systemctl stop "$TS_CLOUD_U" 2>/dev/null || true; systemctl disable "$TS_CLOUD_U" 2>/dev/null || true; done`,
-      `systemctl list-unit-files --plain --no-legend "${unitBase}@*.service" 2>/dev/null | awk '{print $1}' | grep -v -e "^${instance}$" -e "^${unitBase}@\\.service$" | while read -r TS_CLOUD_U; do systemctl disable "$TS_CLOUD_U" 2>/dev/null || true; done`,
+      `systemctl list-unit-files --plain --no-legend "${unitBase}@*.service" 2>/dev/null | awk '{print $1}' | { grep -v -e "^${instance}$" -e "^${unitBase}@\\.service$" || true; } | while read -r TS_CLOUD_U; do systemctl disable "$TS_CLOUD_U" 2>/dev/null || true; done`,
       `if [ -f /etc/systemd/system/${serviceName} ]; then systemctl disable ${serviceName} 2>/dev/null || true; rm -f /etc/systemd/system/${serviceName}; systemctl daemon-reload; fi`,
       ...buildPruneReleases(paths, keepReleases)
     ];
@@ -3987,9 +4022,10 @@ function resolveDashboardAuth(cwd, username, logger) {
     writeFileSync(file, `${JSON.stringify({ username, password, generatedAt: new Date().toISOString() }, null, 2)}
 `);
     chmodSync(file, 384);
-    logger.info(`Management dashboard: generated a password and saved it to ${DASHBOARD_CREDENTIALS_FILE} (user: ${username}, pass: ${password}). Set TS_CLOUD_UI_PASSWORD to pin your own, or TS_CLOUD_UI_PUBLIC=1 to serve without auth.`);
+    logger.info(`Management dashboard: generated a password for '${username}' and saved it to ${DASHBOARD_CREDENTIALS_FILE} (read it there — it is not printed). Set TS_CLOUD_UI_PASSWORD to pin your own, or TS_CLOUD_UI_PUBLIC=1 to serve without auth.`);
   } catch (error) {
-    logger.warn(`Management dashboard: could not persist the generated password (${error?.message ?? error}). Using it for this deploy only — pass: ${password}`);
+    logger.warn(`Management dashboard: could not persist the generated password (${error?.message ?? error}). Using it for this deploy only — pass: ${password}
+This password is now in your deploy log. Set TS_CLOUD_UI_PASSWORD to a value of your own and redeploy once ${DASHBOARD_CREDENTIALS_FILE} is writable.`);
   }
   return { password, source: "generated" };
 }

package/dist/{chunk-jgenfdz6.js → chunk-jvp3s3na.js}

@@ -29,7 +29,7 @@ import {
   resolveSiteKind,
   resolveUiSource,
   siteInstallBase
-} from "./chunk-dah449r1.js";
+} from "./chunk-e6xhm3qe.js";
 import {
   artifactKey,
   composeServerlessAppTemplate,
@@ -12638,7 +12638,7 @@ function renderSiteSnippet(input) {
 `);
 }
 function escapeSingle(value) {
-  return value.replace(/\\/g, "\\\\").replaceAll(String.fromCharCode(39), "\\'");
+  return value.replace(/\\/g, "\\\\").replaceAll(String.fromCharCode(39), "\\'").replace(/\r/g, "\\r").replace(/\n/g, "\\n");
 }
 function normalizeSiteName(name) {
   const normalized = name.trim();
@@ -13405,6 +13405,8 @@ async function startLocalDashboardServer(options = {}) {
           }
           if (body.port !== undefined && body.port !== null && body.port !== "" && (!Number.isInteger(Number(body.port)) || Number(body.port) < 1 || Number(body.port) > 65535))
             return json({ ok: false, error: "Port must be a number between 1 and 65535." }, 422);
+          if (typeof body.domain === "string" && body.domain.trim() && !isValidHostname(body.domain.trim()))
+            return json({ ok: false, error: `Domain '${body.domain.trim()}' is not a valid hostname.` }, 422);
           let text2 = await readFile(configPath, "utf8");
           const set = (key, valueText) => {
             text2 = setSitePropertyInCloudConfig({ configText: text2, siteName: name, key, valueText });

package/dist/deploy/index.js

@@ -12,7 +12,7 @@ import {
   sanitizeCloudConfig,
   setMaintenance,
   startLocalDashboardServer
-} from "../chunk-jgenfdz6.js";
+} from "../chunk-jvp3s3na.js";
 import {
   buildAndPushServerlessImage
 } from "../chunk-tskj9fay.js";
@@ -30,7 +30,7 @@ import {
   resolveUiSource,
   siteInstallBase,
   validateDeploymentConfig
-} from "../chunk-dah449r1.js";
+} from "../chunk-e6xhm3qe.js";
 import"../chunk-stt1z5cx.js";
 import"../chunk-93hjhs78.js";
 import {

package/dist/drivers/index.js

@@ -50,7 +50,7 @@ import {
   waitForCloudInit,
   waitForSsh,
   wrapCloudInitUserData
-} from "../chunk-dah449r1.js";
+} from "../chunk-e6xhm3qe.js";
 import"../chunk-stt1z5cx.js";
 import"../chunk-93hjhs78.js";
 import"../chunk-qpj3edwz.js";

package/dist/drivers/shared/ubuntu-bootstrap.d.ts

@@ -47,6 +47,16 @@ export interface UbuntuBootstrapOptions {
      * boot near-instant. @default false
      */
     baked?: boolean;
+    /**
+     * Swapfile size in GB, from `compute.swapGb`. Small shared boxes run several
+     * tenants + services with no swap at all, so a memory spike (deploy, bun
+     * install, on-box builds) leaves the kernel OOM killer picking victims
+     * box-wide. Provisioned at the very top of the bootstrap — BEFORE the
+     * memory-hungry installs — on cold and baked boots alike (a golden image
+     * deliberately bakes no swap; see the image recipe). Idempotent: skipped
+     * when `/swapfile` is already active. `0` disables. @default 2
+     */
+    swapGb?: number;
 }
 /**
  * Build the Ubuntu provisioning bash script (with `#!/bin/bash` shebang).

package/dist/index.js

@@ -55,7 +55,7 @@ import {
   sanitizeCloudConfig,
   setMaintenance,
   startLocalDashboardServer
-} from "./chunk-jgenfdz6.js";
+} from "./chunk-jvp3s3na.js";
 import {
   buildAndPushServerlessImage
 } from "./chunk-tskj9fay.js";
@@ -105,7 +105,7 @@ import {
   waitForCloudInit,
   waitForSsh,
   wrapCloudInitUserData
-} from "./chunk-dah449r1.js";
+} from "./chunk-e6xhm3qe.js";
 import {
   ABTestManager,
   AI,