befly 3.16.0 → 3.16.2

package/dist/befly.js

@@ -504,10 +504,8 @@ import { createWriteStream, existsSync, mkdirSync } from "fs";
 import { stat } from "fs/promises";
 import { hostname as osHostname } from "os";
 import { isAbsolute as nodePathIsAbsolute, join as nodePathJoin, resolve as nodePathResolve } from "path";
-function buildSanitizeOptionsForWrite(writeOptions) {
-  if (!writeOptions)
-    return sanitizeOptions;
-  if (writeOptions.truncate !== false)
+function buildSanitizeOptionsForWriteOptions(writeOptions) {
+  if (!writeOptions || writeOptions.truncate !== false)
     return sanitizeOptions;
   return {
     maxStringLen: 200000,
@@ -809,8 +807,6 @@ async function flush() {
 async function shutdown() {
   if (mockInstance)
     return;
-  const currentInstance = instance;
-  const currentErrorInstance = errorInstance;
   const currentAppFileSink = appFileSink;
   const currentErrorFileSink = errorFileSink;
   const currentAppConsoleSink = appConsoleSink;
@@ -835,12 +831,6 @@ async function shutdown() {
   if (appConsoleSink === currentAppConsoleSink) {
     appConsoleSink = null;
   }
-  if (instance === currentInstance) {
-    instance = null;
-  }
-  if (errorInstance === currentErrorInstance) {
-    errorInstance = null;
-  }
 }
 function resolveLogDir() {
   const rawDir = config.dir || "./logs";
@@ -876,8 +866,6 @@ function configure(cfg) {
       mb = 100;
     config.maxSize = mb;
   }
-  instance = null;
-  errorInstance = null;
   appFileSink = null;
   errorFileSink = null;
   appConsoleSink = null;
@@ -893,35 +881,6 @@ function configure(cfg) {
 function setMockLogger(mock) {
   mockInstance = mock;
 }
-function getSink(kind) {
-  if (mockInstance)
-    return mockInstance;
-  if (kind === "app") {
-    if (instance)
-      return instance;
-  } else {
-    if (errorInstance)
-      return errorInstance;
-  }
-  ensureLogDirExists();
-  const maxSizeMb = typeof config.maxSize === "number" ? config.maxSize : 20;
-  const maxFileBytes = Math.floor(maxSizeMb * 1024 * 1024);
-  if (kind === "app") {
-    if (!appFileSink) {
-      appFileSink = new LogFileSink({ prefix: "app", maxFileBytes });
-    }
-    if (config.console === 1 && !appConsoleSink) {
-      appConsoleSink = createStreamSink("stdout");
-    }
-    instance = createSinkLogger({ fileSink: appFileSink, consoleSink: config.console === 1 ? appConsoleSink : null });
-    return instance;
-  }
-  if (!errorFileSink) {
-    errorFileSink = new LogFileSink({ prefix: "error", maxFileBytes });
-  }
-  errorInstance = createSinkLogger({ fileSink: errorFileSink, consoleSink: null });
-  return errorInstance;
-}
 function buildBaseFields(level, timeMs) {
   const base = {
     level,
@@ -978,46 +937,39 @@ function safeJsonStringify(obj) {
     }
   }
 }
-function createSinkLogger(options) {
-  const fileSink = options.fileSink;
-  const consoleSink = options.consoleSink;
-  const write = (level, record) => {
-    if (level === "debug" && config.debug !== 1)
-      return;
-    const time = Date.now();
-    const base = buildBaseFields(level, time);
-    const input = isPlainObject(record) ? record : { value: record };
-    let writeOptions = null;
-    if (input && typeof input === "object") {
-      writeOptions = recordWriteOptions.get(input) ?? null;
-      if (writeOptions) {
-        recordWriteOptions.delete(input);
-      }
+function ensureSinksReady(kind) {
+  ensureLogDirExists();
+  const maxSizeMb = typeof config.maxSize === "number" ? config.maxSize : 20;
+  const maxFileBytes = Math.floor(maxSizeMb * 1024 * 1024);
+  if (kind === "app") {
+    if (!appFileSink) {
+      appFileSink = new LogFileSink({ prefix: "app", maxFileBytes });
     }
-    const effectiveSanitizeOptions = buildSanitizeOptionsForWrite(writeOptions);
-    const sanitizedRecord = sanitizeLogObject(input, effectiveSanitizeOptions);
-    const fileLine = buildLogLineWithBase(base, sanitizedRecord);
-    fileSink.enqueue(fileLine);
-    if (consoleSink) {
-      if (!writeOptions || writeOptions.console !== false) {
-        consoleSink.enqueue(fileLine);
-      }
+    if (config.console === 1 && !appConsoleSink) {
+      appConsoleSink = createStreamSink("stdout");
     }
-  };
-  return {
-    info(record) {
-      write("info", record);
-    },
-    warn(record) {
-      write("warn", record);
-    },
-    error(record) {
-      write("error", record);
-    },
-    debug(record) {
-      write("debug", record);
+    return { fileSink: appFileSink, consoleSink: config.console === 1 ? appConsoleSink : null };
+  }
+  if (!errorFileSink) {
+    errorFileSink = new LogFileSink({ prefix: "error", maxFileBytes });
+  }
+  return { fileSink: errorFileSink, consoleSink: null };
+}
+function writeJsonl(kind, level, record, options) {
+  if (level === "debug" && config.debug !== 1)
+    return;
+  const sinks = ensureSinksReady(kind);
+  const time = Date.now();
+  const base = buildBaseFields(level, time);
+  const effectiveSanitizeOptions = buildSanitizeOptionsForWriteOptions(options);
+  const sanitizedRecord = sanitizeLogObject(record, effectiveSanitizeOptions);
+  const fileLine = buildLogLineWithBase(base, sanitizedRecord);
+  sinks.fileSink.enqueue(fileLine);
+  if (sinks.consoleSink) {
+    if (!options || options.console !== false) {
+      sinks.consoleSink.enqueue(fileLine);
     }
-  };
+  }
 }
 function metaToObject() {
   const meta = getCtx();
@@ -1080,48 +1032,59 @@ function withRequestMetaRecord(record) {
 }
 
 class LoggerFacade {
-  maybeSanitizeForMock(record, options) {
-    if (!mockInstance)
-      return record;
-    const effective = buildSanitizeOptionsForWrite(options ? options : null);
-    return sanitizeLogObject(record, effective);
-  }
-  info(input, options) {
+  write(level, input, options) {
+    if (level === "debug" && config.debug !== 1)
+      return;
     const record0 = withRequestMetaRecord(toRecord(input));
-    if (!mockInstance && options && isPlainObject(record0)) {
-      recordWriteOptions.set(record0, options);
+    if (mockInstance) {
+      const effective = buildSanitizeOptionsForWriteOptions(options);
+      const sanitized = sanitizeLogObject(record0, effective);
+      if (level === "info") {
+        mockInstance.info(sanitized);
+      } else if (level === "warn") {
+        mockInstance.warn(sanitized);
+      } else if (level === "error") {
+        mockInstance.error(sanitized);
+      } else {
+        mockInstance.debug(sanitized);
+      }
+      return;
+    }
+    writeJsonl("app", level, record0, options);
+    if (level === "error") {
+      writeJsonl("error", "error", record0, options);
     }
-    const record = this.maybeSanitizeForMock(record0, options);
-    getSink("app").info(record);
+  }
+  info(input, options) {
+    this.write("info", input, options);
   }
   warn(input, options) {
-    const record0 = withRequestMetaRecord(toRecord(input));
-    if (!mockInstance && options && isPlainObject(record0)) {
-      recordWriteOptions.set(record0, options);
-    }
-    const record = this.maybeSanitizeForMock(record0, options);
-    getSink("app").warn(record);
+    this.write("warn", input, options);
   }
   error(input, options) {
-    const record0 = withRequestMetaRecord(toRecord(input));
-    if (!mockInstance && options && isPlainObject(record0)) {
-      recordWriteOptions.set(record0, options);
-    }
-    const record = this.maybeSanitizeForMock(record0, options);
-    getSink("app").error(record);
-    if (mockInstance)
-      return;
-    getSink("error").error(record);
+    this.write("error", input, options);
   }
   debug(input, options) {
-    if (config.debug !== 1)
-      return;
-    const record0 = withRequestMetaRecord(toRecord(input));
-    if (!mockInstance && options && isPlainObject(record0)) {
-      recordWriteOptions.set(record0, options);
-    }
-    const record = this.maybeSanitizeForMock(record0, options);
-    getSink("app").debug(record);
+    this.write("debug", input, options);
+  }
+  printPlainLines(input, options) {
+    const kind = options && options.stream === "stderr" ? "stderr" : "stdout";
+    const stream = kind === "stderr" ? process.stderr : process.stdout;
+    try {
+      if (Array.isArray(input)) {
+        for (const line of input) {
+          stream.write(`${String(line)}
+`);
+        }
+        return;
+      }
+      const parts = String(input).split(`
+`);
+      for (let i = 0;i < parts.length; i = i + 1) {
+        stream.write(`${parts[i]}
+`);
+      }
+    } catch {}
   }
   async flush() {
     await flush();
@@ -1136,7 +1099,7 @@ class LoggerFacade {
     await shutdown();
   }
 }
-var INITIAL_CWD, BUILTIN_SENSITIVE_KEYS, sanitizeOptions, recordWriteOptions, HOSTNAME, instance = null, errorInstance = null, mockInstance = null, appFileSink = null, errorFileSink = null, appConsoleSink = null, config, Logger;
+var INITIAL_CWD, BUILTIN_SENSITIVE_KEYS, sanitizeOptions, HOSTNAME, mockInstance = null, appFileSink = null, errorFileSink = null, appConsoleSink = null, config, Logger;
 var init_logger = __esm(() => {
   init_loggerUtils();
   init_util();
@@ -1151,7 +1114,6 @@ var init_logger = __esm(() => {
     sanitizeObjectKeys: 500,
     sensitiveKeyMatcher: buildSensitiveKeyMatcher({ builtinPatterns: BUILTIN_SENSITIVE_KEYS, userPatterns: [] })
   };
-  recordWriteOptions = new WeakMap;
   HOSTNAME = (() => {
     try {
       return osHostname();
@@ -8600,7 +8562,7 @@ function inferInputByDbType(dbType) {
   if (DECIMAL_DB_TYPES.has(normalized) || FLOAT_DB_TYPES.has(normalized)) {
     return "number";
   }
-  if (STRING_DB_TYPES.has(normalized) || normalized === "datetime") {
+  if (STRING_DB_TYPES.has(normalized) || normalized === "datetime" || normalized === "timestamp") {
     return "string";
   }
   if (normalized === "json") {
@@ -8635,7 +8597,7 @@ function parseEnumRuleValues(enumInput) {
 init_util();
 var RESERVED_FIELDS = ["id", "created_at", "updated_at", "deleted_at", "state"];
 var RESERVED_FIELD_SET = new Set(RESERVED_FIELDS);
-var FIELD_TYPES = ["tinyint", "smallint", "mediumint", "int", "bigint", "decimal", "float", "double", "char", "varchar", "enum", "tinytext", "text", "mediumtext", "longtext", "datetime", "json"];
+var FIELD_TYPES = ["tinyint", "smallint", "mediumint", "int", "bigint", "decimal", "float", "double", "char", "varchar", "enum", "tinytext", "text", "mediumtext", "longtext", "datetime", "timestamp", "json"];
 var FIELD_TYPE_SET = new Set(FIELD_TYPES);
 var INPUT_TYPES = ["number", "integer", "string", "char", "array", "array_number", "array_integer", "json", "json_number", "json_integer"];
 var INPUT_TYPE_SET = new Set(INPUT_TYPES);
@@ -8845,21 +8807,21 @@ async function checkTable(tables, config2) {
             Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A ${effectiveType} \u7C7B\u578B\uFF0C\u4E0D\u652F\u6301\u552F\u4E00\u7EA6\u675F\uFF08unique=true \u65E0\u6548\uFF09`);
             hasError = true;
           }
-        } else if (effectiveType === "datetime") {
+        } else if (effectiveType === "datetime" || effectiveType === "timestamp") {
           if (field.min !== undefined && field.min !== null) {
-            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A datetime \u7C7B\u578B\uFF0Cmin \u5FC5\u987B\u4E3A null\uFF0C\u5F53\u524D\u4E3A "${field.min}"`);
+            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A ${effectiveType} \u7C7B\u578B\uFF0Cmin \u5FC5\u987B\u4E3A null\uFF0C\u5F53\u524D\u4E3A "${field.min}"`);
             hasError = true;
           }
           if (field.max !== undefined && field.max !== null) {
-            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A datetime \u7C7B\u578B\uFF0Cmax \u5FC5\u987B\u4E3A null\uFF0C\u5F53\u524D\u4E3A "${field.max}"`);
+            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A ${effectiveType} \u7C7B\u578B\uFF0Cmax \u5FC5\u987B\u4E3A null\uFF0C\u5F53\u524D\u4E3A "${field.max}"`);
             hasError = true;
           }
           if (field.default !== undefined && field.default !== null) {
-            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A datetime \u7C7B\u578B\uFF0C\u9ED8\u8BA4\u503C\u5FC5\u987B\u4E3A null\uFF08\u5982\u9700\u5F53\u524D\u65F6\u95F4\uFF0C\u8BF7\u5728\u4E1A\u52A1\u5199\u5165\u65F6\u8D4B\u503C\uFF09\u3002\u5F53\u524D\u4E3A ${formatValuePreview(field.default)}`);
+            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A ${effectiveType} \u7C7B\u578B\uFF0C\u9ED8\u8BA4\u503C\u5FC5\u987B\u4E3A null\uFF08\u5982\u9700\u5F53\u524D\u65F6\u95F4\uFF0C\u8BF7\u5728\u4E1A\u52A1\u5199\u5165\u65F6\u8D4B\u503C\uFF09\u3002\u5F53\u524D\u4E3A ${formatValuePreview(field.default)}`);
             hasError = true;
           }
           if (field.unsigned !== undefined) {
-            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A datetime \u7C7B\u578B\uFF0C\u4E0D\u5141\u8BB8\u8BBE\u7F6E unsigned`);
+            Logger.warn(`${tablePrefix}${fileName} \u6587\u4EF6 ${colKey} \u4E3A ${effectiveType} \u7C7B\u578B\uFF0C\u4E0D\u5141\u8BB8\u8BBE\u7F6E unsigned`);
             hasError = true;
           }
         } else if (effectiveType === "enum") {
@@ -10606,6 +10568,7 @@ class SyncTable {
     varchar: "VARCHAR",
     enum: "ENUM",
     datetime: "DATETIME",
+    timestamp: "TIMESTAMP",
     tinytext: "TINYTEXT",
     text: "MEDIUMTEXT",
     mediumtext: "MEDIUMTEXT",
@@ -10706,6 +10669,7 @@ class SyncTable {
         }
       }
       SyncTable.throwIfIncompatibleTypeChanges(incompatibleTypeChanges);
+      const createdTables = [];
       for (const task of tableTasks) {
         const item = task.item;
         const tableName = task.tableName;
@@ -10745,6 +10709,7 @@ class SyncTable {
             }
           } else {
             await SyncTable.createTable(this.db, tableName, tableFields);
+            createdTables.push(tableName);
           }
         } catch (error) {
           const errMsg = String(error?.message || error);
@@ -10767,6 +10732,17 @@ class SyncTable {
           throw error;
         }
       }
+      if (createdTables.length > 0) {
+        const lines = [];
+        lines.push(`\u521B\u5EFA\u8868\u5217\u8868\uFF08\u5171${createdTables.length}\u5F20\uFF09:`);
+        for (const tableName of createdTables) {
+          lines.push(`- ${tableName}`);
+        }
+        const text = lines.join(`
+`);
+        Logger.debug(text, { truncate: false, console: false });
+        Logger.printPlainLines(text, { stream: "stdout" });
+      }
     } catch (error) {
       if (error?.__syncTableLogged === true) {
         throw error;
@@ -10879,6 +10855,8 @@ class SyncTable {
         return "null";
       case "datetime":
         return "null";
+      case "timestamp":
+        return "null";
       case "tinytext":
       case "text":
       case "mediumtext":
@@ -10906,7 +10884,7 @@ class SyncTable {
         return ` DEFAULT '${escaped}'`;
       }
     }
-    if (normalizedType === "datetime") {
+    if (normalizedType === "datetime" || normalizedType === "timestamp") {
       if (typeof actualDefault === "string") {
         const trimmed = actualDefault.trim();
         if (/^current_timestamp(\(\s*\d+\s*\)|\(\s*\))?$/i.test(trimmed)) {
@@ -11445,7 +11423,6 @@ SQL: ${sqlLine}
             ${cols}
         ) ENGINE=${ENGINE} DEFAULT CHARSET=${CHARSET} COLLATE=${COLLATE}`;
     await db.unsafe(createSQL);
-    Logger.debug(`[\u8868 ${tableName}] + \u521B\u5EFA\u8868\uFF08\u7CFB\u7EDF\u5B57\u6BB5 + \u4E1A\u52A1\u5B57\u6BB5\uFF09`);
     const indexClauses = [];
     for (const sysField of systemIndexFields) {
       const indexName = `idx_${sysField}`;
@@ -13447,13 +13424,15 @@ class Validator {
       }
       case "string": {
         if (typeof value === "string") {
-          if (String(dbType || "").toLowerCase() === "datetime") {
+          const dbTypeNormalized2 = String(dbType || "").toLowerCase();
+          if (dbTypeNormalized2 === "datetime" || dbTypeNormalized2 === "timestamp") {
             const trimmed = value.trim();
             return { value: trimmed, error: null };
           }
           return { value, error: null };
         }
-        if (String(dbType || "").toLowerCase() === "datetime") {
+        const dbTypeNormalized = String(dbType || "").toLowerCase();
+        if (dbTypeNormalized === "datetime" || dbTypeNormalized === "timestamp") {
           return { value: null, error: "\u5FC5\u987B\u662F\u65F6\u95F4\u5B57\u7B26\u4E32" };
         }
         return { value: null, error: "\u5FC5\u987B\u662F\u5B57\u7B26\u4E32" };
@@ -13495,7 +13474,8 @@ class Validator {
           return { value: null, error: "\u5FC5\u987B\u662FJSON\u5BF9\u8C61\u6216\u6570\u7EC4" };
         return checkJsonLeaves(value, "integer") ? { value, error: null } : { value: null, error: "JSON\u503C\u5FC5\u987B\u662F\u6574\u6570" };
       default: {
-        if (String(dbType || "").toLowerCase() === "datetime") {
+        const dbTypeNormalized = String(dbType || "").toLowerCase();
+        if (dbTypeNormalized === "datetime" || dbTypeNormalized === "timestamp") {
           if (typeof value !== "string")
             return { value: null, error: "\u5FC5\u987B\u662F\u65F6\u95F4\u5B57\u7B26\u4E32" };
           const trimmed = value.trim();
@@ -13552,7 +13532,8 @@ class Validator {
       if (!isJsonStructure(value))
         return "\u5FC5\u987B\u662FJSON\u5BF9\u8C61\u6216\u6570\u7EC4";
     }
-    if (String(type || "").toLowerCase() === "datetime") {
+    const normalizedTypeForDb = String(type || "").toLowerCase();
+    if (normalizedTypeForDb === "datetime" || normalizedTypeForDb === "timestamp") {
       if (typeof value !== "string")
         return "\u5FC5\u987B\u662F\u65F6\u95F4\u5B57\u7B26\u4E32";
       if (!/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(value))
@@ -13621,7 +13602,7 @@ class Validator {
       return defaultValue;
     }
     const normalizedType = String(type || "").toLowerCase();
-    if (normalizedType === "datetime" || normalizedType === "json" || normalizedType === "enum") {
+    if (normalizedType === "datetime" || normalizedType === "timestamp" || normalizedType === "json" || normalizedType === "enum") {
       return null;
     }
     const normalizedInput = String(input || "").toLowerCase();
@@ -16898,21 +16879,6 @@ class Befly {
           noLog = true;
         }
       }
-      const writePlainLinesToConsole = (prefix, errName, message) => {
-        const text = String(message || "");
-        const parts = text.split(`
-`);
-        const firstLine = parts.length > 0 ? String(parts[0] || "") : "";
-        const head = `[${prefix}] \u542F\u52A8\u5931\u8D25: ${errName}: ${firstLine}`;
-        try {
-          process.stderr.write(`${head}
-`);
-          for (let i = 1;i < parts.length; i = i + 1) {
-            process.stderr.write(`${parts[i]}
-`);
-          }
-        } catch {}
-      };
       if (!alreadyLogged && multiline) {
         const appName = String(this.config?.appName || "\u9879\u76EE");
         const errName = error instanceof Error && error.name ? error.name : "Error";
@@ -16921,7 +16887,18 @@ class Befly {
           errorKind: kind,
           errorMessage: errMessage
         }, { truncate: false, console: false });
-        writePlainLinesToConsole(appName, errName, errMessage);
+        {
+          const text = String(errMessage || "");
+          const parts = text.split(`
+`);
+          const firstLine = parts.length > 0 ? String(parts[0] || "") : "";
+          const lines = [];
+          lines.push(`[${appName}] \u542F\u52A8\u5931\u8D25: ${errName}: ${firstLine}`);
+          for (let i = 1;i < parts.length; i = i + 1) {
+            lines.push(String(parts[i] || ""));
+          }
+          Logger.printPlainLines(lines, { stream: "stderr" });
+        }
       } else if (alreadyLogged) {
         Logger.error({
           msg: "\u9879\u76EE\u542F\u52A8\u5931\u8D25\uFF08\u4E0B\u5C42\u5DF2\u8BB0\u5F55\uFF09",