@stacksjs/ts-cloud 0.5.31 → 0.5.33

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

@@ -0,0 +1,57 @@
+/**
+ * App-framework drivers.
+ *
+ * ts-cloud runs a site's background work — the scheduler, queue workers, and
+ * daemons — as systemd units / cron on the box. HOW those are invoked differs
+ * per app framework: Stacks (Bun, `buddy …`) vs Laravel (PHP, `artisan …`), and
+ * the runtime environment a systemd/cron process needs differs too (bun on PATH
+ * vs pantry's php env). This module isolates those differences behind one small
+ * driver so the reconciler (`app-services.ts`) stays framework-agnostic.
+ *
+ * Stacks-first: `getAppFrameworkDriver()` defaults to the Stacks driver.
+ */
+import type { QueueWorkerConfig, SiteConfig } from '@ts-cloud/core';
+export type FrameworkId = 'stacks' | 'laravel';
+/**
+ * Resolve which framework driver a site uses. An explicit `framework` wins; a
+ * PHP-oriented `type` (laravel/php/statamic/wordpress) implies Laravel for
+ * backward compatibility; everything else uses the Stacks-first default.
+ */
+export declare function resolveSiteFramework(site: Pick<SiteConfig, 'framework' | 'type'>): FrameworkId;
+export interface FrameworkExecContext {
+    /** The active-release directory (`/var/www/<site>/current`). */
+    current: string;
+}
+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).
+     */
+    wrapExec: (command: string) => string;
+    /**
+     * 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.
+ */
+export declare const stacksDriver: AppFrameworkDriver;
+/** Laravel (PHP / Artisan) — the original Forge-style behavior, now a driver. */
+export declare const laravelDriver: AppFrameworkDriver;
+/** Resolve the app-framework driver for a site. Stacks-first default. */
+export declare function getAppFrameworkDriver(framework?: FrameworkId): AppFrameworkDriver;

package/dist/drivers/shared/{laravel-services.d.ts → app-services.d.ts}

@@ -1,8 +1,12 @@
 /**
- * Generate the per-site runtime services for a Forge-style PHP box: queue
- * workers / Horizon (systemd), the Laravel scheduler (cron), and arbitrary
- * daemons (systemd). Reconciled on every deploy so units track the config —
- * units no longer in the config are stopped and removed.
+ * Generate the per-site runtime services for a server-app box: queue workers
+ * (systemd), the app scheduler (cron), and arbitrary daemons (systemd).
+ * Reconciled on every deploy so units track the config — units no longer in the
+ * config are stopped and removed.
+ *
+ * HOW the scheduler + queue workers are invoked (Stacks/Bun vs Laravel/PHP) is
+ * delegated to an {@link AppFrameworkDriver} selected by `site.framework`
+ * (Stacks-first default). This file only owns unit/cron plumbing + pruning.
  *
  * Unit naming (so a site's units can be globbed for pruning):
  *   <slug>-<site>-queue-<i>.service
@@ -13,18 +17,21 @@
  * so workers/daemons always run the live code; `queue:restart` (run by the
  * deploy's $RESTART_QUEUES macro) cycles them onto the new release.
  */
-import type { DaemonConfig, SiteConfig } from '@ts-cloud/core';
+import type { SiteConfig } from '@ts-cloud/core';
 export interface SiteServicesOptions {
     slug: string;
     siteName: string;
     site: SiteConfig;
-    /** PHP version selecting the `phpX.Y` binary. @default '8.3' */
+    /** PHP version selecting the `phpX.Y` binary (Laravel only). @default '8.3' */
     phpVersion?: string;
     /** Site base dir. @default `/var/www/<siteName>` */
     appBase?: string;
 }
 export declare function queueUnitName(slug: string, siteName: string, index: number): string;
-export declare function daemonUnitName(slug: string, siteName: string, daemon: DaemonConfig, index: number): string;
+export declare function daemonUnitName(slug: string, siteName: string, daemon: {
+    name?: string;
+    command: string;
+}, index: number): string;
 /** Path of the scheduler cron file for a site. */
 export declare function schedulerCronPath(slug: string, siteName: string): string;
 /**

package/dist/index.js

@@ -87729,11 +87729,69 @@ function buildLaravelDeployScript(options) {
   return out;
 }
 
-// src/drivers/shared/laravel-services.ts
+// src/drivers/shared/app-frameworks.ts
+var PHP_SITE_TYPES2 = new Set(["laravel", "php", "statamic", "wordpress"]);
+function resolveSiteFramework(site) {
+  if (site.framework)
+    return site.framework;
+  if (site.type && PHP_SITE_TYPES2.has(site.type))
+    return "laravel";
+  return "stacks";
+}
 var PANTRY_ENV_EVAL = `eval "$(cd ${PANTRY_PROJECT_DIR} && pantry env 2>/dev/null)"`;
-function pantryExec(cmd) {
-  return `/bin/sh -lc '${PANTRY_ENV_EVAL}; exec ${cmd}'`;
+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,
+  schedulerMode: "daemon",
+  schedulerCommand: () => `${BUN_BIN} ${STACKS_CLI} schedule:run`,
+  queueWorkerCommand: (worker, { current }) => {
+    const flags = [
+      `--queue=${worker.queue || "default"}`,
+      `--sleep=${worker.sleep ?? 3}`,
+      `--tries=${worker.tries ?? 3}`,
+      `--timeout=${worker.timeout ?? 60}`
+    ];
+    return `${BUN_BIN} ${current}/${STACKS_CLI} queue:work ${flags.join(" ")}`;
+  }
+};
+var laravelDriver = {
+  id: "laravel",
+  wrapExec: (command) => `/bin/sh -lc '${PANTRY_ENV_EVAL}; exec ${command}'`,
+  schedulerMode: "cron",
+  schedulerCommand: ({ current }) => `cd ${current} && ${PANTRY_ENV_EVAL} && php artisan schedule:run`,
+  queueWorkerCommand: (worker, { current }) => {
+    const artisan = `${current}/artisan`;
+    if (worker.horizon)
+      return `php ${artisan} horizon`;
+    const flags = [
+      worker.connection || "default",
+      `--queue=${worker.queue || "default"}`,
+      `--sleep=${worker.sleep ?? 3}`,
+      `--tries=${worker.tries ?? 3}`,
+      `--timeout=${worker.timeout ?? 60}`,
+      `--memory=${worker.memory ?? 128}`
+    ];
+    if (worker.maxJobs)
+      flags.push(`--max-jobs=${worker.maxJobs}`);
+    if (worker.maxTime)
+      flags.push(`--max-time=${worker.maxTime}`);
+    return `php ${artisan} queue:work ${flags.join(" ")}`;
+  }
+};
+var DRIVERS = {
+  stacks: stacksDriver,
+  laravel: laravelDriver
+};
+function getAppFrameworkDriver(framework) {
+  return DRIVERS[framework] ?? stacksDriver;
 }
+
+// src/drivers/shared/app-services.ts
 function reEscape(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -87749,23 +87807,6 @@ function queueUnitName(slug, siteName, index) {
 function daemonUnitName(slug, siteName, daemon, index) {
   return `${slug}-${siteName}-daemon-${daemon.name ? slugify(daemon.name) : slugify(daemon.command).slice(0, 32) || String(index)}`;
 }
-function queueExecStart(worker, phpBin, artisan) {
-  if (worker.horizon)
-    return `${phpBin} ${artisan} horizon`;
-  const flags = [
-    worker.connection || "default",
-    `--queue=${worker.queue || "default"}`,
-    `--sleep=${worker.sleep ?? 3}`,
-    `--tries=${worker.tries ?? 3}`,
-    `--timeout=${worker.timeout ?? 60}`,
-    `--memory=${worker.memory ?? 128}`
-  ];
-  if (worker.maxJobs)
-    flags.push(`--max-jobs=${worker.maxJobs}`);
-  if (worker.maxTime)
-    flags.push(`--max-time=${worker.maxTime}`);
-  return `${phpBin} ${artisan} queue:work ${flags.join(" ")}`;
-}
 function systemdUnit(opts) {
   const lines = [
     "[Unit]",
@@ -87800,10 +87841,10 @@ function schedulerCronPath(slug, siteName) {
 }
 function buildSiteServicesScript(options) {
   const { slug, siteName, site } = options;
-  const phpBin = "php";
   const base = options.appBase ?? `/var/www/${siteName}`;
   const current = `${base}/current`;
-  const artisan = `${current}/artisan`;
+  const driver = getAppFrameworkDriver(resolveSiteFramework(site));
+  const ctx = { current };
   const out = [];
   const desiredUnits = [];
   const queues = site.queues || [];
@@ -87815,7 +87856,7 @@ function buildSiteServicesScript(options) {
       out.push(...writeUnitScript(name, systemdUnit({
         description: `${siteName} queue worker ${qIndex}.${p} (managed by ts-cloud)`,
         workingDir: current,
-        execStart: pantryExec(queueExecStart(worker, phpBin, artisan)),
+        execStart: driver.wrapExec(driver.queueWorkerCommand(worker, ctx)),
         stopWaitSecs: worker.stopWaitSecs ?? 90
       })));
     }
@@ -87829,23 +87870,32 @@ function buildSiteServicesScript(options) {
       out.push(...writeUnitScript(name, systemdUnit({
         description: `${siteName} daemon ${daemon.name || daemon.command} (managed by ts-cloud)`,
         workingDir: daemon.directory || current,
-        execStart: pantryExec(daemon.command),
+        execStart: driver.wrapExec(daemon.command),
         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))
+    })));
+  }
   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 = `cd ${current} && ${PANTRY_ENV_EVAL} && ${phpBin} artisan schedule:run >> /dev/null 2>&1`;
+    let command = `${driver.schedulerCommand(ctx)} >> /dev/null 2>&1`;
     if (heartbeat?.heartbeatUrl) {
       const method = heartbeat.heartbeatMethod || "GET";
       const methodFlag = method === "GET" ? "" : `-X ${method} `;
@@ -87992,12 +88042,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" }
     });
@@ -88063,6 +88113,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,
@@ -88071,7 +88122,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({