befly 3.11.1 → 3.12.2

package/dist/befly.js

@@ -232,44 +232,6 @@ import { isAbsolute as nodePathIsAbsolute, join as nodePathJoin, resolve as node
 function escapeRegExp(input) {
   return String(input).replace(REGEXP_SPECIAL, "\\$&");
 }
-function installGracefulExitHooks() {
-  if (didInstallGracefulExitHooks)
-    return;
-  didInstallGracefulExitHooks = true;
-  const install = (signal, exitCode) => {
-    try {
-      if (typeof process.listenerCount === "function" && process.listenerCount(signal) > 0) {
-        return;
-      }
-    } catch {}
-    try {
-      process.once(signal, () => {
-        let exited = false;
-        const timer = setTimeout(() => {
-          if (exited)
-            return;
-          exited = true;
-          try {
-            process.exit(exitCode);
-          } catch {}
-        }, 2000);
-        shutdown().catch(() => {
-          return;
-        }).finally(() => {
-          if (exited)
-            return;
-          exited = true;
-          clearTimeout(timer);
-          try {
-            process.exit(exitCode);
-          } catch {}
-        });
-      });
-    } catch {}
-  };
-  install("SIGINT", 130);
-  install("SIGTERM", 143);
-}
 function formatLocalDate(date) {
   const y = date.getFullYear();
   const m = date.getMonth() + 1;
@@ -598,6 +560,7 @@ async function shutdown() {
   appConsoleSink = null;
   instance = null;
   errorInstance = null;
+  didEnsureLogDir = false;
 }
 function normalizePositiveInt(value, fallback, min, max) {
   if (typeof value !== "number")
@@ -619,9 +582,6 @@ function resolveLogDir() {
   return nodePathResolve(INITIAL_CWD, rawDir);
 }
 function ensureLogDirExists() {
-  if (didEnsureLogDir)
-    return;
-  didEnsureLogDir = true;
   const dir = resolveLogDir();
   try {
     if (!existsSync2(dir)) {
@@ -630,6 +590,7 @@ function ensureLogDirExists() {
   } catch (error) {
     throw new Error(`\u521B\u5EFA logs \u76EE\u5F55\u5931\u8D25: ${dir}. ${error?.message || error}`);
   }
+  didEnsureLogDir = true;
 }
 async function pruneOldLogFiles() {
   if (didPruneOldLogFiles)
@@ -726,7 +687,6 @@ function getLogger() {
   if (instance)
     return instance;
   ensureLogDirExists();
-  installGracefulExitHooks();
   pruneOldLogFiles();
   const minLevel = normalizeLogLevelName();
   const maxFileBytes = (typeof config.maxSize === "number" && config.maxSize > 0 ? config.maxSize : 10) * 1024 * 1024;
@@ -745,7 +705,6 @@ function getErrorLogger() {
   if (errorInstance)
     return errorInstance;
   ensureLogDirExists();
-  installGracefulExitHooks();
   pruneOldLogFiles();
   const maxFileBytes = (typeof config.maxSize === "number" && config.maxSize > 0 ? config.maxSize : 10) * 1024 * 1024;
   if (!errorFileSink) {
@@ -825,7 +784,7 @@ function buildLogLine(level, args) {
 `;
   }
   if (first instanceof Error) {
-    base.err = sanitizeErrorValue(first, {});
+    base.err = sanitizeErrorValue(first);
     if (typeof second === "string") {
       const extraMsg = formatExtrasToMsg(args.slice(2));
       base.msg = extraMsg ? `${second} ${extraMsg}` : second;
@@ -882,7 +841,7 @@ function createSinkLogger(options) {
     }
   };
 }
-function truncateString(val, stats) {
+function truncateString(val) {
   if (val.length <= maxLogStringLen)
     return val;
   return val.slice(0, maxLogStringLen);
@@ -900,7 +859,7 @@ function isSensitiveKey(key) {
   }
   return false;
 }
-function safeToStringMasked(val, visited, stats) {
+function safeToStringMasked(val, visited) {
   if (typeof val === "string")
     return val;
   if (val instanceof Error) {
@@ -946,25 +905,25 @@ function safeToStringMasked(val, visited, stats) {
     }
   }
 }
-function sanitizeErrorValue(err, stats) {
+function sanitizeErrorValue(err) {
   const errObj = {
     name: err.name || "Error",
-    message: truncateString(err.message || "", stats)
+    message: truncateString(err.message || "")
   };
   if (typeof err.stack === "string") {
-    errObj.stack = truncateString(err.stack, stats);
+    errObj.stack = truncateString(err.stack);
   }
   return errObj;
 }
-function stringifyPreview(val, visited, stats) {
-  const str = safeToStringMasked(val, visited, stats);
-  return truncateString(str, stats);
+function stringifyPreview(val, visited) {
+  const str = safeToStringMasked(val, visited);
+  return truncateString(str);
 }
-function sanitizeValueLimited(val, visited, stats) {
+function sanitizeValueLimited(val, visited) {
   if (val === null || val === undefined)
     return val;
   if (typeof val === "string")
-    return truncateString(val, stats);
+    return truncateString(val);
   if (typeof val === "number")
     return val;
   if (typeof val === "boolean")
@@ -972,12 +931,12 @@ function sanitizeValueLimited(val, visited, stats) {
   if (typeof val === "bigint")
     return val;
   if (val instanceof Error) {
-    return sanitizeErrorValue(val, stats);
+    return sanitizeErrorValue(val);
   }
   const isArr = Array.isArray(val);
   const isObj = isPlainObject(val);
   if (!isArr && !isObj) {
-    return stringifyPreview(val, visited, stats);
+    return stringifyPreview(val, visited);
   }
   if (visited.has(val)) {
     return "[Circular]";
@@ -992,7 +951,7 @@ function sanitizeValueLimited(val, visited, stats) {
       return;
     }
     if (typeof child === "string") {
-      dst[key] = truncateString(child, stats);
+      dst[key] = truncateString(child);
       return;
     }
     if (typeof child === "number" || typeof child === "boolean" || typeof child === "bigint") {
@@ -1000,21 +959,21 @@ function sanitizeValueLimited(val, visited, stats) {
       return;
     }
     if (child instanceof Error) {
-      dst[key] = sanitizeErrorValue(child, stats);
+      dst[key] = sanitizeErrorValue(child);
       return;
     }
     const childIsArr = Array.isArray(child);
     const childIsObj = isPlainObject(child);
     if (!childIsArr && !childIsObj) {
-      dst[key] = stringifyPreview(child, visited, stats);
+      dst[key] = stringifyPreview(child, visited);
       return;
     }
     if (depth >= sanitizeDepthLimit) {
-      dst[key] = stringifyPreview(child, visited, stats);
+      dst[key] = stringifyPreview(child, visited);
       return;
     }
     if (nodes >= sanitizeNodesLimit) {
-      dst[key] = stringifyPreview(child, visited, stats);
+      dst[key] = stringifyPreview(child, visited);
       return;
     }
     if (visited.has(child)) {
@@ -1062,7 +1021,7 @@ function sanitizeValueLimited(val, visited, stats) {
   return rootOut;
 }
 function sanitizeTopValue(val, visited) {
-  return sanitizeValueLimited(val, visited, {});
+  return sanitizeValueLimited(val, visited);
 }
 function sanitizeLogObject(obj) {
   const visited = new WeakSet;
@@ -1144,7 +1103,7 @@ function withRequestMeta(args) {
 function withRequestMetaTyped(args) {
   return withRequestMeta(args);
 }
-var REGEXP_SPECIAL, INITIAL_CWD, DEFAULT_LOG_STRING_LEN = 100, DEFAULT_LOG_ARRAY_ITEMS = 100, maxLogStringLen, maxLogArrayItems, DEFAULT_LOG_SANITIZE_DEPTH = 3, DEFAULT_LOG_OBJECT_KEYS = 100, DEFAULT_LOG_SANITIZE_NODES = 500, sanitizeDepthLimit, sanitizeObjectKeysLimit, sanitizeNodesLimit, ONE_YEAR_MS, BUILTIN_SENSITIVE_KEYS, sensitiveKeySet, sensitiveContainsMatchers, sensitiveContainsRegex = null, HOSTNAME, LOG_LEVEL_NUM, DEFAULT_MAX_BUFFER_BYTES, DEFAULT_FLUSH_DELAY_MS = 10, DEFAULT_MAX_BATCH_BYTES, instance = null, errorInstance = null, mockInstance = null, appFileSink = null, errorFileSink = null, appConsoleSink = null, didWarnIoError = false, didPruneOldLogFiles = false, didEnsureLogDir = false, didInstallGracefulExitHooks = false, config, Logger;
+var REGEXP_SPECIAL, INITIAL_CWD, DEFAULT_LOG_STRING_LEN = 100, DEFAULT_LOG_ARRAY_ITEMS = 100, maxLogStringLen, maxLogArrayItems, DEFAULT_LOG_SANITIZE_DEPTH = 3, DEFAULT_LOG_OBJECT_KEYS = 100, DEFAULT_LOG_SANITIZE_NODES = 500, sanitizeDepthLimit, sanitizeObjectKeysLimit, sanitizeNodesLimit, ONE_YEAR_MS, BUILTIN_SENSITIVE_KEYS, sensitiveKeySet, sensitiveContainsMatchers, sensitiveContainsRegex = null, HOSTNAME, LOG_LEVEL_NUM, DEFAULT_MAX_BUFFER_BYTES, DEFAULT_FLUSH_DELAY_MS = 10, DEFAULT_MAX_BATCH_BYTES, instance = null, errorInstance = null, mockInstance = null, appFileSink = null, errorFileSink = null, appConsoleSink = null, didWarnIoError = false, didPruneOldLogFiles = false, didEnsureLogDir = false, config, Logger;
 var init_logger = __esm(() => {
   init_asyncContext();
   REGEXP_SPECIAL = /[\\^$.*+?()[\]{}|]/g;
@@ -15590,29 +15549,19 @@ class Befly {
       Logger.info(`${this.config.appName} \u542F\u52A8\u6210\u529F! (${roleLabel}${envLabel})`);
       Logger.info(`\u670D\u52A1\u5668\u542F\u52A8\u8017\u65F6: ${finalStartupTime}`);
       Logger.info(`\u670D\u52A1\u5668\u76D1\u542C\u5730\u5740: ${server.url}`);
-      const gracefulShutdown = async (signal) => {
-        Logger.info(`\u6536\u5230 ${signal} \u4FE1\u53F7\uFF0C\u5F00\u59CB\u4F18\u96C5\u5173\u95ED...`);
-        try {
-          await server.stop();
-          Logger.info("HTTP \u670D\u52A1\u5668\u5DF2\u505C\u6B62");
-        } catch (error) {
-          Logger.error({ err: error }, "\u505C\u6B62 HTTP \u670D\u52A1\u5668\u65F6\u51FA\u9519");
-        }
-        try {
-          await Connect.disconnect();
-          Logger.info("\u6570\u636E\u5E93\u8FDE\u63A5\u5DF2\u5173\u95ED");
-        } catch (error) {
-          Logger.error({ err: error }, "\u5173\u95ED\u6570\u636E\u5E93\u8FDE\u63A5\u65F6\u51FA\u9519");
-        }
-        Logger.info("\u670D\u52A1\u5668\u5DF2\u4F18\u96C5\u5173\u95ED");
-        process.exit(0);
-      };
-      process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
-      process.on("SIGINT", () => gracefulShutdown("SIGINT"));
       return server;
     } catch (error) {
       Logger.error({ err: error }, "\u9879\u76EE\u542F\u52A8\u5931\u8D25");
-      process.exit(1);
+      try {
+        await Logger.flush();
+      } catch {}
+      try {
+        await Logger.shutdown();
+      } catch {}
+      if (error instanceof Error) {
+        throw error;
+      }
+      throw new Error(String(error));
     }
   }
 }