@stacksjs/ts-cloud 0.5.32 → 0.5.34

package/dist/drivers/shared/app-frameworks.d.ts

@@ -25,23 +25,36 @@ export interface FrameworkExecContext {
 export interface AppFrameworkDriver {
     readonly id: FrameworkId;
     /**
-     * Wrap a bare command so a systemd unit / cron entry runs it with the
-     * framework's runtime on PATH (systemd units inherit no shell env).
+     * Wrap a command for a systemd unit / cron entry. Prefer a BARE command +
+     * {@link AppFrameworkDriver.execEnv} (like the app's own service) so starting
+     * a long-lived unit over SSH doesn't hold the deploy channel open; only wrap
+     * in a shell when the env must be computed at runtime (e.g. Laravel/pantry).
      */
     wrapExec: (command: string) => string;
+    /** Static `Environment=` vars for a unit (systemd inherits no shell env). */
+    readonly execEnv?: Record<string, string>;
     /**
-     * The command cron runs every minute to fire due scheduled tasks. Includes
-     * its own env setup + output redirection; the reconciler may append a
-     * heartbeat ping with `&&`.
+     * How the app scheduler runs:
+     *  - `'cron'`   → `schedule:run` is one-shot; run it every minute via cron (Laravel).
+     *  - `'daemon'` → `schedule:run` is long-lived (holds in-process timers); run it
+     *                 as a single always-on systemd unit (Stacks).
+     */
+    readonly schedulerMode: 'cron' | 'daemon';
+    /**
+     * The scheduler command WITHOUT output redirection. For `'cron'` it is run
+     * from cron and sets up its own cwd/env; for `'daemon'` it becomes a unit's
+     * ExecStart (systemd supplies WorkingDirectory), so no `cd` is needed.
      */
     schedulerCommand: (ctx: FrameworkExecContext) => string;
     /** `ExecStart` for a single queue-worker process. */
     queueWorkerCommand: (worker: QueueWorkerConfig, ctx: FrameworkExecContext) => string;
 }
 /**
- * Stacks (Bun) — the default. The scheduler is cron-driven (`buddy schedule:run`
- * is one-shot); queue workers are long-running (`buddy queue:work`). bun lives
- * at an absolute path installed by the box bootstrap.
+ * Stacks (Bun) — the default. bun lives at an absolute path installed by the box
+ * bootstrap, so units use a BARE ExecStart (no shell wrapper) + `Environment=`
+ * for PATH/BUN_INSTALL — matching the app's own service. This matters: wrapping
+ * a long-lived unit in `/bin/sh -lc` makes `systemctl restart` over SSH hold the
+ * deploy channel open and hang the deploy.
  */
 export declare const stacksDriver: AppFrameworkDriver;
 /** Laravel (PHP / Artisan) — the original Forge-style behavior, now a driver. */

package/dist/index.js

@@ -87741,13 +87741,12 @@ function resolveSiteFramework(site) {
 var PANTRY_ENV_EVAL = `eval "$(cd ${PANTRY_PROJECT_DIR} && pantry env 2>/dev/null)"`;
 var BUN_BIN = "/usr/local/bin/bun";
 var STACKS_CLI = "storage/framework/core/buddy/src/cli.ts";
-function bunEnvWrap(command) {
-  return `/bin/sh -lc 'export PATH="/usr/local/bin:$PATH"; export BUN_INSTALL="/root/.bun"; exec ${command}'`;
-}
 var stacksDriver = {
   id: "stacks",
-  wrapExec: bunEnvWrap,
-  schedulerCommand: ({ current }) => `cd ${current} && ${BUN_BIN} ${STACKS_CLI} schedule:run >> /dev/null 2>&1`,
+  wrapExec: (command) => command,
+  execEnv: { PATH: "/usr/local/bin:/usr/bin:/bin", BUN_INSTALL: "/root/.bun" },
+  schedulerMode: "daemon",
+  schedulerCommand: () => `${BUN_BIN} ${STACKS_CLI} schedule:run`,
   queueWorkerCommand: (worker, { current }) => {
     const flags = [
       `--queue=${worker.queue || "default"}`,
@@ -87761,7 +87760,8 @@ var stacksDriver = {
 var laravelDriver = {
   id: "laravel",
   wrapExec: (command) => `/bin/sh -lc '${PANTRY_ENV_EVAL}; exec ${command}'`,
-  schedulerCommand: ({ current }) => `cd ${current} && ${PANTRY_ENV_EVAL} && php artisan schedule:run >> /dev/null 2>&1`,
+  schedulerMode: "cron",
+  schedulerCommand: ({ current }) => `cd ${current} && ${PANTRY_ENV_EVAL} && php artisan schedule:run`,
   queueWorkerCommand: (worker, { current }) => {
     const artisan = `${current}/artisan`;
     if (worker.horizon)
@@ -87814,6 +87814,7 @@ function systemdUnit(opts) {
     "[Service]",
     "Type=simple",
     `WorkingDirectory=${opts.workingDir}`,
+    ...Object.entries(opts.environment ?? {}).map(([k, v]) => `Environment="${k}=${v}"`),
     `ExecStart=${opts.execStart}`,
     `Restart=${opts.restart || "always"}`,
     "RestartSec=5"
@@ -87855,6 +87856,7 @@ function buildSiteServicesScript(options) {
         description: `${siteName} queue worker ${qIndex}.${p} (managed by ts-cloud)`,
         workingDir: current,
         execStart: driver.wrapExec(driver.queueWorkerCommand(worker, ctx)),
+        environment: driver.execEnv,
         stopWaitSecs: worker.stopWaitSecs ?? 90
       })));
     }
@@ -87869,22 +87871,33 @@ function buildSiteServicesScript(options) {
         description: `${siteName} daemon ${daemon.name || daemon.command} (managed by ts-cloud)`,
         workingDir: daemon.directory || current,
         execStart: driver.wrapExec(daemon.command),
+        environment: driver.execEnv,
         restart: daemon.restart,
         user: daemon.user
       })));
     }
   });
+  const scheduler2 = site.scheduler;
+  const schedulerEnabled = scheduler2 === true || typeof scheduler2 === "object" && scheduler2 !== null;
+  const schedulerUnit = `${slug}-${siteName}-scheduler`;
+  if (schedulerEnabled && driver.schedulerMode === "daemon") {
+    desiredUnits.push(schedulerUnit);
+    out.push(...writeUnitScript(schedulerUnit, systemdUnit({
+      description: `${siteName} scheduler (managed by ts-cloud)`,
+      workingDir: current,
+      execStart: driver.wrapExec(driver.schedulerCommand(ctx)),
+      environment: driver.execEnv
+    })));
+  }
   const desiredList = desiredUnits.map((n) => `${n}.service`).join(" ");
-  out.push("systemctl daemon-reload", `TS_CLOUD_DESIRED="${desiredList}"`, `for unit in $(ls /etc/systemd/system/ 2>/dev/null | grep -E '^${reEscape(slug)}-${reEscape(siteName)}-(queue|daemon)-.*\\.service$' || true); do`, '  case " $TS_CLOUD_DESIRED " in', '    *" $unit "*) ;;', '    *) systemctl stop "$unit" 2>/dev/null || true; systemctl disable "$unit" 2>/dev/null || true; rm -f "/etc/systemd/system/$unit" ;;', "  esac", "done", "systemctl daemon-reload");
+  out.push("systemctl daemon-reload", `TS_CLOUD_DESIRED="${desiredList}"`, `for unit in $(ls /etc/systemd/system/ 2>/dev/null | grep -E '^${reEscape(slug)}-${reEscape(siteName)}-((queue|daemon)-.*|scheduler)\\.service$' || true); do`, '  case " $TS_CLOUD_DESIRED " in', '    *" $unit "*) ;;', '    *) systemctl stop "$unit" 2>/dev/null || true; systemctl disable "$unit" 2>/dev/null || true; rm -f "/etc/systemd/system/$unit" ;;', "  esac", "done", "systemctl daemon-reload");
   for (const name of desiredUnits) {
     out.push(`systemctl enable ${name}.service`, `systemctl restart ${name}.service`);
   }
   const cronPath = schedulerCronPath(slug, siteName);
-  const scheduler2 = site.scheduler;
-  const schedulerEnabled = scheduler2 === true || typeof scheduler2 === "object" && scheduler2 !== null;
-  if (schedulerEnabled) {
+  if (schedulerEnabled && driver.schedulerMode === "cron") {
     const heartbeat = typeof scheduler2 === "object" && scheduler2 !== null ? scheduler2 : undefined;
-    let command = driver.schedulerCommand(ctx);
+    let command = `${driver.schedulerCommand(ctx)} >> /dev/null 2>&1`;
     if (heartbeat?.heartbeatUrl) {
       const method = heartbeat.heartbeatMethod || "GET";
       const methodFlag = method === "GET" ? "" : `-X ${method} `;
@@ -88031,12 +88044,12 @@ async function deploySiteRelease(driver, options, logger4 = noopLogger2) {
       security: site.security
     }) : [];
     const sslScript = useNginx ? buildSslScript(site) : [];
-    const servicesScript = siteHasServices(site) ? buildSiteServicesScript({ slug, siteName, site, phpVersion, appBase }) : [];
+    const servicesScript2 = siteHasServices(site) ? buildSiteServicesScript({ slug, siteName, site, phpVersion, appBase }) : [];
     const healthCheckScript = useNginx ? buildHealthCheckScript(site) : [];
     logger4.step(`Deploying PHP site '${siteName}' to ${targets.length} target(s)...`);
     const phpResult = await driver.runRemoteDeploy({
       targets,
-      commands: [...deployScript, ...poolScript, ...vhostScript, ...sslScript, ...servicesScript, ...healthCheckScript],
+      commands: [...deployScript, ...poolScript, ...vhostScript, ...sslScript, ...servicesScript2, ...healthCheckScript],
       comment: `ts-cloud deploy ${slug}/${siteName}@${sha}`,
       tags: { Project: slug, Environment: environment, Role: "app" }
     });
@@ -88102,6 +88115,7 @@ async function deploySiteRelease(driver, options, logger4 = noopLogger2) {
     security: site.security
   }) : [];
   const staticSsl = wantsNginxStatic ? buildSslScript(site) : [];
+  const servicesScript = siteHasServices(site) ? buildSiteServicesScript({ slug, siteName, site, appBase: `/var/www/${siteName}` }) : [];
   const remoteScript = [
     ...buildDeployHistoryHeader(`/var/www/${siteName}`, {
       releaseId: sha,
@@ -88110,7 +88124,8 @@ async function deploySiteRelease(driver, options, logger4 = noopLogger2) {
     }),
     ...baseScript,
     ...staticVhost,
-    ...staticSsl
+    ...staticSsl,
+    ...servicesScript
   ];
   logger4.step(`Deploying to ${targets.length} target(s)...`);
   const result = await driver.runRemoteDeploy({