tina4-nodejs 3.13.133 → 3.13.134

package/packages/core/src/server.ts

@@ -1941,6 +1941,57 @@ function startLoopbackSiblings(
   );
 }
 
+function startProductionCluster(port: number, host: string): {
+  close: () => void;
+  router: Router;
+  port: number;
+} {
+  const numCPUs = os.cpus().length;
+  const displayHost = host === "0.0.0.0" ? "localhost" : host;
+  const isTty = isatty(1);
+  const color = isTty ? "\x1b[32m" : "";
+  const reset = isTty ? "\x1b[0m" : "";
+  const logLevel = (process.env.TINA4_LOG_LEVEL ?? "DEBUG").toUpperCase();
+  if (!isBannerSuppressed()) {
+    const [swaggerLine] = bannerSurfaceLines(port, { swaggerEnabled: swaggerAdvertised(), devAdminEnabled: false });
+    console.log(`${color}
+  Tina4 Node.js v${TINA4_VERSION} — The Intelligent Native Application 4ramework
+
+  Server:    http://${displayHost}:${port} (cluster, ${numCPUs} workers)${swaggerLine}
+  Debug:     OFF (Log level: ${logLevel})
+${reset}`);
+  }
+  for (let i = 0; i < numCPUs; i++) cluster.fork();
+  cluster.on("exit", (worker, code) => {
+    if (code !== 0) {
+      console.log(`  Worker ${worker.process.pid} exited (code ${code}), restarting...`);
+      cluster.fork();
+    }
+  });
+  return {
+    close: () => {
+      stopAllBackgroundTasks();
+      for (const id in cluster.workers) cluster.workers[id]?.kill();
+    },
+    router: new Router(),
+    port,
+  };
+}
+
+function wireLocaleGlobal(frondEngine: any, base: string): void {
+  if (!frondEngine) return;
+  const localeDir = resolve(base, process.env.TINA4_LOCALE_DIR ?? "src/locales");
+  if (!existsSync(localeDir)) return;
+  try {
+    const localeFiles = readdirSync(localeDir).filter((file: string) => file.endsWith(".json"));
+    if (localeFiles.length === 0 || frondEngine.globals?.t) return;
+    const i18nInstance = new I18n(process.env.TINA4_LOCALE ?? "en", localeDir);
+    frondEngine.addGlobal("t", (key: string, params?: Record<string, string>) => i18nInstance.t(key, params));
+  } catch {
+    // Locale directory unreadable — skip auto-wire.
+  }
+}
+
 export async function startServer(config?: Tina4Config): Promise<{
   close: () => void;
   router: Router;
@@ -1986,62 +2037,8 @@ export async function startServer(config?: Tina4Config): Promise<{
   // Cluster mode for production: fork workers based on CPU count
   // Only when --production is explicitly set (via TINA4_PRODUCTION env var)
   const isProduction = (process.env.TINA4_PRODUCTION ?? "").toLowerCase() === "true";
-  if (cluster.isPrimary && isProduction) {
-    const numCPUs = os.cpus().length;
-    if (numCPUs > 1) {
-      const displayHost = host === "0.0.0.0" ? "localhost" : host;
-      const isTty = isatty(1);
-      const color = isTty ? "\x1b[32m" : "";
-      const reset = isTty ? "\x1b[0m" : "";
-      const logLevel = (process.env.TINA4_LOG_LEVEL ?? "DEBUG").toUpperCase();
-
-      if (!isBannerSuppressed()) {
-        // Only advertise a surface that is actually reachable (issue #99).
-        // Cluster mode is the production path: debug is OFF, so /__dev always
-        // 404s here and is never advertised; /swagger only when explicitly on.
-        // Cluster mode is the production path: debug is OFF, so /__dev never
-        // advertises here.
-        const [swaggerLine] = bannerSurfaceLines(port, {
-          swaggerEnabled: swaggerAdvertised(),
-          devAdminEnabled: false,
-        });
-        console.log(`${color}
-  ______ _             __ __
- /_  __/(_)___  ____ _/ // /
-  / /  / / __ \\/ __ \`/ // /_
- / /  / / / / / /_/ /__  __/
-/_/  /_/_/ /_/\\__,_/  /_/
-${reset}
-  Tina4 Node.js v${TINA4_VERSION} — The Intelligent Native Application 4ramework
-
-  Server:    http://${displayHost}:${port} (cluster, ${numCPUs} workers)${swaggerLine}
-  Debug:     OFF (Log level: ${logLevel})
-`);
-      }
-
-      for (let i = 0; i < numCPUs; i++) {
-        cluster.fork();
-      }
-
-      cluster.on("exit", (worker, code, _signal) => {
-        if (code !== 0) {
-          console.log(`  Worker ${worker.process.pid} exited (code ${code}), restarting...`);
-          cluster.fork();
-        }
-      });
-
-      // Return a handle that kills all workers
-      return {
-        close: () => {
-          stopAllBackgroundTasks();
-          for (const id in cluster.workers) {
-            cluster.workers[id]?.kill();
-          }
-        },
-        router: new Router(),
-        port,
-      };
-    }
+  if (cluster.isPrimary && isProduction && os.cpus().length > 1) {
+    return startProductionCluster(port, host);
   }
 
   const base = config?.basePath ? resolve(config.basePath) : process.cwd();
@@ -2112,20 +2109,7 @@ ${reset}
   }
 
   // Auto-wire i18n → template global t() when locale files exist
-  if (frondEngine) {
-    const localeDir = resolve(base, process.env.TINA4_LOCALE_DIR ?? "src/locales");
-    if (existsSync(localeDir)) {
-      try {
-        const localeFiles = readdirSync(localeDir).filter((f: string) => f.endsWith(".json"));
-        if (localeFiles.length > 0 && !frondEngine.globals?.t) {
-          const i18nInstance = new I18n(process.env.TINA4_LOCALE ?? "en", localeDir);
-          frondEngine.addGlobal("t", (key: string, params?: Record<string, string>) => i18nInstance.t(key, params));
-        }
-      } catch {
-        // Locale directory unreadable — skip auto-wire
-      }
-    }
-  }
+  wireLocaleGlobal(frondEngine, base);
 
   // Built-in middleware
   middleware.use(cors());
@@ -2166,119 +2150,8 @@ ${reset}
     console.log(`\n  \x1b[36mCSRF\x1b[0m protection enabled (TINA4_CSRF)`);
   }
 
-  // Initialize ORM if models directory exists (check src/orm/ first, then src/models/)
-  const hasOrmDir = existsSync(ormDir);
-  const hasModelsDir = existsSync(modelsDir);
-  if (hasOrmDir || hasModelsDir) {
-    try {
-      const orm = await import("../../orm/src/index.js");
-      const dbConfig = config?.database ?? {};
-      await orm.initDatabase({
-        type: dbConfig.type ?? "sqlite",
-        path: dbConfig.path ?? "./data/tina4.db",
-      });
-
-      // Discover from src/orm/ (primary) and src/models/ (fallback), merge results
-      let models = hasOrmDir ? await orm.discoverModels(ormDir) : [];
-      if (hasModelsDir) {
-        const extraModels = await orm.discoverModels(modelsDir);
-        // Only add models not already discovered (src/orm/ takes priority)
-        const existingTables = new Set(models.map((m: any) => m.definition.tableName));
-        for (const m of extraModels) {
-          if (!existingTables.has(m.definition.tableName)) {
-            models.push(m);
-          }
-        }
-      }
-      if (models.length > 0) {
-        console.log(`\n  Models discovered:`);
-        await orm.syncModels(models);
-        for (const { definition } of models) {
-          console.log(`    \x1b[35m${definition.tableName}\x1b[0m (${Object.keys(definition.fields).length} fields)`);
-        }
-
-        // Generate auto-CRUD routes ONLY for models that explicitly opted in via
-        // `static autoCrud = true` (the documented opt-in gate; default false). The
-        // server previously generated the 5 CRUD endpoints for every discovered model
-        // regardless of the flag, contradicting the documented contract. (Python's
-        // AutoCrud is opt-in too — via an explicit AutoCrud.register/discover call.)
-        const crudModels = orm.crudEligibleModels(models);
-        const crudRoutes = crudModels.length > 0 ? orm.generateCrudRoutes(crudModels) : [];
-        for (const route of crudRoutes) {
-          // Only add if no file-based route already handles this
-          const existing = router.match(route.method, route.pattern.replace(/\{(\w+)\}/g, "test").replace(/\[(\w+)\]/g, "test"));
-          if (!existing) {
-            router.addRoute(route);
-          }
-        }
-
-        if (crudRoutes.length > 0) {
-          console.log(`\n  Auto-CRUD endpoints:`);
-          for (const route of crudRoutes) {
-            console.log(`    \x1b[33m${route.method.padEnd(7)}\x1b[0m ${route.pattern}`);
-          }
-        }
-      }
-    } catch (err) {
-      console.warn(`\n  ORM not available (install @tina4/orm to enable):`, err);
-    }
-
-    // Auto-run pending migrations on startup — AFTER initDatabase()/model sync,
-    // BEFORE the server listens. Non-breaking: a failure is logged and boot
-    // continues (the helper never throws). Gated on a migrations/ dir + the
-    // TINA4_AUTO_MIGRATE flag (default on) + a resolvable DB adapter.
-    await autoMigrateOnStartup("migrations", base);
-  }
-
-  // Initialize Swagger — gated on TINA4_SWAGGER_ENABLED (default: enabled
-  // in debug mode, off in production). Loading the swagger module also
-  // pulls in route discovery for the generator, so skip the import entirely
-  // when disabled.
-  try {
-    const swagger = await import("../../swagger/src/index.js");
-    // Single source of truth for BOTH the gated routes and the bundled
-    // public/swagger assets (which static serving would otherwise expose).
-    swaggerAssetsEnabled = swagger.swaggerEnabled();
-    if (!swaggerAssetsEnabled) {
-      // Skip the rest of the swagger block when disabled.
-      throw new Error("__swagger_disabled__");
-    }
-
-    // Collect model definitions for schema generation
-    let modelDefs: Array<{ tableName: string; fields: Record<string, unknown> }> = [];
-    try {
-      const orm = await import("../../orm/src/index.js");
-      const allModelDirs = [ormDir, modelsDir].filter((d) => existsSync(d));
-      const seenTables = new Set<string>();
-      for (const dir of allModelDirs) {
-        const discovered = await orm.discoverModels(dir);
-        for (const m of discovered) {
-          if (!seenTables.has(m.definition.tableName)) {
-            modelDefs.push(m.definition);
-            seenTables.add(m.definition.tableName);
-          }
-        }
-      }
-    } catch {
-      // ORM not available, swagger will work without model schemas
-    }
-
-    // Read router.getRoutes() LIVE on every call — never a captured snapshot
-    // (SWAG-NODE-BOOT-SNAPSHOT, ADR-0004). This used to close over a
-    // boot-time `allRoutes` array, so the spec regenerated per request but
-    // over a FROZEN route list: a route registered after boot (hot-reload, or
-    // DevAdmin.register running after this block — see the /__feedback
-    // exclusion above) never appeared. Python/PHP/Ruby always read the live
-    // route table inside their generate() call; this is that same shape.
-    const getSpec = () => swagger.generate(router.getRoutes(), modelDefs as any);
-    const swaggerRoutes = swagger.createSwaggerRoutes(getSpec);
-    for (const route of swaggerRoutes) {
-      router.addRoute(route);
-    }
-  } catch {
-    // Swagger not available
-  }
-
+  await initializeOrm(config, router, base, ormDir, modelsDir);
+  swaggerAssetsEnabled = await configureSwagger(router, ormDir, modelsDir);
   // Register dev admin dashboard routes
   if (DevAdmin.isEnabled()) {
     DevAdmin.register(router);
@@ -2641,3 +2514,129 @@ ${reset}
     });
   });
 }
+async function initializeOrm(
+  config: Tina4Config | undefined,
+  router: Router,
+  base: string,
+  ormDir: string,
+  modelsDir: string,
+): Promise<void> {
+    // Initialize ORM if models directory exists (check src/orm/ first, then src/models/)
+    const hasOrmDir = existsSync(ormDir);
+    const hasModelsDir = existsSync(modelsDir);
+    if (hasOrmDir || hasModelsDir) {
+      try {
+        const orm = await import("../../orm/src/index.js");
+        const dbConfig = config?.database ?? {};
+        await orm.initDatabase({
+          type: dbConfig.type ?? "sqlite",
+          path: dbConfig.path ?? "./data/tina4.db",
+        });
+
+        // Discover from src/orm/ (primary) and src/models/ (fallback), merge results
+        let models = hasOrmDir ? await orm.discoverModels(ormDir) : [];
+        if (hasModelsDir) {
+          const extraModels = await orm.discoverModels(modelsDir);
+          // Only add models not already discovered (src/orm/ takes priority)
+          const existingTables = new Set(models.map((m: any) => m.definition.tableName));
+          for (const m of extraModels) {
+            if (!existingTables.has(m.definition.tableName)) {
+              models.push(m);
+            }
+          }
+        }
+        if (models.length > 0) {
+          console.log(`\n  Models discovered:`);
+          await orm.syncModels(models);
+          for (const { definition } of models) {
+            console.log(`    \x1b[35m${definition.tableName}\x1b[0m (${Object.keys(definition.fields).length} fields)`);
+          }
+
+          // Generate auto-CRUD routes ONLY for models that explicitly opted in via
+          // `static autoCrud = true` (the documented opt-in gate; default false). The
+          // server previously generated the 5 CRUD endpoints for every discovered model
+          // regardless of the flag, contradicting the documented contract. (Python's
+          // AutoCrud is opt-in too — via an explicit AutoCrud.register/discover call.)
+          const crudModels = orm.crudEligibleModels(models);
+          const crudRoutes = crudModels.length > 0 ? orm.generateCrudRoutes(crudModels) : [];
+          for (const route of crudRoutes) {
+            // Only add if no file-based route already handles this
+            const existing = router.match(route.method, route.pattern.replace(/\{(\w+)\}/g, "test").replace(/\[(\w+)\]/g, "test"));
+            if (!existing) {
+              router.addRoute(route);
+            }
+          }
+
+          if (crudRoutes.length > 0) {
+            console.log(`\n  Auto-CRUD endpoints:`);
+            for (const route of crudRoutes) {
+              console.log(`    \x1b[33m${route.method.padEnd(7)}\x1b[0m ${route.pattern}`);
+            }
+          }
+        }
+      } catch (err) {
+        console.warn(`\n  ORM not available (install @tina4/orm to enable):`, err);
+      }
+
+      // Auto-run pending migrations on startup — AFTER initDatabase()/model sync,
+      // BEFORE the server listens. Non-breaking: a failure is logged and boot
+      // continues (the helper never throws). Gated on a migrations/ dir + the
+      // TINA4_AUTO_MIGRATE flag (default on) + a resolvable DB adapter.
+      await autoMigrateOnStartup("migrations", base);
+    }
+
+}
+
+async function configureSwagger(router: Router, ormDir: string, modelsDir: string): Promise<boolean> {
+  let enabled = false;
+    // Initialize Swagger — gated on TINA4_SWAGGER_ENABLED (default: enabled
+    // in debug mode, off in production). Loading the swagger module also
+    // pulls in route discovery for the generator, so skip the import entirely
+    // when disabled.
+    try {
+      const swagger = await import("../../swagger/src/index.js");
+      // Single source of truth for BOTH the gated routes and the bundled
+      // public/swagger assets (which static serving would otherwise expose).
+      enabled = swagger.swaggerEnabled();
+      if (!swaggerAssetsEnabled) {
+        // Skip the rest of the swagger block when disabled.
+        throw new Error("__swagger_disabled__");
+      }
+
+      // Collect model definitions for schema generation
+      let modelDefs: Array<{ tableName: string; fields: Record<string, unknown> }> = [];
+      try {
+        const orm = await import("../../orm/src/index.js");
+        const allModelDirs = [ormDir, modelsDir].filter((d) => existsSync(d));
+        const seenTables = new Set<string>();
+        for (const dir of allModelDirs) {
+          const discovered = await orm.discoverModels(dir);
+          for (const m of discovered) {
+            if (!seenTables.has(m.definition.tableName)) {
+              modelDefs.push(m.definition);
+              seenTables.add(m.definition.tableName);
+            }
+          }
+        }
+      } catch {
+        // ORM not available, swagger will work without model schemas
+      }
+
+      // Read router.getRoutes() LIVE on every call — never a captured snapshot
+      // (SWAG-NODE-BOOT-SNAPSHOT, ADR-0004). This used to close over a
+      // boot-time `allRoutes` array, so the spec regenerated per request but
+      // over a FROZEN route list: a route registered after boot (hot-reload, or
+      // DevAdmin.register running after this block — see the /__feedback
+      // exclusion above) never appeared. Python/PHP/Ruby always read the live
+      // route table inside their generate() call; this is that same shape.
+      const getSpec = () => swagger.generate(router.getRoutes(), modelDefs as any);
+      const swaggerRoutes = swagger.createSwaggerRoutes(getSpec);
+      for (const route of swaggerRoutes) {
+        router.addRoute(route);
+      }
+    } catch {
+      // Swagger not available
+      }
+
+  return enabled;
+}