@jsreport/jsreport-core 4.6.0 → 4.7.0

package/README.md

@@ -282,6 +282,10 @@ jsreport.documentStore.collection('templates')
 
 ## Changelog
 
+### 4.6.1
+
+- clear profiles canceling check interval during reporter close
+
 ### 4.6.0
 
 - update nanoid to fix security issue

package/lib/main/profiler.js

@@ -441,14 +441,14 @@ module.exports = (reporter) => {
       clearInterval(profilesCleanupInterval)
     }
 
-    if (profilesCleanupInterval) {
-      clearInterval(profilesCleanupInterval)
-    }
-
     if (fullModeDurationCheckInterval) {
       clearInterval(fullModeDurationCheckInterval)
     }
 
+    if (profilesCancelingCheckInterval) {
+      clearInterval(profilesCancelingCheckInterval)
+    }
+
     try {
       const runningRequests = [...reporter.runningRequests.map.values()]
       await reporter.documentStore.collection('profiles').update({

package/lib/shared/createError.js

@@ -25,15 +25,37 @@ module.exports = function (message, options = {}) {
         error.weak = originalNormalized.weak
       }
 
-      if (error.message == null || error.message === '') {
-        error.message = `${originalNormalized.message}`
-      } else {
-        error.message += `\n(because) ${lowerCaseFirstLetter(originalNormalized.message)}`
+      const initialMsg = error.message == null || error.message === '' ? '' : error.message
+      const [messages, stacks] = getErrorMessagesAndStacks(originalNormalized)
+
+      if (initialMsg !== '') {
+        messages.unshift(initialMsg)
       }
 
+      error.message = messages.reduce((acu, msg) => {
+        if (acu === '') {
+          acu += msg
+        } else {
+          acu += `\n(because) ${lowerCaseFirstLetter(msg)}`
+        }
+
+        return acu
+      }, '')
+
       // stack is printed in reverse order (from cause to more high level error)
-      if (error.stack != null && originalNormalized.stack != null) {
-        error.stack = `${originalNormalized.stack}\nwrapped by:\n${error.stack}`
+      if (error.stack != null && originalNormalized.stack != null && stacks.length > 0) {
+        stacks.unshift(error.stack)
+        stacks.reverse()
+
+        error.stack = stacks.reduce((acu, stack) => {
+          if (acu === '') {
+            acu += stack
+          } else {
+            acu += `\nwrapped by:\n${stack}`
+          }
+
+          return acu
+        }, '')
       }
     }
   }
@@ -49,6 +71,23 @@ module.exports = function (message, options = {}) {
   return error
 }
 
+function getErrorMessagesAndStacks (err) {
+  let currentErr = err
+  const messages = []
+  const stacks = []
+
+  while (currentErr != null) {
+    if (currentErr.message) {
+      messages.push(currentErr.message)
+      stacks.push(currentErr.stack ?? '(no stack available)')
+    }
+
+    currentErr = currentErr.cause
+  }
+
+  return [messages, stacks]
+}
+
 function lowerCaseFirstLetter (str) {
   if (str === '' || typeof str !== 'string') {
     return str

package/lib/worker/defaultProxyExtend.js

@@ -41,4 +41,42 @@ module.exports = (reporter) => (proxy, req) => {
       return reporter.folders.resolveEntityPath(entity, es, req)
     }
   }
+
+  // expose tempfile functions
+  const createTempFileFns = [
+    'getTempFilePath', 'openTempFile', 'writeTempFileSync', 'writeTempFile',
+    'writeTempFileStream', 'copyFileToTempFile'
+  ]
+
+  const restOfTempFileFns = [
+    'readTempFileSync', 'readTempFile', 'readTempFileStream'
+  ]
+
+  const allFns = [
+    ...createTempFileFns,
+    ...restOfTempFileFns
+  ]
+
+  for (const fnName of allFns) {
+    const shouldLimitCreation = createTempFileFns.includes(fnName)
+
+    proxy[fnName] = (...args) => {
+      if (shouldLimitCreation) {
+        // limiting the number of temp files to avoid breaking server, otherwise I see no
+        // reason why having more than 1000 calls per req should be valid usecase
+        const counter = reporter.runningRequests.keyValueStore.get('tmp-file-counter', req) || 0
+
+        if (counter > 1000) {
+          throw reporter.createError('Reached maximum limit of tmp file calls in sandbox', {
+            weak: true,
+            statusCode: 400
+          })
+        }
+
+        reporter.runningRequests.keyValueStore.set('tmp-file-counter', counter + 1, req)
+      }
+
+      return reporter[fnName](...args)
+    }
+  }
 }

package/lib/worker/render/engineStream.js

@@ -57,22 +57,13 @@ module.exports = (reporter) => {
   }) => {
     if (proxy.templatingEngines) {
       proxy.templatingEngines.createStream = async (opts = {}) => {
-        // limiting the number of temp files to avoid breaking server, otherwise I see no reason why having more than 1000 calls per req should be valid usecase
-        const counter = reporter.runningRequests.keyValueStore.get('engine-stream-counter', req) || 0
-        if (counter > 1000) {
-          throw reporter.createError('Reached maximum limit of templatingEngine.createStream calls', {
-            weak: true,
-            statusCode: 400
-          })
-        }
-        reporter.runningRequests.keyValueStore.set('engine-stream-counter', counter + 1, req)
-
         req.context.engineStreamEnabled = true
 
         const bufferSize = bytes(opts.bufferSize || '10mb')
         let buf = ''
 
-        const { fileHandle, filename } = await reporter.openTempFile((uuid) => `${uuid}.stream`, 'a')
+        // using proxy.openTempFile to respect limits of temp files in sandbox
+        const { fileHandle, filename } = await proxy.openTempFile((uuid) => `${uuid}.stream`, 'a')
         proxy.templatingEngines.addFinishListener(() => fileHandle.close().catch((e) => reporter.logger.error('Failed to close temp file handle', e, req)))
 
         return {

package/lib/worker/reporter.js

@@ -14,10 +14,11 @@ const engineStream = require('./render/engineStream.js')
 
 class WorkerReporter extends Reporter {
   constructor (workerData, executeMain) {
-    const { options, documentStore, extensionsDefs } = workerData
+    const { options, documentStore, extensionsDefs, workerId } = workerData
 
     super(options)
 
+    this.workerId = workerId
     this._executeMain = executeMain
     this._initialized = false
     this._lockedDown = false

package/lib/worker/workerHandler.js

@@ -1,8 +1,8 @@
 const WorkerReporter = require('./reporter')
 const omit = require('lodash.omit')
 
-module.exports = (userInitData, { executeMain, convertUint8ArrayToBuffer }) => {
-  const reporter = new WorkerReporter(userInitData, async (actionName, data, req) => {
+module.exports = (userInitData, { executeMain, convertUint8ArrayToBuffer, workerId }) => {
+  const reporter = new WorkerReporter({ ...userInitData, workerId }, async (actionName, data, req) => {
     const actionRes = await executeMain({
       actionName,
       data

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-core",
-  "version": "4.6.0",
+  "version": "4.7.0",
   "description": "javascript based business reporting",
   "keywords": [
     "report",
@@ -40,11 +40,11 @@
     "@babel/parser": "7.23.5",
     "@babel/traverse": "7.23.5",
     "@colors/colors": "1.5.0",
-    "@jsreport/advanced-workers": "2.0.2",
+    "@jsreport/advanced-workers": "2.1.0",
     "@jsreport/mingo": "2.4.1",
     "@jsreport/reap": "0.1.0",
-    "@jsreport/serializator": "1.0.0",
-    "@jsreport/ses": "1.1.0",
+    "@jsreport/serializator": "1.0.1",
+    "@jsreport/ses": "1.2.0",
     "ajv": "6.12.6",
     "app-root-path": "3.0.0",
     "bytes": "3.1.2",