@spfn/core 0.3.0-beta.2 → 0.3.0-beta.3

package/dist/server/index.js

@@ -11,11 +11,12 @@ import { setDefaultSafeFetchPolicy } from '@spfn/core/security';
 import { streamSSE } from 'hono/streaming';
 import { randomBytes, createHash } from 'crypto';
 import { Agent, setGlobalDispatcher } from 'undici';
-import { initDatabase, getDatabase, hasMigrationTargets, collectMigrationStatus, countPendingMigrations, pendingMigrationTargets, formatPendingMigrations, pendingMigrationsSummary, RUN_MIGRATIONS_HINT, migrationTargets, closeDatabase } from '@spfn/core/db';
+import { initDatabase, getDatabase, hasMigrationTargets, collectMigrationStatus, countPendingMigrations, pendingMigrationTargets, formatPendingMigrations, pendingMigrationsSummary, RUN_MIGRATIONS_HINT, closeDatabase, migrationTargets } from '@spfn/core/db';
 import { initCache, getCache, closeCache } from '@spfn/core/cache';
 import { serve } from '@hono/node-server';
 import PgBoss from 'pg-boss';
 import { networkInterfaces } from 'os';
+import { pathToFileURL } from 'url';
 
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -1076,6 +1077,11 @@ async function runMigrationBootGate(config, cwd = process.cwd()) {
   );
 }
 
+// src/server/namespace.ts
+var CORE_NAMESPACE = "/_core";
+var CORE_HEALTH_PATH = `${CORE_NAMESPACE}/health`;
+var LEGACY_HEALTH_PATH = "/health";
+
 // src/server/shutdown-manager.ts
 var DEFAULT_HOOK_TIMEOUT = 1e4;
 var DEFAULT_HOOK_ORDER = 100;
@@ -1308,7 +1314,7 @@ async function readMigrationHealth() {
     targets: migrationTargets(snapshot.status)
   };
 }
-function createHealthCheckHandler(detailed) {
+function createHealthCheckHandler(detailed, infrastructure) {
   return async (c) => {
     const shutdownManager = getShutdownManager();
     if (shutdownManager.isShuttingDown()) {
@@ -1322,23 +1328,29 @@ function createHealthCheckHandler(detailed) {
       timestamp: (/* @__PURE__ */ new Date()).toISOString()
     };
     if (detailed) {
+      const databaseDisabled = infrastructure?.database === false;
+      const redisDisabled = infrastructure?.redis === false;
       let dbStatus = "unknown";
       let dbError;
-      try {
-        const db = getDatabase();
+      if (databaseDisabled) {
+        dbStatus = "disabled";
+      } else {
         try {
-          await db.execute("SELECT 1");
-          dbStatus = "connected";
+          const db = getDatabase();
+          try {
+            await db.execute("SELECT 1");
+            dbStatus = "connected";
+          } catch (error) {
+            dbStatus = "error";
+            dbError = error instanceof Error ? error.message : String(error);
+          }
         } catch (error) {
-          dbStatus = "error";
-          dbError = error instanceof Error ? error.message : String(error);
+          dbStatus = "not_initialized";
+          dbError = "Database not available";
         }
-      } catch (error) {
-        dbStatus = "not_initialized";
-        dbError = "Database not available";
       }
-      const redis = getCache();
-      let redisStatus = redis ? "unknown" : "not_initialized";
+      const redis = redisDisabled ? null : getCache();
+      let redisStatus = redisDisabled ? "disabled" : redis ? "unknown" : "not_initialized";
       let redisError;
       if (redis) {
         try {
@@ -1438,7 +1450,7 @@ function buildStartupConfig(config, timeouts) {
   const middlewareConfig = config.middleware ?? {};
   const healthCheckConfig = config.healthCheck ?? {};
   const healthCheckEnabled = healthCheckConfig.enabled !== false;
-  const healthCheckPath = healthCheckConfig.path ?? "/health";
+  const healthCheckPath = healthCheckConfig.path;
   const healthCheckDetailed = healthCheckConfig.detailed ?? env.NODE_ENV === "development";
   return {
     middleware: {
@@ -1449,6 +1461,7 @@ function buildStartupConfig(config, timeouts) {
     },
     healthCheck: healthCheckEnabled ? {
       enabled: true,
+      corePath: CORE_HEALTH_PATH,
       path: healthCheckPath,
       detailed: healthCheckDetailed
     } : { enabled: false },
@@ -1512,9 +1525,12 @@ async function createAutoConfiguredApp(config) {
   if (Array.isArray(config?.use)) {
     config.use.forEach((mw) => app.use("*", mw));
   }
-  registerHealthCheckEndpoint(app, config);
+  registerCoreHealthEndpoint(app, config);
   await executeBeforeRoutesHook(app, config);
-  await loadAppRoutes(app, config);
+  const appRoutes = await loadAppRoutes(app, config);
+  registerMovedHealthSignpost(app, config, appRoutes);
+  warnOnShadowedOptInPath(config, appRoutes);
+  warnOnCoreNamespaceRoutes(appRoutes);
   await registerSSEEndpoint(app, config);
   await executeAfterRoutesHook(app, config);
   if (enableErrorHandler) {
@@ -1555,7 +1571,10 @@ async function applyProxyGuard(app, config) {
       serverLogger.warn("Proxy-guard nonce: cache module unavailable \u2014 using in-memory store (single instance only)");
     }
   }
-  const autoSkip = [config?.healthCheck?.path ?? "/health"];
+  const autoSkip = [CORE_HEALTH_PATH, LEGACY_HEALTH_PATH];
+  if (config?.healthCheck?.path) {
+    autoSkip.push(config.healthCheck.path);
+  }
   if (config?.events) {
     autoSkip.push(config.eventsConfig?.path ?? "/events/stream");
   }
@@ -1598,15 +1617,75 @@ function applyOutboundFetch(config) {
   const policy = config?.outboundFetch ?? { blockPrivateIps: env.SAFE_FETCH_BLOCK_PRIVATE_IPS };
   setDefaultSafeFetchPolicy(policy);
 }
-function registerHealthCheckEndpoint(app, config) {
+function resolveHealthCheck(config) {
   const healthCheckConfig = config?.healthCheck ?? {};
-  const healthCheckEnabled = healthCheckConfig.enabled !== false;
-  const healthCheckPath = healthCheckConfig.path ?? "/health";
-  const healthCheckDetailed = healthCheckConfig.detailed ?? process.env.NODE_ENV === "development";
-  if (healthCheckEnabled) {
-    app.get(healthCheckPath, createHealthCheckHandler(healthCheckDetailed));
-    serverLogger.debug(`Health check endpoint enabled at ${healthCheckPath}`);
+  return {
+    enabled: healthCheckConfig.enabled !== false,
+    // No default. An unset `path` means the endpoint answers at
+    // CORE_HEALTH_PATH and nowhere else — a default here is what used to put
+    // it on /health without anyone asking.
+    path: healthCheckConfig.path,
+    detailed: healthCheckConfig.detailed ?? process.env.NODE_ENV === "development"
+  };
+}
+function registerCoreHealthEndpoint(app, config) {
+  const { enabled, path, detailed } = resolveHealthCheck(config);
+  if (!enabled) {
+    return;
+  }
+  const handler = createHealthCheckHandler(detailed, config?.infrastructure);
+  app.get(CORE_HEALTH_PATH, handler);
+  serverLogger.debug(`Health check endpoint enabled at ${CORE_HEALTH_PATH}`);
+  if (path && path !== CORE_HEALTH_PATH) {
+    app.get(path, handler);
+    serverLogger.debug(`Health check endpoint also answering at ${path}, as configured`);
+  }
+}
+function registerMovedHealthSignpost(app, config, appRoutes) {
+  const { enabled, path } = resolveHealthCheck(config);
+  if (!enabled || path === LEGACY_HEALTH_PATH) {
+    return;
+  }
+  if (appRoutes.some((r) => r.method === "GET" && r.path === LEGACY_HEALTH_PATH)) {
+    return;
+  }
+  let warned2 = false;
+  app.get(LEGACY_HEALTH_PATH, (c) => {
+    if (!warned2) {
+      warned2 = true;
+      serverLogger.warn(
+        `\u26A0\uFE0F  GET ${LEGACY_HEALTH_PATH} is answering 410: @spfn/core no longer serves it. Point your readiness probe, Dockerfile HEALTHCHECK and load balancer at ${CORE_HEALTH_PATH}, or restore this path with healthCheck({ path: '${LEGACY_HEALTH_PATH}' }). This notice is removed in the next release.`
+      );
+    }
+    return c.json({
+      error: "health endpoint moved",
+      movedTo: CORE_HEALTH_PATH,
+      detail: `@spfn/core no longer serves ${LEGACY_HEALTH_PATH}. Point your readiness probe, Dockerfile HEALTHCHECK and load balancer at ${CORE_HEALTH_PATH}, or restore this path with healthCheck({ path: '${LEGACY_HEALTH_PATH}' }).`
+    }, 410);
+  });
+}
+function warnOnShadowedOptInPath(config, appRoutes) {
+  const { enabled, path } = resolveHealthCheck(config);
+  if (!enabled || !path || path === CORE_HEALTH_PATH) {
+    return;
+  }
+  const shadowed = appRoutes.filter((r) => r.method === "GET" && r.path === path);
+  if (shadowed.length === 0) {
+    return;
+  }
+  serverLogger.warn(
+    `\u26A0\uFE0F  ${shadowed.map((r) => r.name).join(", ")} never runs: GET ${path} is served by the built-in health endpoint, which healthCheck({ path }) asked for and which is registered before app routes. Drop that option, or move the route to a path your app owns.`
+  );
+}
+function warnOnCoreNamespaceRoutes(appRoutes) {
+  const inside = appRoutes.filter((r) => r.path === CORE_NAMESPACE || r.path.startsWith(`${CORE_NAMESPACE}/`));
+  if (inside.length === 0) {
+    return;
   }
+  const names = inside.map((r) => `${r.name} (${r.method} ${r.path})`).join(", ");
+  serverLogger.warn(
+    `\u26A0\uFE0F  ${names} never runs: ${CORE_NAMESPACE}/ belongs to @spfn/core and its endpoints are registered before app routes. Move the route to a path your app owns.`
+  );
 }
 async function executeBeforeRoutesHook(app, config) {
   if (config?.lifecycle?.beforeRoutes) {
@@ -1618,9 +1697,12 @@ async function loadAppRoutes(app, config) {
   if (config?.routes) {
     const routes = registerRoutes(app, config.routes, config.middlewares);
     logRegisteredRoutes(routes, debug);
-  } else if (debug) {
+    return routes;
+  }
+  if (debug) {
     serverLogger.warn("\u26A0\uFE0F  No routes configured. Use defineServerConfig().routes() to register routes.");
   }
+  return [];
 }
 function logRegisteredRoutes(routes, debug) {
   if (routes.length === 0) {
@@ -2285,6 +2367,45 @@ function printBanner(options) {
   }
   console.log("");
 }
+var PORT_DEFAULTS = {
+  server: 8790
+};
+var HOST_DEFAULT = "localhost";
+var CONFIG_FILE_NAMES = [
+  "spfn.config.js",
+  "spfn.config.mjs"
+];
+async function loadAppConfig(cwd = process.cwd()) {
+  for (const fileName of CONFIG_FILE_NAMES) {
+    const fullPath = join(cwd, fileName);
+    if (!existsSync(fullPath)) {
+      continue;
+    }
+    try {
+      const module = await import(pathToFileURL(fullPath).href);
+      return module.default ?? {};
+    } catch (error) {
+      console.warn(
+        `\u26A0\uFE0F  ${fileName} could not be imported \u2014 falling back to defaults for ports and host. ${error instanceof Error ? error.message : String(error)}`
+      );
+      return {};
+    }
+  }
+  return {};
+}
+function resolveServerAddress(config, deprecated = {}, env6 = process.env) {
+  return {
+    port: readPort(env6.SPFN_PORT) ?? config.ports?.server ?? deprecated.port ?? PORT_DEFAULTS.server,
+    host: env6.SPFN_HOST || config.host || deprecated.host || HOST_DEFAULT
+  };
+}
+function readPort(value) {
+  if (!value) {
+    return void 0;
+  }
+  const port = Number(value);
+  return Number.isInteger(port) && port > 0 && port < 65536 ? port : void 0;
+}
 
 // src/server/validation.ts
 function validateServerConfig(config) {
@@ -2333,10 +2454,12 @@ var TIMEOUTS = {
   REDIS_CLOSE: 5e3};
 var CONFIG_FILE_PATHS = [
   ".spfn/server/server.config.mjs",
+  ".spfn/server/server.config.js",
   ".spfn/server/server.config",
   "src/server/server.config",
   "src/server/server.config.ts"
 ];
+var AUTHORED_CONFIG_PATH = "src/server/server.config.ts";
 var processHandlersRegistered = false;
 async function startServer(config) {
   loadEnv();
@@ -2400,8 +2523,7 @@ async function startServer(config) {
     throw error;
   }
 }
-async function loadAndMergeConfig(config) {
-  const cwd = process.cwd();
+async function loadAndMergeConfig(config, cwd = process.cwd()) {
   let fileConfig = {};
   let loadedConfigPath = null;
   for (const configPath of CONFIG_FILE_PATHS) {
@@ -2419,16 +2541,37 @@ async function loadAndMergeConfig(config) {
   }
   if (loadedConfigPath) {
     serverLogger.debug(`Loaded configuration from ${loadedConfigPath}`);
+  } else if (existsSync(join(cwd, AUTHORED_CONFIG_PATH))) {
+    serverLogger.warn(
+      `\u26A0\uFE0F  ${AUTHORED_CONFIG_PATH} exists but no configuration was loaded, so this server is running on defaults: no middlewares, no routes and no infrastructure settings from it. Run "spfn build" so the compiled config lands in .spfn/server/.`
+    );
   } else {
     serverLogger.debug("No configuration file found, using defaults");
   }
+  const appConfig = await loadAppConfig(cwd);
+  warnOnDeprecatedAddress(config, fileConfig);
+  const address = resolveServerAddress(appConfig, {
+    port: config?.port ?? fileConfig?.port,
+    host: config?.host ?? fileConfig?.host
+  });
   return {
     ...fileConfig,
     ...config,
-    port: config?.port ?? fileConfig?.port ?? env.PORT,
-    host: config?.host ?? fileConfig?.host ?? env.HOST
+    port: address.port,
+    host: address.host
   };
 }
+function warnOnDeprecatedAddress(config, fileConfig) {
+  const used = [
+    (config?.port ?? fileConfig?.port) !== void 0 ? ".port()" : null,
+    (config?.host ?? fileConfig?.host) !== void 0 ? ".host()" : null
+  ].filter(Boolean);
+  if (used.length > 0) {
+    serverLogger.warn(
+      `\u26A0\uFE0F  ${used.join(" and ")} in server.config is deprecated and will be removed. Move the address to spfn.config.js \u2014 \`ports: { next, server }\` and \`host\` \u2014 so the Dockerfile, the compose file and next.config can read the same value.`
+    );
+  }
+}
 function getInfrastructureConfig(config) {
   return {
     database: config.infrastructure?.database !== false,
@@ -3184,6 +3327,6 @@ function defineServerConfig() {
   return new ServerConfigBuilder();
 }
 
-export { PendingMigrationsError, createServer, createServerlessApp, defineServerConfig, getMigrationSnapshot, getShutdownManager, loadEnv, loadEnvFiles, provisionInfrastructure, resetMigrationSnapshot, resetServerlessApp, startServer };
+export { CORE_HEALTH_PATH, CORE_NAMESPACE, PendingMigrationsError, createServer, createServerlessApp, defineServerConfig, getMigrationSnapshot, getShutdownManager, loadEnv, loadEnvFiles, provisionInfrastructure, resetMigrationSnapshot, resetServerlessApp, startServer };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map