opticore-webapp 1.0.71 → 1.0.73

package/dist/index.cjs

@@ -30,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  HotReloadWatcher: () => HotReloadWatcher,
   WebServer: () => WebServerCore,
   envPath: () => envPath
 });
@@ -462,6 +461,7 @@ var getEnvFileLoadingService = (filePath, localLanguage) => {
 };
 
 // src/core/webServer.core.ts
+var import_opticore_watcher = require("opticore-watcher");
 var WebServerCore = class {
   serverUtility;
   expressApp = (0, import_opticore_express2.express)();
@@ -473,6 +473,7 @@ var WebServerCore = class {
   environmentPath;
   serverListenEvent;
   dependenciesRegistered = false;
+  hotReloadCfg;
   constructor(paramsConstructor) {
     this.loadTranslationFiles();
     this.stackTraceErrorHandling();
@@ -489,6 +490,8 @@ var WebServerCore = class {
     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);
+    const hr = paramsConstructor.hotReload;
+    this.hotReloadCfg = !hr ? null : hr === true ? {} : hr;
   }
   /**
    *
@@ -537,7 +540,7 @@ var WebServerCore = class {
         httpCodeValue: import_opticore_http_response4.HttpStatusCode.NOT_FOUND
       });
     } else {
-      return this.expressApp.listen(
+      const server = this.expressApp.listen(
         Number(this.getEnvironmentValue.appPort),
         () => {
           this.loadTranslationFiles();
@@ -549,11 +552,16 @@ var WebServerCore = class {
             this.container.loadServices();
             this.expressApp.use(import_opticore_express2.express.static(path3.join(import_node_process4.default.cwd(), "public/template")));
             this.registerRoutes(routers);
+            const resolvedHmr = this.resolveHotReloadConfig();
+            if (resolvedHmr !== null) {
+              new import_opticore_watcher.HotReloadWatcher(resolvedHmr).attach(server);
+            }
           } catch (err) {
             SServerStartError(err, this.environmentPath);
           }
         }
       );
+      return server;
     }
   }
   /**
@@ -597,6 +605,62 @@ var WebServerCore = class {
   loadTranslationFiles() {
     loaderTranslationFile(this.localLanguage);
   }
+  /**
+   * Resolve the final HotReloadConfig by merging constructor config with
+   * HMR environment variables.
+   *
+   * Priority (highest → lowest):
+   *   1. Constructor hotReload properties  (explicit code-level config)
+   *   2. HMR_* env variables               (runtime / per-environment config)
+   *   3. HotReloadWatcher internal defaults (built-in fallbacks)
+   *
+   * The watcher starts when:
+   *   - constructor passed hotReload: true | HotReloadConfig
+   *   - OR HMR_ENABLED=true in the .env file
+   */
+  resolveHotReloadConfig() {
+    const env = this.getEnvironmentValue;
+    if (this.hotReloadCfg === null && !env.hmrEnabled) {
+      return null;
+    }
+    const base = this.hotReloadCfg ?? {};
+    const envExtensions = this.hmrExtractExtensions(env.hmrWatchPatterns);
+    const envIgnore = this.hmrExtractIgnore(env.hmrIgnorePatterns);
+    return {
+      rootDir: base.rootDir,
+      watchDirs: base.watchDirs,
+      watchExtensions: base.watchExtensions ?? (envExtensions.length ? envExtensions : void 0),
+      ignore: base.ignore ?? (envIgnore.length ? envIgnore : void 0),
+      hotReloadExtensions: base.hotReloadExtensions,
+      debounceMs: base.debounceMs ?? (env.hmrDebounceMs > 0 ? env.hmrDebounceMs : void 0),
+      envFile: base.envFile
+    };
+  }
+  /**
+   * Extract file extensions from glob patterns such as "src/** /*.ts".
+   * "src/** /*.ts"
+   * ".env"     skipped, handled natively by the watcher
+   */
+  hmrExtractExtensions(patterns) {
+    const exts = /* @__PURE__ */ new Set();
+    for (const p of patterns) {
+      const m = p.match(/\*(\.[a-zA-Z0-9]+)$/);
+      if (m) {
+        exts.add(m[1]);
+      }
+    }
+    return [...exts];
+  }
+  /**
+   * Extract ignore names from glob patterns such as "node_modules/**".
+   * "node_modules/**" → "node_modules"
+   * "dist/**"         → "dist"
+   */
+  hmrExtractIgnore(patterns) {
+    return [...new Set(
+      patterns.map((p) => p.split("/")[0]).filter(Boolean)
+    )];
+  }
   /**
    *
    * @param allFeatureRoutes
@@ -628,400 +692,8 @@ var WebServerCore = class {
     );
   }
 };
-
-// src/hotReload/hotReload.watcher.ts
-var import_child_process = require("child_process");
-var import_fs2 = require("fs");
-var import_promises = require("fs/promises");
-var import_path2 = require("path");
-var import_dotenv = require("dotenv");
-var import_chalk2 = __toESM(require("chalk"), 1);
-var import_ansi_colors2 = __toESM(require("ansi-colors"), 1);
-var import_gradient_string = __toESM(require("gradient-string"), 1);
-var DEFAULT_WATCH_EXTENSIONS = [".ts", ".js", ".mjs", ".cjs", ".json"];
-var DEFAULT_HOT_RELOAD_EXTENSIONS = [".json"];
-var DEFAULT_IGNORE = [
-  "node_modules",
-  "dist",
-  ".git",
-  "package.json",
-  "package-lock.json",
-  ".idea",
-  ".vscode",
-  "coverage",
-  "logs"
-];
-var DEFAULT_DEBOUNCE_MS = 300;
-var DEFAULT_MAX_CRASH_RESTARTS = 5;
-var HotReloadWatcher = class {
-  cfg;
-  child = null;
-  watchers = [];
-  debounceTimer = null;
-  isRestarting = false;
-  crashRestartCount = 0;
-  started = false;
-  restartStart = 0;
-  constructor(config) {
-    this.cfg = {
-      entry: (0, import_path2.resolve)(config.entry),
-      runtime: config.runtime ?? "node",
-      runtimeArgs: config.runtimeArgs ?? [],
-      rootDir: (0, import_path2.resolve)(config.rootDir ?? process.cwd()),
-      watchDirs: config.watchDirs ?? [],
-      watchExtensions: config.watchExtensions ?? DEFAULT_WATCH_EXTENSIONS,
-      ignore: [...DEFAULT_IGNORE, ...config.ignore ?? []],
-      envFile: config.envFile ?? ".env",
-      hotReloadExtensions: config.hotReloadExtensions ?? DEFAULT_HOT_RELOAD_EXTENSIONS,
-      debounceMs: config.debounceMs ?? DEFAULT_DEBOUNCE_MS,
-      restartOnCrash: config.restartOnCrash ?? true,
-      maxCrashRestarts: config.maxCrashRestarts ?? DEFAULT_MAX_CRASH_RESTARTS
-    };
-  }
-  // ─── Public API ──────────────────────────────────────────────────────────
-  async start() {
-    if (this.started) return;
-    this.started = true;
-    this.printBanner();
-    this.spawnChild();
-    await this.setupWatchers();
-    this.setupProcessSignals();
-  }
-  async stop() {
-    this.watchers.forEach((w) => {
-      w.close();
-    });
-    this.watchers = [];
-    await this.killChild(true);
-    this.printStopped();
-  }
-  // ─── Child process management ────────────────────────────────────────────
-  spawnChild() {
-    const { entry, runtime, runtimeArgs } = this.cfg;
-    try {
-      this.child = runtime === "node" ? (0, import_child_process.fork)(entry, [], {
-        stdio: ["inherit", "inherit", "inherit", "ipc"],
-        env: process.env
-      }) : (0, import_child_process.spawn)(runtime, [...runtimeArgs, entry], {
-        stdio: "inherit",
-        env: process.env,
-        shell: false
-      });
-      this.child.on("exit", (code) => {
-        if (this.isRestarting) return;
-        if (code !== 0 && code !== null) {
-          this.printCrash(code);
-          if (this.cfg.restartOnCrash && this.crashRestartCount < this.cfg.maxCrashRestarts) {
-            this.crashRestartCount++;
-            this.printCrashRetry(this.crashRestartCount, this.cfg.maxCrashRestarts);
-            setTimeout(() => {
-              this.spawnChild();
-            }, 1e3);
-          } else if (this.crashRestartCount >= this.cfg.maxCrashRestarts) {
-            this.printCrashLimit(this.cfg.maxCrashRestarts);
-            process.exit(1);
-          }
-        }
-      });
-      this.child.on("error", (err) => {
-        this.printError(`Failed to start child process: ${err.message}`);
-      });
-    } catch (err) {
-      this.printError(`Cannot spawn '${runtime} ${entry}': ${err.message}`);
-      process.exit(1);
-    }
-  }
-  async killChild(silent = false) {
-    if (!this.child) return;
-    const child = this.child;
-    this.child = null;
-    await new Promise((done) => {
-      const forceKill = setTimeout(() => {
-        child.kill("SIGKILL");
-        done();
-      }, 3e3);
-      child.once("exit", () => {
-        clearTimeout(forceKill);
-        done();
-      });
-      child.kill("SIGTERM");
-    });
-  }
-  // ─── File watching ────────────────────────────────────────────────────────
-  async setupWatchers() {
-    const dirs = [
-      this.cfg.rootDir,
-      ...this.cfg.watchDirs.map((d) => (0, import_path2.resolve)(d))
-    ];
-    for (const dir of dirs) {
-      await this.watchDirectoryRecursive(dir);
-    }
-  }
-  async watchDirectoryRecursive(dir) {
-    if (this.shouldIgnoreDir(dir)) return;
-    try {
-      await (0, import_promises.access)(dir);
-    } catch {
-      return;
-    }
-    try {
-      const watcher = (0, import_fs2.watch)(dir, (event2, filename) => {
-        if (!filename) return;
-        this.onFileChange((0, import_path2.join)(dir, filename));
-      });
-      watcher.on("error", () => {
-      });
-      this.watchers.push(watcher);
-      const entries = await (0, import_promises.readdir)(dir, { withFileTypes: true });
-      for (const entry of entries) {
-        if (entry.isDirectory()) {
-          await this.watchDirectoryRecursive((0, import_path2.join)(dir, entry.name));
-        }
-      }
-    } catch {
-    }
-  }
-  // ─── Change handling ─────────────────────────────────────────────────────
-  onFileChange(filePath) {
-    if (this.shouldIgnoreFile(filePath)) return;
-    if (!this.isWatchedFile(filePath)) return;
-    const rel = (0, import_path2.relative)(this.cfg.rootDir, filePath);
-    if (this.isHotReloadable(filePath)) {
-      this.doHotReload(filePath, rel);
-    } else {
-      this.scheduleRestart(rel);
-    }
-  }
-  doHotReload(filePath, relativePath) {
-    if (this.isEnvFile(filePath)) {
-      (0, import_dotenv.config)({ path: filePath, override: true });
-      this.printHot(relativePath, "env variables reloaded");
-      this.sendIpc({ type: "hot-reload", file: relativePath, kind: "env" });
-    } else {
-      this.printHot(relativePath, "json config reloaded");
-      this.sendIpc({ type: "hot-reload", file: relativePath, kind: "json" });
-    }
-  }
-  scheduleRestart(relativePath) {
-    if (this.debounceTimer) clearTimeout(this.debounceTimer);
-    this.debounceTimer = setTimeout(async () => {
-      this.printReloading(relativePath);
-      this.restartStart = Date.now();
-      this.isRestarting = true;
-      this.crashRestartCount = 0;
-      await this.killChild(true);
-      this.isRestarting = false;
-      this.spawnChild();
-      this.printReady(Date.now() - this.restartStart);
-    }, this.cfg.debounceMs);
-  }
-  // ─── IPC ─────────────────────────────────────────────────────────────────
-  sendIpc(message) {
-    if (this.child && typeof this.child.send === "function") {
-      try {
-        this.child.send(message);
-      } catch {
-      }
-    }
-  }
-  // ─── Ignore / watch filters ───────────────────────────────────────────────
-  shouldIgnoreDir(dirPath) {
-    return this.cfg.ignore.some((p) => dirPath.includes(`/${p}`) || dirPath.endsWith(p));
-  }
-  shouldIgnoreFile(filePath) {
-    const name = (0, import_path2.basename)(filePath);
-    const rel = (0, import_path2.relative)(this.cfg.rootDir, filePath);
-    return this.cfg.ignore.some((p) => name === p || rel.includes(p) || filePath.includes(`/${p}/`));
-  }
-  isWatchedFile(filePath) {
-    if (this.isEnvFile(filePath)) return true;
-    return this.cfg.watchExtensions.includes((0, import_path2.extname)(filePath));
-  }
-  isHotReloadable(filePath) {
-    if (this.isEnvFile(filePath)) return true;
-    return this.cfg.hotReloadExtensions.includes((0, import_path2.extname)(filePath));
-  }
-  isEnvFile(filePath) {
-    const name = (0, import_path2.basename)(filePath);
-    return name === this.cfg.envFile || name.startsWith(".env");
-  }
-  // ─── ANSI strip helper (for width calculation) ────────────────────────────
-  strip(str) {
-    return str.replace(/\[[0-9;]*m/g, "").replace(/\][^]*/g, "");
-  }
-  // ─── Timestamp ────────────────────────────────────────────────────────────
-  ts() {
-    const n = /* @__PURE__ */ new Date();
-    const h = String(n.getHours()).padStart(2, "0");
-    const m = String(n.getMinutes()).padStart(2, "0");
-    const s = String(n.getSeconds()).padStart(2, "0");
-    return `${h}:${m}:${s}`;
-  }
-  // ─── Console output ───────────────────────────────────────────────────────
-  /**
-   * Startup banner — mirrors the infoServer() box style from CoreService.
-   *
-   *   ╔══════════════════════════════════════════╗
-   *   gradient title
-   *   ╔══ bgGreen box ════════════════════════╗
-   *    entry    dist/index.js
-   *    runtime  node  (IPC enabled)
-   *    root     ./src
-   *    watching .ts  .js  .json  .env
-   *    debounce 300ms
-   *   ╚══════════════════════════════════════════╝
-   */
-  printBanner() {
-    const entryRel = (0, import_path2.relative)(process.cwd(), this.cfg.entry) || this.cfg.entry;
-    const rootRel = (0, import_path2.relative)(process.cwd(), this.cfg.rootDir) || ".";
-    const runtimeStr = this.cfg.runtime === "node" ? `node  ${import_chalk2.default.blackBright("(IPC enabled)")}` : this.cfg.runtime;
-    const extStr = [...this.cfg.watchExtensions, ".env"].join("  ");
-    const ignoreStr = this.cfg.ignore.slice(0, 4).join("  ") + (this.cfg.ignore.length > 4 ? `  ${import_chalk2.default.blackBright(`+${this.cfg.ignore.length - 4} more`)}` : "");
-    const TITLE = "OPTICORE  HOT  RELOAD";
-    const rows = [
-      ` entry     ${import_chalk2.default.white.bold(entryRel)}`,
-      ` runtime   ${runtimeStr}`,
-      ` root      ${import_chalk2.default.white(rootRel)}`,
-      ` watching  ${import_chalk2.default.cyan(extStr)}`,
-      ` ignoring  ${import_chalk2.default.blackBright(ignoreStr)}`,
-      ` debounce  ${import_chalk2.default.white(`${this.cfg.debounceMs}ms`)}`
-    ];
-    const maxLen = Math.max(
-      TITLE.length + 4,
-      ...rows.map((r) => this.strip(r).length)
-    ) + 4;
-    const border = import_chalk2.default.bgGreen.white(" ".repeat(maxLen));
-    const titlePad = " ".repeat(Math.max(0, Math.floor((maxLen - TITLE.length) / 2)));
-    console.log("\n" + titlePad + (0, import_gradient_string.default)(["#43e97b", "#38f9d7", "#00c6fb"])(TITLE));
-    console.log(border);
-    rows.forEach((row) => {
-      const cleanLen = this.strip(row).length;
-      const padding = Math.max(0, maxLen - cleanLen - 2);
-      console.log(import_chalk2.default.bgGreen.white(` ${row}${" ".repeat(padding)} `));
-    });
-    console.log(border);
-    console.log(import_chalk2.default.blackBright(` watching for changes...
-`));
-  }
-  /**
-   * HOT event — in-process reload, no server restart.
-   *
-   *   ✔  [ HOT ]  14:23:45  |  .env                →  env variables reloaded
-   */
-  printHot(file, action) {
-    const badge = import_ansi_colors2.default.bgCyan(import_ansi_colors2.default.white.bold("  HOT  "));
-    const ts = import_chalk2.default.blackBright(this.ts());
-    const sep = import_chalk2.default.blackBright("|");
-    const filePart = import_chalk2.default.cyan.bold(file.padEnd(32));
-    const arrow = import_chalk2.default.green("\u2192");
-    const msg = import_chalk2.default.green(action);
-    console.log(`  ${import_chalk2.default.green("\u2714")}  ${badge}  ${ts}  ${sep}  ${filePart} ${arrow}  ${msg}`);
-  }
-  /**
-   * RELOAD event — server restart triggered.
-   *
-   *   ⚡  [ RELOAD ]  14:24:03  |  src/routes/user.ts   →  restarting server...
-   */
-  printReloading(file) {
-    const badge = import_ansi_colors2.default.bgYellow(import_ansi_colors2.default.white.bold(" RELOAD "));
-    const ts = import_chalk2.default.blackBright(this.ts());
-    const sep = import_chalk2.default.blackBright("|");
-    const filePart = import_chalk2.default.yellow.bold(file.padEnd(32));
-    const arrow = import_chalk2.default.yellow("\u2192");
-    const msg = import_chalk2.default.yellow("restarting server...");
-    console.log(`
-  ${import_chalk2.default.yellow("\u26A1")}  ${badge}  ${ts}  ${sep}  ${filePart} ${arrow}  ${msg}`);
-  }
-  /**
-   * READY event — server successfully restarted.
-   * Uses the same full-width bgGreen border as infoServer().
-   *
-   *   ════════════════════════════════════════════
-   *    READY   server restarted in 245ms
-   *   ════════════════════════════════════════════
-   */
-  printReady(elapsedMs) {
-    const msg = `  server restarted in ${import_chalk2.default.white.bold(`${elapsedMs}ms`)}`;
-    const cleanLen = this.strip(msg).length;
-    const width = Math.max(52, cleanLen + 6);
-    const border = import_chalk2.default.bgGreen.white(" ".repeat(width));
-    const padding = Math.max(0, width - cleanLen - 2);
-    const line = import_chalk2.default.bgGreen.white(` ${import_chalk2.default.bgGreen.white.bold("  READY ")} ${msg}${" ".repeat(padding)} `);
-    console.log(`  ${border}`);
-    console.log(`  ${line}`);
-    console.log(`  ${border}
-`);
-  }
-  /**
-   * CRASH event — unexpected child process exit.
-   *
-   *   ✘  [ CRASH ]  14:24:10  |  server exited with code 1
-   */
-  printCrash(code) {
-    const badge = import_ansi_colors2.default.bgRed(import_ansi_colors2.default.white.bold("  CRASH "));
-    const ts = import_chalk2.default.blackBright(this.ts());
-    const sep = import_chalk2.default.blackBright("|");
-    const msg = import_chalk2.default.red(`server exited with code ${import_chalk2.default.bold(String(code))}`);
-    console.log(`
-  ${import_chalk2.default.red("\u2718")}  ${badge}  ${ts}  ${sep}  ${msg}`);
-  }
-  /**
-   * RETRY event — auto-restart after crash.
-   *
-   *   ↺  [ RETRY ]  14:24:11  |  attempt 1 / 5
-   */
-  printCrashRetry(attempt, max) {
-    const badge = import_ansi_colors2.default.bgMagenta(import_ansi_colors2.default.white.bold("  RETRY "));
-    const ts = import_chalk2.default.blackBright(this.ts());
-    const sep = import_chalk2.default.blackBright("|");
-    const msg = import_chalk2.default.magenta(`auto-restart attempt ${import_chalk2.default.bold(`${attempt} / ${max}`)}`);
-    console.log(`  ${import_chalk2.default.magenta("\u21BA")}  ${badge}  ${ts}  ${sep}  ${msg}`);
-  }
-  /**
-   * LIMIT reached — give up restarting.
-   */
-  printCrashLimit(max) {
-    const badge = import_ansi_colors2.default.bgRed(import_ansi_colors2.default.white.bold("  ERROR "));
-    const ts = import_chalk2.default.blackBright(this.ts());
-    const sep = import_chalk2.default.blackBright("|");
-    const msg = import_chalk2.default.red(`max crash restarts reached (${import_chalk2.default.bold(String(max))}), giving up`);
-    console.log(`
-  ${import_chalk2.default.red("\u2718")}  ${badge}  ${ts}  ${sep}  ${msg}
-`);
-  }
-  /**
-   * Error — miscellaneous internal error.
-   */
-  printError(message) {
-    const badge = import_ansi_colors2.default.bgRed(import_ansi_colors2.default.white.bold("  ERROR "));
-    const ts = import_chalk2.default.blackBright(this.ts());
-    const sep = import_chalk2.default.blackBright("|");
-    console.error(`  ${import_chalk2.default.red("\u2718")}  ${badge}  ${ts}  ${sep}  ${import_chalk2.default.red(message)}`);
-  }
-  /**
-   * Stopped — watcher shut down.
-   */
-  printStopped() {
-    const badge = import_ansi_colors2.default.bgBlackBright(import_ansi_colors2.default.white.bold(" STOPPED"));
-    const ts = import_chalk2.default.blackBright(this.ts());
-    const sep = import_chalk2.default.blackBright("|");
-    console.log(`  ${import_chalk2.default.gray("\u25A0")}  ${badge}  ${ts}  ${sep}  ${import_chalk2.default.gray("watcher stopped")}
-`);
-  }
-  // ─── Graceful shutdown ────────────────────────────────────────────────────
-  setupProcessSignals() {
-    const shutdown = async () => {
-      console.log("");
-      await this.stop();
-      process.exit(0);
-    };
-    process.once("SIGINT", shutdown);
-    process.once("SIGTERM", shutdown);
-  }
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  HotReloadWatcher,
   WebServer,
   envPath
 });