@jsreport/jsreport-core 4.4.0 → 4.4.1

package/README.md

@@ -282,11 +282,16 @@ jsreport.documentStore.collection('templates')
 
 ## Changelog
 
+### 4.4.1
+
+- fix timestamp shown in logging
+
 ### 4.4.0
 
 - trigger async report using header to avoid allocating worker
 - fix require('..') and require('.') in sandbox
 - fix component rendering in loop with async work on helpers
+- update @jsreport/ses to 1.1.0
 
 ### 4.3.1
 

package/lib/main/createDefaultLoggerFormat.js

@@ -4,8 +4,17 @@ const winston = require('winston')
 
 module.exports = (options = {}) => {
   return winston.format((info) => {
-    const { level, message, ...meta } = info
-    info[MESSAGE] = `${options.timestamp === true ? `${new Date().toISOString()} - ` : ''}${level}: ${info.userLevel === true ? colors.cyan(message) : message}`
+    const { level, message, timestamp, ...meta } = info
+    let logDate
+
+    if (timestamp == null) {
+      logDate = new Date()
+      info.timestamp = logDate.getTime()
+    } else {
+      logDate = new Date(timestamp)
+    }
+
+    info[MESSAGE] = `${options.timestamp === true ? `${logDate.toISOString()} - ` : ''}${level}: ${info.userLevel === true ? colors.cyan(message) : message}`
 
     const metaKeys = Object.keys(meta)
 

package/lib/main/createNormalizeMetaLoggerFormat.js

@@ -1,15 +1,32 @@
+const omit = require('lodash.omit')
 const winston = require('winston')
+const { LEVEL, MESSAGE, SPLAT } = require('triple-beam')
 const normalizeMetaFromLogs = require('../shared/normalizeMetaFromLogs')
 
 module.exports = () => {
   return winston.format((info) => {
-    const { level, message, ...meta } = info
-    const newMeta = normalizeMetaFromLogs(level, message, meta)
+    const { level, message, timestamp: _timestamp, ...meta } = info
+
+    const symbolProps = [LEVEL, MESSAGE, SPLAT]
+    const originalSymbolProps = {}
+
+    for (const symbolProp of symbolProps) {
+      if (info[symbolProp] != null) {
+        originalSymbolProps[symbolProp] = info[symbolProp]
+      }
+    }
+
+    const timestamp = _timestamp ?? new Date().getTime()
+
+    const targetMeta = omit(meta, symbolProps)
+    const newMeta = normalizeMetaFromLogs(level, message, timestamp, targetMeta)
 
     if (newMeta != null) {
       return {
         level,
         message,
+        timestamp,
+        ...originalSymbolProps,
         ...newMeta
       }
     }

package/lib/main/logger.js

@@ -171,6 +171,7 @@ function configureLogger (logger, _transports) {
     if (options.silent) {
       continue
     }
+
     const transportInstance = new TransportClass(options)
 
     const existingTransport = logger.transports.find((t) => t.name === transportInstance.name)
@@ -238,7 +239,6 @@ class DebugTransport extends Transport {
 
     this.format = options.format || winston.format.combine(
       winston.format.colorize(),
-      normalizeMetaLoggerFormat(),
       defaultLoggerFormat()
     )
 

package/lib/shared/normalizeMetaFromLogs.js

@@ -1,6 +1,8 @@
 const omit = require('lodash.omit')
 
-module.exports = (level, msg, meta) => {
+module.exports = (level, msg, timestamp, meta) => {
+  let result = meta
+
   // detecting if meta is jsreport request object
   if (meta != null && meta.context) {
     meta.context.logs = meta.context.logs || []
@@ -8,7 +10,7 @@ module.exports = (level, msg, meta) => {
     meta.context.logs.push({
       level: level,
       message: msg,
-      timestamp: meta.timestamp || new Date().getTime()
+      timestamp
     })
 
     // TODO adding cancel looks bad, its before script is adding req.cancel()
@@ -23,8 +25,8 @@ module.exports = (level, msg, meta) => {
       newMeta.id = meta.context.id
     }
 
-    return newMeta
+    result = newMeta
   }
 
-  return meta
+  return result != null && Object.keys(result).length > 0 ? result : null
 }

package/lib/worker/logger.js

@@ -35,7 +35,7 @@ function logFn (level, profiler, ...args) {
     message: util.format.apply(util, msgArgs)
   }
 
-  const meta = normalizeMetaFromLogs(level, log.message, lastArg)
+  const meta = normalizeMetaFromLogs(level, log.message, log.timestamp, lastArg)
 
   if (meta != null) {
     log.meta = meta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-core",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "description": "javascript based business reporting",
   "keywords": [
     "report",
@@ -78,7 +78,7 @@
   },
   "devDependencies": {
     "@node-rs/jsonwebtoken": "0.2.0",
-    "jsdom": "17.0.0",
+    "jsdom": "24.1.0",
     "mocha": "10.1.0",
     "should": "13.2.3",
     "standard": "16.0.4",