befly 3.15.25 → 3.15.26

package/dist/befly.js

@@ -499,6 +499,20 @@ 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)
+    return sanitizeOptions;
+  return {
+    maxStringLen: 200000,
+    maxArrayItems: 5000,
+    sanitizeDepth: sanitizeOptions.sanitizeDepth,
+    sanitizeNodes: sanitizeOptions.sanitizeNodes,
+    sanitizeObjectKeys: sanitizeOptions.sanitizeObjectKeys,
+    sensitiveKeyMatcher: sanitizeOptions.sensitiveKeyMatcher
+  };
+}
 function safeWriteStderr(msg) {
   try {
     process.stderr.write(`${msg}
@@ -964,7 +978,16 @@ function createSinkLogger(options) {
     if (level === "debug" && config.debug !== 1)
       return;
     const input = isPlainObject(record) ? record : { value: record };
-    const sanitizedRecord = sanitizeLogObject(input, sanitizeOptions);
+    let writeOptions = null;
+    if (input && isPlainObject(input)) {
+      const raw = input["__loggerWriteOptions"];
+      if (raw && isPlainObject(raw)) {
+        writeOptions = raw;
+        delete input["__loggerWriteOptions"];
+      }
+    }
+    const effectiveSanitizeOptions = buildSanitizeOptionsForWrite(writeOptions);
+    const sanitizedRecord = sanitizeLogObject(input, effectiveSanitizeOptions);
     const line = buildLogLine(level, sanitizedRecord);
     fileSink.enqueue(line);
     if (consoleSink)
@@ -1046,34 +1069,47 @@ function withRequestMetaRecord(record) {
 }
 
 class LoggerFacade {
-  maybeSanitizeForMock(record) {
+  maybeSanitizeForMock(record, options) {
     if (!mockInstance)
       return record;
-    return sanitizeLogObject(record, sanitizeOptions);
+    const effective = buildSanitizeOptionsForWrite(options ? options : null);
+    return sanitizeLogObject(record, effective);
   }
-  info(input) {
+  info(input, options) {
     const record0 = withRequestMetaRecord(toRecord(input));
-    const record = this.maybeSanitizeForMock(record0);
+    if (!mockInstance && options && isPlainObject(options)) {
+      record0["__loggerWriteOptions"] = options;
+    }
+    const record = this.maybeSanitizeForMock(record0, options);
     getSink("app").info(record);
   }
-  warn(input) {
+  warn(input, options) {
     const record0 = withRequestMetaRecord(toRecord(input));
-    const record = this.maybeSanitizeForMock(record0);
+    if (!mockInstance && options && isPlainObject(options)) {
+      record0["__loggerWriteOptions"] = options;
+    }
+    const record = this.maybeSanitizeForMock(record0, options);
     getSink("app").warn(record);
   }
-  error(input) {
+  error(input, options) {
     const record0 = withRequestMetaRecord(toRecord(input));
-    const record = this.maybeSanitizeForMock(record0);
+    if (!mockInstance && options && isPlainObject(options)) {
+      record0["__loggerWriteOptions"] = options;
+    }
+    const record = this.maybeSanitizeForMock(record0, options);
     getSink("app").error(record);
     if (mockInstance)
       return;
     getSink("error").error(record);
   }
-  debug(input) {
+  debug(input, options) {
     if (config.debug !== 1)
       return;
     const record0 = withRequestMetaRecord(toRecord(input));
-    const record = this.maybeSanitizeForMock(record0);
+    if (!mockInstance && options && isPlainObject(options)) {
+      record0["__loggerWriteOptions"] = options;
+    }
+    const record = this.maybeSanitizeForMock(record0, options);
     getSink("app").debug(record);
   }
   async flush() {
@@ -10876,9 +10912,7 @@ class SyncTable {
       noLog: true,
       meta: {
         subsystem: "syncTable",
-        operation: "precheck",
-        incompatibleTypeChangeCount: incompatibleTypeChanges.length,
-        incompatibleTypeChanges
+        operation: "precheck"
       }
     });
   }
@@ -16562,17 +16596,11 @@ class Befly {
       let kind = "runtime";
       let alreadyLogged = false;
       let noLog = false;
-      let incompatibleTypeChanges = null;
-      let incompatibleTypeChangeCount = null;
-      let incompatibleTypeChangeLines = null;
+      const incompatibleTypeChangeLines = [];
       if (isCoreError(error)) {
         kind = error.kind;
         alreadyLogged = error.logged === true;
         noLog = error.noLog === true;
-        if (error.meta && typeof error.meta === "object") {
-          incompatibleTypeChanges = error.meta["incompatibleTypeChanges"] ?? null;
-          incompatibleTypeChangeCount = error.meta["incompatibleTypeChangeCount"] ?? null;
-        }
       } else {
         const anyErr = error;
         if (anyErr && anyErr.__syncTableLogged === true) {
@@ -16589,57 +16617,49 @@ class Befly {
         }
       }
       {
-        const lines = [];
-        if (Array.isArray(incompatibleTypeChanges)) {
-          for (const item of incompatibleTypeChanges) {
-            if (!item || typeof item !== "object")
-              continue;
-            const rec = item;
-            const tableName = rec["tableName"];
-            const dbFieldName = rec["dbFieldName"];
-            const currentType = rec["currentType"];
-            const expectedType = rec["expectedType"];
-            if (typeof tableName !== "string" || tableName.length === 0)
-              continue;
-            if (typeof dbFieldName !== "string" || dbFieldName.length === 0)
-              continue;
-            if (typeof currentType !== "string" || currentType.length === 0)
-              continue;
-            if (typeof expectedType !== "string" || expectedType.length === 0)
-              continue;
-            lines.push(`- ${tableName}.${dbFieldName}: ${currentType} -> ${expectedType}`);
+        const text = String(errMessage || "");
+        const parts = text.split(`
+`);
+        for (const p of parts) {
+          const line = String(p || "").trim();
+          if (line.startsWith("- ")) {
+            incompatibleTypeChangeLines.push(line);
           }
         }
-        if (lines.length > 0) {
-          incompatibleTypeChangeLines = lines;
-        }
       }
+      const errorMessageFirstLine = String(errMessage || "").split(`
+`)[0] || "";
       if (alreadyLogged) {
         Logger.error({
           msg: "\u9879\u76EE\u542F\u52A8\u5931\u8D25\uFF08\u4E0B\u5C42\u5DF2\u8BB0\u5F55\uFF09",
           errorKind: kind,
-          errorMessage: errMessage,
-          incompatibleTypeChangeCount,
-          incompatibleTypeChangeLines
+          errorMessage: errorMessageFirstLine,
+          incompatibleTypeChangeCount: incompatibleTypeChangeLines.length
         });
       } else if (noLog) {
         Logger.error({
           msg: "\u9879\u76EE\u542F\u52A8\u5931\u8D25",
           errorKind: kind,
-          errorMessage: errMessage,
-          incompatibleTypeChangeCount,
-          incompatibleTypeChangeLines
+          errorMessage: errorMessageFirstLine,
+          incompatibleTypeChangeCount: incompatibleTypeChangeLines.length
         });
       } else {
         Logger.error({
           msg: "\u9879\u76EE\u542F\u52A8\u5931\u8D25",
           errorKind: kind,
-          errorMessage: errMessage,
+          errorMessage: errorMessageFirstLine,
           err: error,
-          incompatibleTypeChangeCount,
-          incompatibleTypeChangeLines
+          incompatibleTypeChangeCount: incompatibleTypeChangeLines.length
         });
       }
+      if (!alreadyLogged && incompatibleTypeChangeLines.length > 0) {
+        for (const line of incompatibleTypeChangeLines) {
+          Logger.error({
+            msg: "\u4E0D\u517C\u5BB9\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4",
+            incompatibleTypeChangeLine: line
+          }, { truncate: false });
+        }
+      }
       try {
         await Logger.flush();
       } catch {}