@stacksjs/buddy 0.70.222 → 0.70.224

package/dist/commands/deploy.d.ts

@@ -76,6 +76,12 @@ export declare function loadTsCloudDeployApi(): Promise<typeof import('@stacksjs
  * port declaration is left alone.
  */
 export declare function shouldInjectManagementDashboard(tsCloudConfig: any): boolean;
+/**
+ * Read a tenant's existing shared-server pin without requiring provider API
+ * credentials. The pin contains only compute metadata and is sufficient for
+ * an SSH release to a box that the owner project already provisioned.
+ */
+export declare function resolvePersistedAttachTargetBox(tsCloudConfig: any, environment: string, cwd?: unknown): AttachedComputeBox | null;
 export declare function scrubLoopbackSitePortsForFirewall(tsCloudConfig: any): any;
 /**
  * Mail tenancy is an explicit deployment capability. The merged Stacks config
@@ -141,6 +147,12 @@ declare const log: {
   error: (...args: any[]) => unknown;
   debug: (...args: any[]) => void
 };
+declare interface AttachedComputeBox {
+  serverId: number
+  serverName: string
+  publicIp: string
+  publicIpv6?: string
+}
 /** What a mail-tenant reconcile resolved + provisioned, for the DNS step. */
 export declare interface MailTenantResult {
   domain: string

package/dist/commands/deploy.js

@@ -534,8 +534,8 @@ export function applyEnvironmentToSites(sites, environment, config) {
   return out;
 }
 async function deployToHetzner(tsCloudConfig, deployEnv, options) {
-  const verbose = options.verbose === !0, environment = deployEnv === "prod" ? "production" : deployEnv;
-  if (!(tsCloudConfig.hetzner?.apiToken || process.env.HCLOUD_TOKEN || process.env.HETZNER_API_TOKEN)) {
+  const verbose = options.verbose === !0, environment = deployEnv === "prod" ? "production" : deployEnv, apiToken = tsCloudConfig.hetzner?.apiToken || process.env.HCLOUD_TOKEN || process.env.HETZNER_API_TOKEN, persistedAttachBox = resolvePersistedAttachTargetBox(tsCloudConfig, environment);
+  if (!apiToken && !persistedAttachBox) {
     log.error("No Hetzner API token found. Set HCLOUD_TOKEN in your .env (or hetzner.apiToken in config/cloud.ts).");
     process.exit(ExitCode.FatalError);
   }
@@ -548,7 +548,7 @@ async function deployToHetzner(tsCloudConfig, deployEnv, options) {
   }
   const { createCloudDriver, deployAllComputeSites, ensureManagementDashboard, resolveSiteKind } = await loadTsCloudDeployApi();
   try {
-    await runHetznerDeploy({ tsCloudConfig, environment, verbose, docker: options.docker === !0, createCloudDriver, deployAllComputeSites, ensureManagementDashboard, resolveSiteKind, onlySite: options.site || void 0 });
+    await runHetznerDeploy({ tsCloudConfig, environment, verbose, docker: options.docker === !0, createCloudDriver, deployAllComputeSites, ensureManagementDashboard, resolveSiteKind, onlySite: options.site || void 0, persistedAttachBox });
   } catch (err) {
     log.error("Hetzner deploy failed:");
     console.error(err instanceof Error ? err.stack || err.message : err);
@@ -567,6 +567,27 @@ export async function loadTsCloudDeployApi() {
 export function shouldInjectManagementDashboard(tsCloudConfig) {
   return !tsCloudConfig.cloud?.attachTo;
 }
+export function resolvePersistedAttachTargetBox(tsCloudConfig, environment, cwd = process.cwd()) {
+  const owner = tsCloudConfig.cloud?.attachTo;
+  if (!owner)
+    return null;
+  const stackName = tsCloudConfig.project?.stackName || `${tsCloudConfig.project?.slug || "app"}-${environment}`, statePath = join(cwd, "storage", "cloud", "state", `${stackName}.json`);
+  if (!existsSync(statePath))
+    return null;
+  try {
+    const state = JSON.parse(readFileSync(statePath, "utf8"));
+    if (state.stackName !== stackName || typeof state.serverId !== "number" || typeof state.publicIp !== "string" || !state.publicIp.trim())
+      return null;
+    return {
+      serverId: state.serverId,
+      serverName: typeof state.serverName === "string" && state.serverName ? state.serverName : `${owner}-${environment}-app`,
+      publicIp: state.publicIp,
+      publicIpv6: typeof state.publicIpv6 === "string" ? state.publicIpv6 : void 0
+    };
+  } catch {
+    return null;
+  }
+}
 export function scrubLoopbackSitePortsForFirewall(tsCloudConfig) {
   const sites = tsCloudConfig?.sites;
   if (!sites)
@@ -665,7 +686,7 @@ async function startGithubDeployments(args) {
   return records;
 }
 async function runHetznerDeploy(args) {
-  const { tsCloudConfig, environment, verbose, docker, createCloudDriver, deployAllComputeSites, ensureManagementDashboard, resolveSiteKind, onlySite } = args, startTime = performance.now();
+  const { tsCloudConfig, environment, verbose, docker, createCloudDriver, deployAllComputeSites, ensureManagementDashboard, resolveSiteKind, onlySite, persistedAttachBox } = args, startTime = performance.now();
   console.log("");
   console.log("\uD83D\uDE80 Deploy \u2192 Hetzner Cloud");
   console.log("");
@@ -692,7 +713,7 @@ async function runHetznerDeploy(args) {
   const attachTo = tsCloudConfig.cloud?.attachTo;
   let ip, ipv6;
   if (attachTo) {
-    const box = await resolveAttachTargetBox(attachTo, environment);
+    const box = persistedAttachBox ?? await resolveAttachTargetBox(attachTo, environment);
     if (!box?.publicIp) {
       log.error(`Attach target '${attachTo}' has no reachable box for '${environment}'. Is '${attachTo}-${environment}-app' provisioned (by its owner)?`);
       process.exit(ExitCode.FatalError);

package/dist/commands/serve.d.ts

@@ -19,6 +19,7 @@ export declare function resolveUserPartialsPath(cwd?: unknown, configuredDir?: s
  * it {@link resolveUserPartialsPath} falls back to the conventions.
  */
 export declare function loadStxPartialsDir(cwd?: unknown): Promise<string | undefined>;
+export declare function startProductionServer(options?: { port?: string | number, verbose?: boolean }): Promise<void>;
 export declare function serve(buddy: CLI): void;
 /**
  * `buddy serve:api` — boot the production API server (bun-router routes).

package/dist/commands/serve.js

@@ -90,80 +90,81 @@ function resolveCsrfMiddlewarePath() {
     return vendored;
   }
 }
-export function serve(buddy) {
-  buddy.command("serve", "Start the production HTTP server (STX views + /api proxy + coming-soon/maintenance gate)").option("-p, --port <port>", "Port to listen on (defaults to PORT env or 3000)").option("--verbose", "Enable verbose output", { default: !1 }).action(async (options) => {
-    if (options?.port)
-      process.env.PORT = String(options.port);
-    process.env.APP_ENV = process.env.APP_ENV || "production";
-    const port = Number(process.env.PORT) || 3000, { config, overridesReady } = await import("@stacksjs/config");
-    await overridesReady;
-    const { injectGlobalAutoImports } = await import("@stacksjs/server");
-    await injectGlobalAutoImports();
-    let stxServe;
-    const serveCandidates = [
-      join(homedir(), "Code/Tools/stx/packages/bun-plugin/dist/serve.js"),
-      join(process.cwd(), "pantry/bun-plugin-stx/dist/serve.js")
-    ];
-    for (const entry of serveCandidates)
-      try {
-        if (existsSync(entry)) {
-          ({ serve: stxServe } = await import(entry));
-          break;
-        }
-      } catch {}
-    if (!stxServe)
-      ({ serve: stxServe } = await import("bun-plugin-stx/serve"));
-    const stxModule = await resolveVendoredStxModule(), { site: siteConfig, i18n: i18nConfig } = await loadStxSiteConfig(), userViewsPath = "resources/views", defaultsResources = resolveDefaultsResources(), defaultViewsPath = join(defaultsResources, "views"), userLayoutsPath = existsSync("resources/views/layouts") ? "resources/views/layouts" : "resources/layouts", userPartialsPath = resolveUserPartialsPath(process.cwd(), await loadStxPartialsDir()), apiBase = process.env.API_URL || `http://127.0.0.1:${Number(process.env.PORT_API) || config.ports?.api || 3008}`;
-    log.info(`Starting production server on port ${port}...`);
-    await stxServe({
-      patterns: [userViewsPath, defaultViewsPath],
-      port,
-      autoIncrementPort: !1,
-      reusePort: ["production", "staging", "development"].includes((process.env.APP_ENV || "").toLowerCase()),
-      componentsDir: join(defaultsResources, "components"),
-      layoutsDir: userLayoutsPath,
-      ...userPartialsPath && { partialsDir: userPartialsPath },
-      fallbackLayoutsDir: join(defaultsResources, "layouts"),
-      fallbackPartialsDir: defaultViewsPath,
-      quiet: options?.verbose !== !0,
-      ...stxModule && { stxModule },
-      ...i18nConfig && { i18n: i18nConfig },
-      ...siteConfig?.url && { site: siteConfig },
-      onRequest: async (req) => {
-        const { maintenanceGate, isApiBoundRequest, proxyToBackend } = await import("@stacksjs/server"), gated = await maintenanceGate(req);
-        if (gated)
-          return gated;
-        const url = new URL(req.url);
-        if (isApiBoundRequest(req, url.pathname))
-          try {
-            return await proxyToBackend(req, apiBase);
-          } catch (error) {
-            log.error(`API proxy to ${apiBase} failed: ${error.message}`);
-            return new Response("Bad Gateway", { status: 502 });
-          }
-        if (existsSync(join(process.cwd(), "resources/views/blog.stx"))) {
-          const { renderBlogFeed } = await import("@stacksjs/actions/blog"), feed = await renderBlogFeed(req);
-          if (feed)
-            return feed;
-        }
-        globalThis.__stxServeSearch = url.search;
-        globalThis.__stxServeCookies = parseCookies(req);
-        return;
-      },
-      onResponse: async (req, response) => {
-        const method = req.method.toUpperCase();
-        if (method !== "GET" && method !== "HEAD")
-          return;
+export async function startProductionServer(options) {
+  if (options?.port)
+    process.env.PORT = String(options.port);
+  process.env.APP_ENV = process.env.APP_ENV || "production";
+  const port = Number(process.env.PORT) || 3000, { config, overridesReady } = await import("@stacksjs/config");
+  await overridesReady;
+  const { injectGlobalAutoImports } = await import("@stacksjs/server");
+  await injectGlobalAutoImports();
+  let stxServe;
+  const serveCandidates = [
+    join(homedir(), "Code/Tools/stx/packages/bun-plugin/dist/serve.js"),
+    join(process.cwd(), "pantry/bun-plugin-stx/dist/serve.js")
+  ];
+  for (const entry of serveCandidates)
+    try {
+      if (existsSync(entry)) {
+        ({ serve: stxServe } = await import(entry));
+        break;
+      }
+    } catch {}
+  if (!stxServe)
+    ({ serve: stxServe } = await import("bun-plugin-stx/serve"));
+  const stxModule = await resolveVendoredStxModule(), { site: siteConfig, i18n: i18nConfig } = await loadStxSiteConfig(), userViewsPath = "resources/views", defaultsResources = resolveDefaultsResources(), defaultViewsPath = join(defaultsResources, "views"), userLayoutsPath = existsSync("resources/views/layouts") ? "resources/views/layouts" : "resources/layouts", userPartialsPath = resolveUserPartialsPath(process.cwd(), await loadStxPartialsDir()), apiBase = process.env.API_URL || `http://127.0.0.1:${Number(process.env.PORT_API) || config.ports?.api || 3008}`;
+  log.info(`Starting production server on port ${port}...`);
+  await stxServe({
+    patterns: [userViewsPath, defaultViewsPath],
+    port,
+    autoIncrementPort: !1,
+    reusePort: ["production", "staging", "development"].includes((process.env.APP_ENV || "").toLowerCase()),
+    componentsDir: join(defaultsResources, "components"),
+    layoutsDir: userLayoutsPath,
+    ...userPartialsPath && { partialsDir: userPartialsPath },
+    fallbackLayoutsDir: join(defaultsResources, "layouts"),
+    fallbackPartialsDir: defaultViewsPath,
+    quiet: options?.verbose !== !0,
+    ...stxModule && { stxModule },
+    ...i18nConfig && { i18n: i18nConfig },
+    ...siteConfig?.url && { site: siteConfig },
+    onRequest: async (req) => {
+      const { maintenanceGate, isApiBoundRequest, proxyToBackend } = await import("@stacksjs/server"), gated = await maintenanceGate(req);
+      if (gated)
+        return gated;
+      const url = new URL(req.url);
+      if (isApiBoundRequest(req, url.pathname))
         try {
-          const { seedCsrfCookieIfMissing } = await import(resolveCsrfMiddlewarePath());
-          return seedCsrfCookieIfMissing(req, response);
+          return await proxyToBackend(req, apiBase);
         } catch (error) {
-          log.debug(`CSRF cookie seeding skipped: ${error.message}`);
+          log.error(`API proxy to ${apiBase} failed: ${error.message}`);
+          return new Response("Bad Gateway", { status: 502 });
         }
+      if (existsSync(join(process.cwd(), "resources/views/blog.stx"))) {
+        const { renderBlogFeed } = await import("@stacksjs/actions/blog"), feed = await renderBlogFeed(req);
+        if (feed)
+          return feed;
       }
-    });
-    log.success(`Production server listening on http://0.0.0.0:${port}`);
+      globalThis.__stxServeSearch = url.search;
+      globalThis.__stxServeCookies = parseCookies(req);
+      return;
+    },
+    onResponse: async (req, response) => {
+      const method = req.method.toUpperCase();
+      if (method !== "GET" && method !== "HEAD")
+        return;
+      try {
+        const { seedCsrfCookieIfMissing } = await import(resolveCsrfMiddlewarePath());
+        return seedCsrfCookieIfMissing(req, response);
+      } catch (error) {
+        log.debug(`CSRF cookie seeding skipped: ${error.message}`);
+      }
+    }
   });
+  log.success(`Production server listening on http://0.0.0.0:${port}`);
+}
+export function serve(buddy) {
+  buddy.command("serve", "Start the production HTTP server (STX views + /api proxy + coming-soon/maintenance gate)").option("-p, --port <port>", "Port to listen on (defaults to PORT env or 3000)").option("--verbose", "Enable verbose output", { default: !1 }).action(startProductionServer);
 }
 export function serveApi(buddy) {
   buddy.command("serve:api", "Start the production API server (bun-router routes the frontend proxies /api to)").option("-p, --port <port>", "Port to listen on (defaults to PORT env or 3008)").action(async (options) => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/buddy",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.222",
+  "version": "0.70.224",
   "description": "Meet Buddy. The Stacks runtime.",
   "author": "Chris Breuer",
   "contributors": [
@@ -137,7 +137,7 @@
     "@stacksjs/ui": "^0.70.180",
     "@stacksjs/utils": "^0.70.180",
     "@stacksjs/validation": "^0.70.180",
-    "@stacksjs/ts-cloud": "^0.7.90",
+    "@stacksjs/ts-cloud": "^0.7.91",
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1",
     "ts-pantry": "^0.11.0"