@catbee/utils 2.0.0-next.0 → 2.0.0-next.1

package/server/index.cjs

@@ -32,18 +32,17 @@ var middleware = require('@catbee/utils/middleware');
 var env = require('@catbee/utils/env');
 var logger = require('@catbee/utils/logger');
 var exception = require('@catbee/utils/exception');
-var fs$1 = require('fs');
 var config = require('@catbee/utils/config');
 var obj = require('@catbee/utils/obj');
 var fs = require('@catbee/utils/fs');
-var validate = require('@catbee/utils/validate');
+var validation = require('@catbee/utils/validation');
 var async = require('@catbee/utils/async');
+var id = require('@catbee/utils/id');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var express__default = /*#__PURE__*/_interopDefault(express);
 var https__default = /*#__PURE__*/_interopDefault(https);
-var fs__default = /*#__PURE__*/_interopDefault(fs$1);
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -61,7 +60,7 @@ var ServerConfigBuilder = class {
   * @throws {Error} If port is not an integer or is outside the valid range (1-65535)
   */
   validatePort(port) {
-    if (!validate.isPort(port)) {
+    if (!validation.isPort(port)) {
       throw new Error(`Port must be a valid number between 1 and 65535, got: ${port}`);
     }
   }
@@ -506,7 +505,10 @@ var ServerConfigBuilder = class {
   * ```
   */
   withBodyParser(opts) {
-    this.config.bodyParser = obj.deepObjMerge({}, this.config.bodyParser ?? {}, opts);
+    this.config.bodyParser = {
+      ...this.config.bodyParser,
+      ...opts
+    };
     return this;
   }
   /**
@@ -649,7 +651,7 @@ var ServerConfigBuilder = class {
   * ```
   */
   build() {
-    const config$1 = obj.deepObjMerge({}, config.defaultServerConfig, this.config);
+    const config$1 = obj.deepObjMerge({}, config.getCatbeeServerGlobalConfig(), this.config);
     if (config$1.openApi?.enable && !config$1.openApi.filePath) {
       throw new Error("OpenAPI is enabled but no filePath is specified");
     }
@@ -659,7 +661,7 @@ var ServerConfigBuilder = class {
     });
   }
   mergeConfig(key, value) {
-    const current = typeof this.config[key] === "object" && this.config[key] !== null ? this.config[key] : {};
+    const current = this.config[key] && typeof this.config[key] === "object" ? obj.deepClone(this.config[key]) : {};
     this.config[key] = obj.deepObjMerge({}, current, value);
   }
   setEnabled(key, enable, overrides = {}) {
@@ -670,9 +672,11 @@ var ServerConfigBuilder = class {
     return this;
   }
 };
-
-// src/server/server.ts
-var getDependencyErrorMessage = /* @__PURE__ */ __name((packageName, x) => `Missing required dependency ${x ? `for ${x}` : ""}: ${packageName}. Please install it to proceed.`, "getDependencyErrorMessage");
+var getDependencyErrorMessage = /* @__PURE__ */ __name((packageName, context) => {
+  const ctxPart = context ? `for ${context}` : "";
+  const spacer = ctxPart ? ` ${ctxPart}` : "";
+  return `Missing required dependency${spacer}: ${packageName}. Please install it to proceed.`;
+}, "getDependencyErrorMessage");
 var DependencyErrors = {
   express: getDependencyErrorMessage("express"),
   helmet: getDependencyErrorMessage("helmet"),
@@ -737,12 +741,12 @@ var ExpressServer = class {
   * - Request tracing
   */
   constructor(config$1, hooks = {}) {
-    if (this.isBuiltServerConfig(config$1)) {
+    if (this.hasBuildMarker(config$1)) {
       this.config = config$1;
     } else {
-      this.config = obj.deepObjMerge({}, config.defaultServerConfig, config$1);
+      this.config = obj.deepObjMerge({}, config.getCatbeeServerGlobalConfig(), config$1);
     }
-    if (!validate.isPort(this.config.port)) {
+    if (!validation.isPort(this.config.port)) {
       const msg = `Port must be a valid number between 1 and 65535, got: ${this.config.port}`;
       logger.getLogger().error(msg);
       throw new Error(msg);
@@ -842,7 +846,7 @@ var ExpressServer = class {
   async runHook(hook, ...args) {
     try {
       const fn = this.hooks[hook];
-      if (fn) await fn.apply(null, args);
+      if (fn) await fn(...args);
     } catch (err) {
       logger.getLogger().error({
         err,
@@ -889,7 +893,7 @@ var ExpressServer = class {
     this.app.use(middleware.requestId({
       headerName: this.config.requestId?.headerName,
       exposeHeader: this.config.requestId?.exposeHeader,
-      generator: this.config.requestId?.generator
+      generator: this.config.requestId?.generator || id.uuid
     }));
     this.app.use(middleware.setupRequestContext({
       headerName: this.config.requestId?.headerName,
@@ -1053,7 +1057,7 @@ var ExpressServer = class {
         }
         this.app.use(openApiMountPath, apiReference({
           spec: {
-            content: await fs__default.default.promises.readFile(openApiFilePath, "utf8")
+            content: await fs.readFile(openApiFilePath, "utf8")
           }
         }));
         if (this.config.openApi?.verbose) {
@@ -1117,7 +1121,7 @@ var ExpressServer = class {
     const healthCheckPath = this.normalizePath(this.config.healthCheck?.path || "/healthz", this.config.healthCheck?.withGlobalPrefix);
     this.app.get(healthCheckPath, async (_req, res) => {
       try {
-        if (!this.healthChecks.length || config.defaultCatbeeConfig.server.skipHealthz) {
+        if (!this.healthChecks.length || config.getCatbeeServerGlobalConfig().skipHealthz) {
           return res.status(httpStatusCodes.HttpStatusCodes.OK).json(new response.SuccessResponse("OK"));
         }
         const checkResults = await Promise.allSettled(this.healthChecks.map(async ({ name, check }) => {
@@ -1216,7 +1220,7 @@ var ExpressServer = class {
   */
   async ready() {
     try {
-      if (!this.healthChecks.length || config.defaultCatbeeConfig.server.skipHealthz) return true;
+      if (!this.healthChecks.length || config.getCatbeeServerGlobalConfig().skipHealthz) return true;
       const checkResults = await Promise.allSettled(this.healthChecks.map(async ({ name, check }) => {
         try {
           const status = await Promise.resolve(check());
@@ -1305,11 +1309,11 @@ var ExpressServer = class {
         if (this.config.https) {
           const httpsOptions = {
             ...this.config.https,
-            key: fs__default.default.readFileSync(this.config.https.key),
-            cert: fs__default.default.readFileSync(this.config.https.cert)
+            key: fs.readFileSync(this.config.https.key),
+            cert: fs.readFileSync(this.config.https.cert)
           };
           if (this.config.https.ca) {
-            httpsOptions.ca = fs__default.default.readFileSync(this.config.https.ca);
+            httpsOptions.ca = fs.readFileSync(this.config.https.ca);
           }
           if (this.config.https.passphrase) {
             httpsOptions.passphrase = this.config.https.passphrase;
@@ -1534,7 +1538,7 @@ var ExpressServer = class {
   /**
   * Get server configuration
   *
-  * @return {*}  {ServerConfig}
+  * @return {*}  {CatbeeServerConfig}
   */
   getConfig() {
     return this.config;
@@ -1608,7 +1612,7 @@ var ExpressServer = class {
       throw new Error(msg);
     }
   }
-  isBuiltServerConfig(config) {
+  hasBuildMarker(config) {
     if (config?.[BUILD_MARKER]) {
       return true;
     }