opticore-webapp 1.0.88 → 1.0.90

package/dist/index.cjs

@@ -31,7 +31,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   WebServer: () => WebServerCore,
-  envPath: () => envPath
+  envPath: () => envPath,
+  expressErrorHandler: () => expressErrorHandler
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -40,7 +41,7 @@ var path3 = __toESM(require("path"), 1);
 var import_node_process4 = __toESM(require("process"), 1);
 var import_cors = __toESM(require("cors"), 1);
 var import_opticore_catch_exception_error3 = require("opticore-catch-exception-error");
-var import_opticore_express2 = require("opticore-express");
+var import_opticore_express = require("opticore-express");
 var import_opticore_env_access2 = require("opticore-env-access");
 var import_opticore_http_response4 = require("opticore-http-response");
 var import_opticore_translator3 = require("opticore-translator");
@@ -50,15 +51,9 @@ var import_opticore_watcher = require("opticore-watcher");
 // src/core/handlers/eventProcess.handler.ts
 var import_node_process = __toESM(require("process"), 1);
 var import_node_events = __toESM(require("events"), 1);
-var import_opticore_express = require("opticore-express");
 var import_opticore_catch_exception_error = require("opticore-catch-exception-error");
 function eventProcessHandler(localeLanguage) {
-  const errorEmitter = new import_node_events.default();
-  const app = (0, import_opticore_express.express)();
   const serverListenEvent = new import_opticore_catch_exception_error.ServerListenEventError(localeLanguage);
-  errorEmitter.on(import_opticore_catch_exception_error.CEventNameError.error, (error) => {
-    serverListenEvent.listenerError(error);
-  });
   import_node_process.default.on(import_opticore_catch_exception_error.CEvent.beforeExit, (code) => {
     setTimeout(() => {
       serverListenEvent.processBeforeExit(code);
@@ -97,9 +92,16 @@ function eventProcessHandler(localeLanguage) {
   import_node_process.default.on(import_opticore_catch_exception_error.CEvent.sigterm, (signal) => {
     serverListenEvent.sigtermSignalReceived(signal);
   });
-  app.use((err, req, res, next) => {
-    serverListenEvent.expressErrorHandlingMiddleware(errorEmitter, err, req, res, next);
+}
+function expressErrorHandler(localeLanguage) {
+  const errorEmitter = new import_node_events.default();
+  const serverListenEvent = new import_opticore_catch_exception_error.ServerListenEventError(localeLanguage);
+  errorEmitter.on(import_opticore_catch_exception_error.CEventNameError.error, (error) => {
+    serverListenEvent.listenerError(error);
   });
+  return (err, req, res, next) => {
+    serverListenEvent.expressErrorHandlingMiddleware(errorEmitter, err, req, res, next);
+  };
 }
 
 // src/application/service/core.service.ts
@@ -519,7 +521,7 @@ function startHmrSupervisor(options) {
 // src/core/webServer.core.ts
 var WebServerCore = class {
   serverUtility;
-  expressApp = (0, import_opticore_express2.express)();
+  expressApp = (0, import_opticore_express.express)();
   container;
   localLanguage;
   loggerConfig;
@@ -538,10 +540,10 @@ var WebServerCore = class {
     this.localLanguage = paramsConstructor.localLanguage;
     this.environmentPath = paramsConstructor.environmentPath;
     this.container = new import_opticore_dependency_inject2.SContainer(paramsConstructor.localLanguage);
-    this.expressApp.use(import_opticore_express2.express.json());
-    this.expressApp.use(import_opticore_express2.express.raw());
-    this.expressApp.use(import_opticore_express2.express.text());
-    this.expressApp.use(import_opticore_express2.express.urlencoded({ extended: true }));
+    this.expressApp.use(import_opticore_express.express.json());
+    this.expressApp.use(import_opticore_express.express.raw());
+    this.expressApp.use(import_opticore_express.express.text());
+    this.expressApp.use(import_opticore_express.express.urlencoded({ extended: true }));
     this.expressApp.use((0, import_cors.default)(paramsConstructor.corsOriginOptions));
     this.serverListenEvent = new import_opticore_catch_exception_error3.ServerListenEventError(paramsConstructor.localLanguage);
     this.serverUtility = new CoreService(paramsConstructor.localLanguage, paramsConstructor.environmentPath, this.container);
@@ -615,8 +617,9 @@ var WebServerCore = class {
               this.registerDependencies(dependenciesProvider);
             }
             this.container.loadServices();
-            this.expressApp.use(import_opticore_express2.express.static(path3.join(import_node_process4.default.cwd(), "public/template")));
+            this.expressApp.use(import_opticore_express.express.static(path3.join(import_node_process4.default.cwd(), "public/template")));
             this.registerRoutes(routers);
+            this.expressApp.use(expressErrorHandler(this.localLanguage));
             const resolvedHmr = this.resolveHotReloadConfig();
             if (resolvedHmr !== null) {
               new import_opticore_watcher.HotReloadWatcher(resolvedHmr).attach(server);
@@ -630,10 +633,18 @@ var WebServerCore = class {
     }
   }
   /**
+   * No-ops when `serverWeb` is undefined: under the HMR supervisor
+   * (see `resolveHotReloadConfig()`/`startHmrSupervisor()`), `onStartServer()`
+   * returns early with no server in the parent process — the child process
+   * it spawns is the one that actually listens — so callers following the
+   * documented `onStartServer()` → `onListeningOnServerEvent(server!)` /
+   * `onRequestOnServerEvent(server!)` pattern would otherwise crash in the
+   * parent with "Cannot read properties of undefined (reading 'on')".
    *
    * @param serverWeb
    */
   onListeningOnServerEvent(serverWeb) {
+    if (!serverWeb) return;
     this.loadTranslationFiles();
     serverWeb.on(import_opticore_catch_exception_error3.CEventNameError.error, (err) => {
       this.serverListenEvent.onEventError(err);
@@ -646,10 +657,13 @@ var WebServerCore = class {
     });
   }
   /**
+   * No-ops when `serverWeb` is undefined — same HMR-supervisor-parent
+   * case documented on `onListeningOnServerEvent()`.
    *
    * @param serverWeb
    */
   onRequestOnServerEvent(serverWeb) {
+    if (!serverWeb) return;
     this.loadTranslationFiles();
     serverWeb.on(import_opticore_catch_exception_error3.CEventNameError.request, (req, res) => {
       (0, import_opticore_request_call_event.requestCallsEvent)(
@@ -760,5 +774,6 @@ var WebServerCore = class {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   WebServer,
-  envPath
+  envPath,
+  expressErrorHandler
 });

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import * as http from 'http';
 import { Server } from 'http';
 import { TFeatureRoutes } from 'opticore-router';
 import { TDependency } from 'opticore-dependency-inject';
-import { express } from 'opticore-express';
+import { express, ErrorRequestHandler } from 'opticore-express';
 import { LoggerCore } from 'opticore-logger';
 import { CorsOptions } from 'cors';
 import { HotReloadConfig } from 'opticore-watcher';
@@ -55,15 +55,24 @@ declare class WebServerCore {
      */
     onStartServer(routers: TFeatureRoutes[], databaseCallback: (env: any) => void, dependenciesProvider?: TDependency[]): Server<typeof http.IncomingMessage, typeof http.ServerResponse> | undefined;
     /**
+     * No-ops when `serverWeb` is undefined: under the HMR supervisor
+     * (see `resolveHotReloadConfig()`/`startHmrSupervisor()`), `onStartServer()`
+     * returns early with no server in the parent process — the child process
+     * it spawns is the one that actually listens — so callers following the
+     * documented `onStartServer()` → `onListeningOnServerEvent(server!)` /
+     * `onRequestOnServerEvent(server!)` pattern would otherwise crash in the
+     * parent with "Cannot read properties of undefined (reading 'on')".
      *
      * @param serverWeb
      */
-    onListeningOnServerEvent(serverWeb: Server): void;
+    onListeningOnServerEvent(serverWeb: Server | undefined): void;
     /**
+     * No-ops when `serverWeb` is undefined — same HMR-supervisor-parent
+     * case documented on `onListeningOnServerEvent()`.
      *
      * @param serverWeb
      */
-    onRequestOnServerEvent(serverWeb: Server): void;
+    onRequestOnServerEvent(serverWeb: Server | undefined): void;
     /**
      *
      * @private
@@ -115,6 +124,18 @@ declare class WebServerCore {
 
 declare const envPath: string;
 
+/**
+ * Express error-handling middleware. It must be mounted on the application that actually serves requests,
+ * AFTER its routes: an error-handling middleware only receives the errors of the middleware registered before it.
+ *
+ * (It used to be mounted on a throw-away `express()` instance created inside eventProcessHandler, so it never ran
+ * and every unhandled error — a malformed JSON body, for instance — fell through to Express's default handler,
+ * which prints the stack trace and file paths outside production.)
+ *
+ * The client gets a fixed message; the error itself is logged.
+ */
+declare function expressErrorHandler(localeLanguage: string): ErrorRequestHandler;
+
 type KernelModuleType = [any[], () => void];
 
-export { type KernelModuleType, WebServerCore as WebServer, envPath };
+export { type KernelModuleType, WebServerCore as WebServer, envPath, expressErrorHandler };

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import * as http from 'http';
 import { Server } from 'http';
 import { TFeatureRoutes } from 'opticore-router';
 import { TDependency } from 'opticore-dependency-inject';
-import { express } from 'opticore-express';
+import { express, ErrorRequestHandler } from 'opticore-express';
 import { LoggerCore } from 'opticore-logger';
 import { CorsOptions } from 'cors';
 import { HotReloadConfig } from 'opticore-watcher';
@@ -55,15 +55,24 @@ declare class WebServerCore {
      */
     onStartServer(routers: TFeatureRoutes[], databaseCallback: (env: any) => void, dependenciesProvider?: TDependency[]): Server<typeof http.IncomingMessage, typeof http.ServerResponse> | undefined;
     /**
+     * No-ops when `serverWeb` is undefined: under the HMR supervisor
+     * (see `resolveHotReloadConfig()`/`startHmrSupervisor()`), `onStartServer()`
+     * returns early with no server in the parent process — the child process
+     * it spawns is the one that actually listens — so callers following the
+     * documented `onStartServer()` → `onListeningOnServerEvent(server!)` /
+     * `onRequestOnServerEvent(server!)` pattern would otherwise crash in the
+     * parent with "Cannot read properties of undefined (reading 'on')".
      *
      * @param serverWeb
      */
-    onListeningOnServerEvent(serverWeb: Server): void;
+    onListeningOnServerEvent(serverWeb: Server | undefined): void;
     /**
+     * No-ops when `serverWeb` is undefined — same HMR-supervisor-parent
+     * case documented on `onListeningOnServerEvent()`.
      *
      * @param serverWeb
      */
-    onRequestOnServerEvent(serverWeb: Server): void;
+    onRequestOnServerEvent(serverWeb: Server | undefined): void;
     /**
      *
      * @private
@@ -115,6 +124,18 @@ declare class WebServerCore {
 
 declare const envPath: string;
 
+/**
+ * Express error-handling middleware. It must be mounted on the application that actually serves requests,
+ * AFTER its routes: an error-handling middleware only receives the errors of the middleware registered before it.
+ *
+ * (It used to be mounted on a throw-away `express()` instance created inside eventProcessHandler, so it never ran
+ * and every unhandled error — a malformed JSON body, for instance — fell through to Express's default handler,
+ * which prints the stack trace and file paths outside production.)
+ *
+ * The client gets a fixed message; the error itself is logged.
+ */
+declare function expressErrorHandler(localeLanguage: string): ErrorRequestHandler;
+
 type KernelModuleType = [any[], () => void];
 
-export { type KernelModuleType, WebServerCore as WebServer, envPath };
+export { type KernelModuleType, WebServerCore as WebServer, envPath, expressErrorHandler };

package/dist/index.js

@@ -3,7 +3,7 @@ import * as path3 from "path";
 import process6 from "process";
 import corsOrigin from "cors";
 import { CEventNameError as eventName2, ServerListenEventError as ServerListenEventError2 } from "opticore-catch-exception-error";
-import { express as express2 } from "opticore-express";
+import { express } from "opticore-express";
 import { getEnvironmentValue as getEnvironmentValue2 } from "opticore-env-access";
 import { HttpStatusCode as HttpStatusCode3 } from "opticore-http-response";
 import { TranslationLoader as TranslationLoader3 } from "opticore-translator";
@@ -13,15 +13,9 @@ import { HotReloadWatcher } from "opticore-watcher";
 // src/core/handlers/eventProcess.handler.ts
 import process2 from "process";
 import EventEmitter from "events";
-import { express } from "opticore-express";
 import { ServerListenEventError, CEventNameError as eventName, CEvent as event } from "opticore-catch-exception-error";
 function eventProcessHandler(localeLanguage) {
-  const errorEmitter = new EventEmitter();
-  const app = express();
   const serverListenEvent = new ServerListenEventError(localeLanguage);
-  errorEmitter.on(eventName.error, (error) => {
-    serverListenEvent.listenerError(error);
-  });
   process2.on(event.beforeExit, (code) => {
     setTimeout(() => {
       serverListenEvent.processBeforeExit(code);
@@ -60,9 +54,16 @@ function eventProcessHandler(localeLanguage) {
   process2.on(event.sigterm, (signal) => {
     serverListenEvent.sigtermSignalReceived(signal);
   });
-  app.use((err, req, res, next) => {
-    serverListenEvent.expressErrorHandlingMiddleware(errorEmitter, err, req, res, next);
+}
+function expressErrorHandler(localeLanguage) {
+  const errorEmitter = new EventEmitter();
+  const serverListenEvent = new ServerListenEventError(localeLanguage);
+  errorEmitter.on(eventName.error, (error) => {
+    serverListenEvent.listenerError(error);
   });
+  return (err, req, res, next) => {
+    serverListenEvent.expressErrorHandlingMiddleware(errorEmitter, err, req, res, next);
+  };
 }
 
 // src/application/service/core.service.ts
@@ -485,7 +486,7 @@ function startHmrSupervisor(options) {
 // src/core/webServer.core.ts
 var WebServerCore = class {
   serverUtility;
-  expressApp = express2();
+  expressApp = express();
   container;
   localLanguage;
   loggerConfig;
@@ -504,10 +505,10 @@ var WebServerCore = class {
     this.localLanguage = paramsConstructor.localLanguage;
     this.environmentPath = paramsConstructor.environmentPath;
     this.container = new SContainer2(paramsConstructor.localLanguage);
-    this.expressApp.use(express2.json());
-    this.expressApp.use(express2.raw());
-    this.expressApp.use(express2.text());
-    this.expressApp.use(express2.urlencoded({ extended: true }));
+    this.expressApp.use(express.json());
+    this.expressApp.use(express.raw());
+    this.expressApp.use(express.text());
+    this.expressApp.use(express.urlencoded({ extended: true }));
     this.expressApp.use(corsOrigin(paramsConstructor.corsOriginOptions));
     this.serverListenEvent = new ServerListenEventError2(paramsConstructor.localLanguage);
     this.serverUtility = new CoreService(paramsConstructor.localLanguage, paramsConstructor.environmentPath, this.container);
@@ -581,8 +582,9 @@ var WebServerCore = class {
               this.registerDependencies(dependenciesProvider);
             }
             this.container.loadServices();
-            this.expressApp.use(express2.static(path3.join(process6.cwd(), "public/template")));
+            this.expressApp.use(express.static(path3.join(process6.cwd(), "public/template")));
             this.registerRoutes(routers);
+            this.expressApp.use(expressErrorHandler(this.localLanguage));
             const resolvedHmr = this.resolveHotReloadConfig();
             if (resolvedHmr !== null) {
               new HotReloadWatcher(resolvedHmr).attach(server);
@@ -596,10 +598,18 @@ var WebServerCore = class {
     }
   }
   /**
+   * No-ops when `serverWeb` is undefined: under the HMR supervisor
+   * (see `resolveHotReloadConfig()`/`startHmrSupervisor()`), `onStartServer()`
+   * returns early with no server in the parent process — the child process
+   * it spawns is the one that actually listens — so callers following the
+   * documented `onStartServer()` → `onListeningOnServerEvent(server!)` /
+   * `onRequestOnServerEvent(server!)` pattern would otherwise crash in the
+   * parent with "Cannot read properties of undefined (reading 'on')".
    *
    * @param serverWeb
    */
   onListeningOnServerEvent(serverWeb) {
+    if (!serverWeb) return;
     this.loadTranslationFiles();
     serverWeb.on(eventName2.error, (err) => {
       this.serverListenEvent.onEventError(err);
@@ -612,10 +622,13 @@ var WebServerCore = class {
     });
   }
   /**
+   * No-ops when `serverWeb` is undefined — same HMR-supervisor-parent
+   * case documented on `onListeningOnServerEvent()`.
    *
    * @param serverWeb
    */
   onRequestOnServerEvent(serverWeb) {
+    if (!serverWeb) return;
     this.loadTranslationFiles();
     serverWeb.on(eventName2.request, (req, res) => {
       requestCallsEvent(
@@ -725,5 +738,6 @@ var WebServerCore = class {
 };
 export {
   WebServerCore as WebServer,
-  envPath
+  envPath,
+  expressErrorHandler
 };

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "opticore-webapp",
-    "version": "1.0.88",
+    "version": "1.0.90",
     "description": "wep server",
     "main": "dist/index.js",
     "module": "dist/index.mjs",
     "types": "dist/index.d.ts",
     "type": "module",
     "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1",
+        "test": "node --test test/*.test.mjs",
         "build": "tsup"
     },
     "files": [