@jsreport/jsreport-core 4.7.1 → 4.9.0

package/README.md

@@ -282,6 +282,10 @@ jsreport.documentStore.collection('templates')
 
 ## Changelog
 
+### 4.8.0
+- update minimum nodejs to 22.18
+- expose `version` to the jsreport-proxy
+
 ### 4.7.1
 
 - update @jsreport/ses to 1.4.0 to fix audit

package/lib/main/reporter.js

@@ -396,9 +396,11 @@ class MainReporter extends Reporter {
       }
 
       worker = await this._workersManager.allocate(req, {
-        timeout: this.getReportTimeout(req)
+        timeout: req.context.reportTimeoutCountAfterWorkerAllocated ? 0 : this.getReportTimeout(req)
       })
 
+      req.context.workerAllocatedTimestamp = new Date().getTime()
+
       if (options.abortEmitter) {
         options.abortEmitter.once('abort', () => {
           if (workerAborted) {

package/lib/shared/reporter.js

@@ -61,7 +61,9 @@ class Reporter extends EventEmitter {
    * @public Ensures that we get the proper report timeout in case when custom timeout per request was enabled
    */
   getReportTimeout (req) {
-    const elapsedTime = req.context.startTimestamp ? (new Date().getTime() - req.context.startTimestamp) : 0
+    const startTimestamp = req.context.reportTimeoutCountAfterWorkerAllocated ? req.context.workerAllocatedTimestamp : req.context.startTimestamp
+
+    const elapsedTime = startTimestamp ? (new Date().getTime() - startTimestamp) : 0
     if (
       this.options.enableRequestReportTimeout &&
       req.options != null &&

package/lib/worker/defaultProxyExtend.js

@@ -42,6 +42,8 @@ module.exports = (reporter) => (proxy, req) => {
     }
   }
 
+  proxy.version = reporter.version
+
   // expose tempfile functions
   const createTempFileFns = [
     'getTempFilePath', 'openTempFile', 'writeTempFileSync', 'writeTempFile',

package/lib/worker/reporter.js

@@ -61,6 +61,7 @@ class WorkerReporter extends Reporter {
     this.addRequestContextMetaConfig('id', { sandboxReadOnly: true })
     this.addRequestContextMetaConfig('reportCounter', { sandboxReadOnly: true })
     this.addRequestContextMetaConfig('startTimestamp', { sandboxReadOnly: true })
+    this.addRequestContextMetaConfig('workerAllocatedTimestamp', { sandboxReadOnly: true })
     this.addRequestContextMetaConfig('logs', { sandboxReadOnly: true })
     this.addRequestContextMetaConfig('isChildRequest', { sandboxReadOnly: true })
     this.addRequestContextMetaConfig('originalInputDataIsEmpty', { sandboxReadOnly: true })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-core",
-  "version": "4.7.1",
+  "version": "4.9.0",
   "description": "javascript based business reporting",
   "keywords": [
     "report",
@@ -32,7 +32,7 @@
     "test/extensions/validExtensions/listeners"
   ],
   "scripts": {
-    "test": "mocha --timeout 5000 --recursive test --exit && standard",
+    "test": "mocha --timeout 8000 --recursive test --exit && standard",
     "test:watch": "mocha --watch --recursive test"
   },
   "dependencies": {
@@ -40,11 +40,11 @@
     "@babel/parser": "7.23.5",
     "@babel/traverse": "7.23.5",
     "@colors/colors": "1.5.0",
-    "@jsreport/advanced-workers": "2.1.0",
+    "@jsreport/advanced-workers": "2.2.0",
     "@jsreport/mingo": "2.4.1",
     "@jsreport/reap": "0.1.0",
-    "@jsreport/serializator": "1.0.1",
-    "@jsreport/ses": "1.3.0",
+    "@jsreport/serializator": "1.1.0",
+    "@jsreport/ses": "1.4.0",
     "ajv": "6.12.6",
     "app-root-path": "3.0.0",
     "bytes": "3.1.2",
@@ -52,12 +52,12 @@
     "debug": "4.3.2",
     "decamelize": "2.0.0",
     "deepmerge": "2.1.0",
-    "diff": "3.5.0",
+    "diff": "4.0.4",
     "diff-match-patch": "1.0.5",
     "enhanced-resolve": "5.8.3",
     "has-own-deep": "1.1.0",
     "isbinaryfile": "5.0.0",
-    "listener-collection": "2.0.0",
+    "listener-collection": "2.1.0",
     "lodash.get": "4.4.2",
     "lodash.groupby": "4.6.0",
     "lodash.omit": "4.5.0",
@@ -79,14 +79,14 @@
   "devDependencies": {
     "@node-rs/jsonwebtoken": "0.2.0",
     "jsdom": "24.1.0",
-    "mocha": "10.1.0",
+    "mocha": "11.7.5",
     "should": "13.2.3",
     "standard": "16.0.4",
     "std-mocks": "1.0.1",
     "winston-loggly-bulk": "3.2.1"
   },
   "engines": {
-    "node": ">=18.15"
+    "node": ">=22.18"
   },
   "standard": {
     "env": {