opticore-webapp 1.0.87 → 1.0.88

package/dist/index.cjs

@@ -462,6 +462,60 @@ var getEnvFileLoadingService = (filePath, localLanguage) => {
   }
 };
 
+// src/application/service/hmrSupervisor.service.ts
+var import_child_process = require("child_process");
+var import_ansi_colors2 = __toESM(require("ansi-colors"), 1);
+function startHmrSupervisor(options) {
+  let crashRestarts = 0;
+  let child = null;
+  let shuttingDown = false;
+  const spawnChild = () => {
+    child = (0, import_child_process.spawn)(
+      process.execPath,
+      [...process.execArgv, ...process.argv.slice(1)],
+      {
+        stdio: "inherit",
+        env: { ...process.env, OPTICORE_HMR_CHILD: "1" }
+      }
+    );
+    child.on("exit", (code, signal) => {
+      if (shuttingDown) return;
+      if (signal) {
+        return;
+      }
+      if (code === 0) {
+        spawnChild();
+        return;
+      }
+      if (!options.restartOnCrash || crashRestarts >= options.maxCrashRestarts) {
+        console.log(
+          `[${import_ansi_colors2.default.red("OptiCore HOT Reload")}] child crashed (exit code ${code}) \u2014 giving up after ${crashRestarts} restart(s).`
+        );
+        process.exit(code ?? 1);
+        return;
+      }
+      crashRestarts += 1;
+      console.log(
+        `[${import_ansi_colors2.default.red("OptiCore HOT Reload")}] child crashed (exit code ${code}) \u2014 restarting (${crashRestarts}/${options.maxCrashRestarts}).`
+      );
+      spawnChild();
+    });
+  };
+  const shutdown = (signal) => {
+    shuttingDown = true;
+    if (child && !child.killed) {
+      child.once("exit", () => process.exit(0));
+      child.kill(signal);
+      setTimeout(() => process.exit(0), 3e3).unref();
+    } else {
+      process.exit(0);
+    }
+  };
+  process.once("SIGINT", () => shutdown("SIGINT"));
+  process.once("SIGTERM", () => shutdown("SIGTERM"));
+  spawnChild();
+}
+
 // src/core/webServer.core.ts
 var WebServerCore = class {
   serverUtility;
@@ -524,6 +578,16 @@ var WebServerCore = class {
    * @param dependenciesProvider
    */
   onStartServer(routers, databaseCallback, dependenciesProvider) {
+    if (!import_node_process4.default.env.OPTICORE_HMR_CHILD) {
+      const resolvedHmr = this.resolveHotReloadConfig();
+      if (resolvedHmr !== null) {
+        startHmrSupervisor({
+          restartOnCrash: this.hotReloadCfg?.restartOnCrash ?? this.getEnvironmentValue.hmrAutoRestarts ?? true,
+          maxCrashRestarts: this.hotReloadCfg?.maxCrashRestarts ?? (this.getEnvironmentValue.hmrMaxRestarts > 0 ? this.getEnvironmentValue.hmrMaxRestarts : 5)
+        });
+        return;
+      }
+    }
     this.loadTranslationFiles();
     getEnvFileLoadingService(".env", this.localLanguage);
     if (this.getEnvironmentValue.appPort === "" && Number(this.getEnvironmentValue.appPort) === 0) {

package/dist/index.d.cts

@@ -17,10 +17,14 @@ interface WebServerConstructorInterface {
      * Enable hot reload in development mode.
      * - true          → use all defaults
      * - HotReloadConfig → custom configuration
-     * The watcher starts automatically when onStartServer() is called.
-     * On code changes the HTTP server is closed gracefully and the process
-     * exits (code 0) so your external runner restarts it:
-     *   tsx --watch src/index.ts  |  nodemon  |  node --watch dist/index.js
+     *
+     * `onStartServer()` runs the app under a built-in supervisor process
+     * when this is enabled: on code changes the HTTP server is closed
+     * gracefully, the process exits (code 0), and the supervisor
+     * immediately re-executes the same command — no external runner
+     * (nodemon, `tsx --watch`, `node --watch`, ...) is required. Running
+     * under one of those anyway still works; it just adds a redundant
+     * outer restart layer.
      */
     hotReload?: boolean | HotReloadConfig;
 }

package/dist/index.d.ts

@@ -17,10 +17,14 @@ interface WebServerConstructorInterface {
      * Enable hot reload in development mode.
      * - true          → use all defaults
      * - HotReloadConfig → custom configuration
-     * The watcher starts automatically when onStartServer() is called.
-     * On code changes the HTTP server is closed gracefully and the process
-     * exits (code 0) so your external runner restarts it:
-     *   tsx --watch src/index.ts  |  nodemon  |  node --watch dist/index.js
+     *
+     * `onStartServer()` runs the app under a built-in supervisor process
+     * when this is enabled: on code changes the HTTP server is closed
+     * gracefully, the process exits (code 0), and the supervisor
+     * immediately re-executes the same command — no external runner
+     * (nodemon, `tsx --watch`, `node --watch`, ...) is required. Running
+     * under one of those anyway still works; it just adds a redundant
+     * outer restart layer.
      */
     hotReload?: boolean | HotReloadConfig;
 }

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/core/webServer.core.ts
 import * as path3 from "path";
-import process5 from "process";
+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";
@@ -11,7 +11,7 @@ import { requestCallsEvent } from "opticore-request-call-event";
 import { HotReloadWatcher } from "opticore-watcher";
 
 // src/core/handlers/eventProcess.handler.ts
-import process from "process";
+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";
@@ -22,42 +22,42 @@ function eventProcessHandler(localeLanguage) {
   errorEmitter.on(eventName.error, (error) => {
     serverListenEvent.listenerError(error);
   });
-  process.on(event.beforeExit, (code) => {
+  process2.on(event.beforeExit, (code) => {
     setTimeout(() => {
       serverListenEvent.processBeforeExit(code);
     }, 100);
   });
-  process.on(event.disconnect, () => {
+  process2.on(event.disconnect, () => {
     serverListenEvent.processDisconnected();
   });
-  process.on(event.exit, (code) => {
+  process2.on(event.exit, (code) => {
     serverListenEvent.exited(code);
   });
-  process.on(event.rejectionHandled, (promise) => {
+  process2.on(event.rejectionHandled, (promise) => {
     serverListenEvent.promiseRejectionHandled(promise);
   });
-  process.on(event.uncaughtException, (error) => {
+  process2.on(event.uncaughtException, (error) => {
     serverListenEvent.uncaughtException(error);
   });
-  process.on(event.uncaughtExceptionMonitor, (error) => {
+  process2.on(event.uncaughtExceptionMonitor, (error) => {
     serverListenEvent.uncaughtExceptionMonitor(error);
   });
-  process.on(event.unhandledRejection, (reason, promise) => {
+  process2.on(event.unhandledRejection, (reason, promise) => {
     serverListenEvent.unhandledRejection(reason, promise);
   });
-  process.on(event.warning, (warning) => {
+  process2.on(event.warning, (warning) => {
     serverListenEvent.warning(warning);
   });
-  process.on(event.message, (message) => {
+  process2.on(event.message, (message) => {
     serverListenEvent.message(message);
   });
-  process.on(event.multipleResolves, (type, promise, reason) => {
+  process2.on(event.multipleResolves, (type, promise, reason) => {
     serverListenEvent.multipleResolves(type, promise, reason);
   });
-  process.on(event.sigint, () => {
+  process2.on(event.sigint, () => {
     serverListenEvent.processInterrupted();
   });
-  process.on(event.sigterm, (signal) => {
+  process2.on(event.sigterm, (signal) => {
     serverListenEvent.sigtermSignalReceived(signal);
   });
   app.use((err, req, res, next) => {
@@ -66,7 +66,7 @@ function eventProcessHandler(localeLanguage) {
 }
 
 // src/application/service/core.service.ts
-import process3 from "process";
+import process4 from "process";
 import chalk from "chalk";
 import * as path from "path";
 import * as fs from "fs";
@@ -76,8 +76,8 @@ import { TranslationLoader } from "opticore-translator";
 import { getEnvironmentValue } from "opticore-env-access";
 
 // src/utils/envPath.utils.ts
-import process2 from "process";
-var envPath = process2.cwd() + "/config/env/.env";
+import process3 from "process";
+var envPath = process3.cwd() + "/config/env/.env";
 
 // src/application/service/loaderTranslationFile.service.ts
 import { translationLoaderConfig } from "opticore-loader-translation";
@@ -169,7 +169,7 @@ var CoreService = class {
   getEnvFileLoading(filePath) {
     this.loadTranslationFiles();
     try {
-      const fullPath = path.resolve(process3.cwd(), filePath);
+      const fullPath = path.resolve(process4.cwd(), filePath);
       if (fs.existsSync(fullPath)) {
         const env = fs.readFileSync(fullPath, "utf-8");
         const lines = env.split("\n");
@@ -177,7 +177,7 @@ var CoreService = class {
           const match = line.match(/^([^#=]+)=([^#]+)$/);
           if (match) {
             const key = match[1].trim();
-            process3.env[key] = match[2].trim();
+            process4.env[key] = match[2].trim();
           }
         });
       }
@@ -195,7 +195,7 @@ var CoreService = class {
    * Returns an Object containing a node version, openssl, and v0
    */
   getVersions() {
-    const { node, openssl, v8 } = process3.versions;
+    const { node, openssl, v8 } = process4.versions;
     const data = {
       "node version": node,
       "openssl": openssl,
@@ -216,14 +216,14 @@ var CoreService = class {
    */
   getUsageMemory() {
     this.loadTranslationFiles();
-    const memoryData = process3.memoryUsage();
+    const memoryData = process4.memoryUsage();
     const data = {
       [TranslationLoader.t("totalMemoryAllocated", this.localLanguage)]: this.formatMemoryUsage(memoryData.rss),
       [TranslationLoader.t("sizeAllocatedHeap", this.localLanguage)]: this.formatMemoryUsage(memoryData.heapTotal),
       [TranslationLoader.t("memoryUsedExecution", this.localLanguage)]: this.formatMemoryUsage(memoryData.heapUsed),
       [TranslationLoader.t("externalMemory", this.localLanguage)]: this.formatMemoryUsage(memoryData.external),
-      [TranslationLoader.t("memoryUsageUser", this.localLanguage)]: this.formatMemoryUsage(process3.cpuUsage().user),
-      [TranslationLoader.t("memoryUsageSystem", this.localLanguage)]: this.formatMemoryUsage(process3.cpuUsage().system)
+      [TranslationLoader.t("memoryUsageUser", this.localLanguage)]: this.formatMemoryUsage(process4.cpuUsage().user),
+      [TranslationLoader.t("memoryUsageSystem", this.localLanguage)]: this.formatMemoryUsage(process4.cpuUsage().system)
     };
     return {
       "rss": data[TranslationLoader.t("totalMemoryAllocated", this.localLanguage)],
@@ -232,18 +232,18 @@ var CoreService = class {
       "external": data[TranslationLoader.t("externalMemory", this.localLanguage)],
       "user": data[TranslationLoader.t("memoryUsageUser", this.localLanguage)],
       "system": data[TranslationLoader.t("memoryUsageSystem", this.localLanguage)],
-      "pid": process3.pid
+      "pid": process4.pid
     };
   }
   /**
    * Return an Object containing a project path and running server time
    */
   getProjectInfo() {
-    const startTime = process3.hrtime();
-    const endTime = process3.hrtime(startTime);
+    const startTime = process4.hrtime();
+    const endTime = process4.hrtime(startTime);
     const executionTime = (endTime[0] * 1e9 + endTime[1]) / 1e6;
     return {
-      "projectPath": path.join(process3.cwd()),
+      "projectPath": path.join(process4.cwd()),
       "startingTime": `${executionTime.toFixed(5)} ms`
     };
   }
@@ -292,7 +292,7 @@ var CoreService = class {
       const maxLength = Math.max(...messages.map((m) => {
         return m.replace(/\u001b\[[0-9]{1,2}m/g, "").length;
       })) + 4;
-      console.log(chalk.blackBright(`${TranslationLoader.t("tailingServerLog", this.localLanguage)} (${path.join(path.basename(process3.cwd()), "logs", "app.log")})`));
+      console.log(chalk.blackBright(`${TranslationLoader.t("tailingServerLog", this.localLanguage)} (${path.join(path.basename(process4.cwd()), "logs", "app.log")})`));
       const border = chalk.bgGreen.white(" ".repeat(maxLength));
       console.log(border);
       messages.forEach((msg) => {
@@ -397,7 +397,7 @@ import { SContainer as SContainer2 } from "opticore-dependency-inject";
 
 // src/application/service/getEnvFileLoading.service.ts
 import path2 from "path";
-import process4 from "process";
+import process5 from "process";
 import fs2 from "fs";
 import { TranslationLoader as TranslationLoader2 } from "opticore-translator";
 import { HttpStatusCode as status2 } from "opticore-http-response";
@@ -405,7 +405,7 @@ var getEnvFileLoadingService = (filePath, localLanguage) => {
   loaderTranslationFile(localLanguage);
   const logger = dependenciesContainerProvider(localLanguage).resolve("LoggerCore");
   try {
-    const fullPath = path2.resolve(process4.cwd(), filePath);
+    const fullPath = path2.resolve(process5.cwd(), filePath);
     if (fs2.existsSync(fullPath)) {
       const env = fs2.readFileSync(fullPath, "utf-8");
       const lines = env.split("\n");
@@ -413,7 +413,7 @@ var getEnvFileLoadingService = (filePath, localLanguage) => {
         const match = line.match(/^([^#=]+)=([^#]+)$/);
         if (match) {
           const key = match[1].trim();
-          process4.env[key] = match[2].trim();
+          process5.env[key] = match[2].trim();
         }
       });
     }
@@ -428,6 +428,60 @@ var getEnvFileLoadingService = (filePath, localLanguage) => {
   }
 };
 
+// src/application/service/hmrSupervisor.service.ts
+import { spawn } from "child_process";
+import colors2 from "ansi-colors";
+function startHmrSupervisor(options) {
+  let crashRestarts = 0;
+  let child = null;
+  let shuttingDown = false;
+  const spawnChild = () => {
+    child = spawn(
+      process.execPath,
+      [...process.execArgv, ...process.argv.slice(1)],
+      {
+        stdio: "inherit",
+        env: { ...process.env, OPTICORE_HMR_CHILD: "1" }
+      }
+    );
+    child.on("exit", (code, signal) => {
+      if (shuttingDown) return;
+      if (signal) {
+        return;
+      }
+      if (code === 0) {
+        spawnChild();
+        return;
+      }
+      if (!options.restartOnCrash || crashRestarts >= options.maxCrashRestarts) {
+        console.log(
+          `[${colors2.red("OptiCore HOT Reload")}] child crashed (exit code ${code}) \u2014 giving up after ${crashRestarts} restart(s).`
+        );
+        process.exit(code ?? 1);
+        return;
+      }
+      crashRestarts += 1;
+      console.log(
+        `[${colors2.red("OptiCore HOT Reload")}] child crashed (exit code ${code}) \u2014 restarting (${crashRestarts}/${options.maxCrashRestarts}).`
+      );
+      spawnChild();
+    });
+  };
+  const shutdown = (signal) => {
+    shuttingDown = true;
+    if (child && !child.killed) {
+      child.once("exit", () => process.exit(0));
+      child.kill(signal);
+      setTimeout(() => process.exit(0), 3e3).unref();
+    } else {
+      process.exit(0);
+    }
+  };
+  process.once("SIGINT", () => shutdown("SIGINT"));
+  process.once("SIGTERM", () => shutdown("SIGTERM"));
+  spawnChild();
+}
+
 // src/core/webServer.core.ts
 var WebServerCore = class {
   serverUtility;
@@ -490,6 +544,16 @@ var WebServerCore = class {
    * @param dependenciesProvider
    */
   onStartServer(routers, databaseCallback, dependenciesProvider) {
+    if (!process6.env.OPTICORE_HMR_CHILD) {
+      const resolvedHmr = this.resolveHotReloadConfig();
+      if (resolvedHmr !== null) {
+        startHmrSupervisor({
+          restartOnCrash: this.hotReloadCfg?.restartOnCrash ?? this.getEnvironmentValue.hmrAutoRestarts ?? true,
+          maxCrashRestarts: this.hotReloadCfg?.maxCrashRestarts ?? (this.getEnvironmentValue.hmrMaxRestarts > 0 ? this.getEnvironmentValue.hmrMaxRestarts : 5)
+        });
+        return;
+      }
+    }
     this.loadTranslationFiles();
     getEnvFileLoadingService(".env", this.localLanguage);
     if (this.getEnvironmentValue.appPort === "" && Number(this.getEnvironmentValue.appPort) === 0) {
@@ -517,7 +581,7 @@ var WebServerCore = class {
               this.registerDependencies(dependenciesProvider);
             }
             this.container.loadServices();
-            this.expressApp.use(express2.static(path3.join(process5.cwd(), "public/template")));
+            this.expressApp.use(express2.static(path3.join(process6.cwd(), "public/template")));
             this.registerRoutes(routers);
             const resolvedHmr = this.resolveHotReloadConfig();
             if (resolvedHmr !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "opticore-webapp",
-    "version": "1.0.87",
+    "version": "1.0.88",
     "description": "wep server",
     "main": "dist/index.js",
     "module": "dist/index.mjs",