@jsreport/jsreport-core 3.4.0 → 3.5.0

package/lib/worker/render/render.js

@@ -10,7 +10,6 @@ const Request = require('../../shared/request')
 const generateRequestId = require('../../shared/generateRequestId')
 const resolveReferences = require('./resolveReferences.js')
 const moduleHelper = require('./moduleHelper')
-let reportCounter = 0
 
 module.exports = (reporter) => {
   moduleHelper(reporter)
@@ -127,9 +126,6 @@ module.exports = (reporter) => {
         response.meta.reportName = 'report'
       }
 
-      request.context.reportCounter = ++reportCounter
-      request.context.startTimestamp = new Date().getTime()
-
       if (parentReq == null) {
         reporter.requestModulesCache.set(request.context.rootId, Object.create(null))
       }

package/lib/worker/sandbox/runInSandbox.js

@@ -28,7 +28,7 @@ module.exports = (reporter) => {
     context.__topLevelFunctions = {}
     context.__handleError = (err) => handleError(reporter, err)
 
-    const { sourceFilesInfo, run, restore, contextifyValue, decontextifyValue, unproxyValue, sandbox, safeRequire } = safeSandbox(context, {
+    const { sourceFilesInfo, run, restore, sandbox, safeRequire } = safeSandbox(context, {
       onLog: (log) => {
         reporter.logger[log.level](log.message, { ...req, timestamp: log.timestamp })
       },
@@ -113,13 +113,10 @@ module.exports = (reporter) => {
     // we don't attach these methods to the sandbox, and instead share them through a "manager" object that should
     // be passed in options
     manager.restore = restore
-    manager.contextifyValue = contextifyValue
-    manager.decontextifyValue = decontextifyValue
-    manager.unproxyValue = unproxyValue
 
     const functionNames = getTopLevelFunctions(userCode)
     const functionsCode = `return {${functionNames.map(h => `"${h}": ${h}`).join(',')}}`
-    const executionCode = `;(async () => { ${userCode}; ${functionsCode} })()
+    const executionCode = `;(async () => { ${userCode} \n\n;${functionsCode} })()
         .then((topLevelFunctions) => {
           const mergedTopLevelFunctions = { ...topLevelFunctions, ...__topLevelFunctions }
 

package/lib/worker/sandbox/safeSandbox.js

@@ -113,26 +113,12 @@ module.exports = (_sandbox, options = {}) => {
 
   const vm = new VM()
 
-  // NOTE: we wrap the Contextify.object, Decontextify.object methods because those are the
-  // methods that returns the proxies created by vm2 in the sandbox, we want to have a list of those
-  // to later use them
-  const wrapAndSaveProxyResult = (originalFn, thisArg) => {
-    return (value, ...args) => {
-      const result = originalFn.call(thisArg, value, ...args)
-
-      if (result != null && result.isVMProxy === true) {
-        proxiesInVM.set(result, value)
-      }
-
-      return result
-    }
-  }
-
-  vm._internal.Contextify.object = wrapAndSaveProxyResult(vm._internal.Contextify.object, vm._internal.Contextify)
-  vm._internal.Decontextify.object = wrapAndSaveProxyResult(vm._internal.Decontextify.object, vm._internal.Decontextify)
+  // delete the vm.sandbox.global because it introduces json stringify issues
+  // and we don't need such global in context
+  delete vm.sandbox.global
 
   for (const name in sandbox) {
-    vm._internal.Contextify.setGlobal(name, sandbox[name])
+    vm.setGlobal(name, sandbox[name])
   }
 
   // processing top level props because getter/setter descriptors
@@ -141,27 +127,18 @@ module.exports = (_sandbox, options = {}) => {
     const currentConfig = propsConfig[key]
 
     if (currentConfig.root && currentConfig.root.sandboxReadOnly) {
-      readOnlyProp(vm._context, key, [], customProxies, { onlyTopLevel: true })
+      readOnlyProp(vm.sandbox, key, [], customProxies, { onlyTopLevel: true })
     }
   })
 
   const sourceFilesInfo = new Map()
 
   return {
-    sandbox: vm._context,
+    sandbox: vm.sandbox,
     console: _console,
     sourceFilesInfo,
-    contextifyValue: (value) => {
-      return vm._internal.Contextify.value(value)
-    },
-    decontextifyValue: (value) => {
-      return vm._internal.Decontextify.value(value)
-    },
     restore: () => {
-      return restoreProperties(vm._context, originalValues, proxiesInVM, customProxies)
-    },
-    unproxyValue: (value) => {
-      return getOriginalFromProxy(proxiesInVM, customProxies, value)
+      return restoreProperties(vm.sandbox, originalValues, proxiesInVM, customProxies)
     },
     safeRequire: (modulePath) => _require(modulePath, { context: _sandbox, allowAllModules: true }),
     run: async (code, { filename, errorLineNumberOffset = 0, source, entity, entitySet } = {}) => {
@@ -177,6 +154,7 @@ module.exports = (_sandbox, options = {}) => {
       // to show nice error when the compile of a script fails
       script._compile = function (prefix, suffix) {
         return new originalVM.Script(prefix + this.getCompiledCode() + suffix, {
+          __proto__: null,
           filename: this.filename,
           displayErrors: true,
           lineOffset: this.lineOffset,

package/lib/worker/workerHandler.js

@@ -31,6 +31,7 @@ module.exports = (userInitData, { executeMain, convertUint8ArrayToBuffer }) => {
             ...JSON.parse(req.rawContent),
             context: req.context
           }
+          parsedReq.context.parsedInWorker = true
 
           return omit(parsedReq, 'data')
         } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-core",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "javascript based business reporting",
   "keywords": [
     "report",
@@ -32,11 +32,11 @@
     "@babel/code-frame": "7.12.13",
     "@babel/parser": "7.14.4",
     "@babel/traverse": "7.12.9",
-    "@jsreport/advanced-workers": "1.2.0",
+    "@jsreport/advanced-workers": "1.2.1",
     "@jsreport/mingo": "2.4.1",
     "ajv": "6.12.6",
     "app-root-path": "2.0.1",
-    "async-replace": "1.0.1",
+    "bytes": "3.1.2",
     "camelcase": "5.0.0",
     "debug": "4.3.2",
     "decamelize": "2.0.0",
@@ -46,7 +46,7 @@
     "enhanced-resolve": "5.8.3",
     "has-own-deep": "1.1.0",
     "isbinaryfile": "4.0.0",
-    "listener-collection": "1.2.0",
+    "listener-collection": "2.0.0",
     "lodash.get": "4.4.2",
     "lodash.groupby": "4.6.0",
     "lodash.omit": "4.5.0",
@@ -54,7 +54,7 @@
     "lru-cache": "4.1.1",
     "ms": "2.1.3",
     "nanoid": "3.2.0",
-    "nconf": "0.11.3",
+    "nconf": "0.12.0",
     "node.extend.without.arrays": "1.1.6",
     "reap2": "1.0.1",
     "semver": "7.3.5",
@@ -63,12 +63,12 @@
     "triple-beam": "1.3.0",
     "unset-value": "1.0.0",
     "uuid": "8.3.2",
-    "vm2": "3.9.5",
+    "vm2": "3.9.7",
     "winston": "3.3.3",
     "winston-transport": "4.4.0"
   },
   "devDependencies": {
-    "mocha": "8.2.1",
+    "mocha": "9.2.2",
     "should": "13.2.3",
     "standard": "16.0.4",
     "std-mocks": "1.0.1",

package/lib/main/monitoring.js

@@ -1,92 +0,0 @@
-const os = require('os')
-
-function cpu () {
-  // Create function to get CPU information
-  function cpuAverage () {
-  // Initialise sum of idle and time of cores and fetch CPU info
-    let totalIdle = 0; let totalTick = 0
-    const cpus = os.cpus()
-
-    // Loop through CPU cores
-    for (let i = 0, len = cpus.length; i < len; i++) {
-    // Select CPU core
-      const cpu = cpus[i]
-
-      // Total up the time in the cores tick
-      for (const type in cpu.times) {
-        totalTick += cpu.times[type]
-      }
-
-      // Total up the idle time of the core
-      totalIdle += cpu.times.idle
-    }
-
-    // Return the average Idle and Tick times
-    return { idle: totalIdle / cpus.length, total: totalTick / cpus.length }
-  }
-
-  // Grab first CPU Measure
-  const startMeasure = cpuAverage()
-
-  return new Promise((resolve) => {
-    // Set delay for second Measure
-    setTimeout(function () {
-    // Grab second Measure
-      const endMeasure = cpuAverage()
-
-      // Calculate the difference in idle and total time between the measures
-      const idleDifference = endMeasure.idle - startMeasure.idle
-      const totalDifference = endMeasure.total - startMeasure.total
-
-      // Calculate the average percentage CPU usage
-      const percentageCPU = 100 - ~~(100 * idleDifference / totalDifference)
-
-      // Output result to console
-      resolve(percentageCPU)
-    }, 1000)
-  })
-}
-
-class Monitoring {
-  constructor (reporter) {
-    this.reporter = reporter
-  }
-
-  async execute () {
-    const monitoring = {
-      cpu: await cpu(),
-      freemem: Math.round(os.freemem() / 1024 / 1024),
-      timestamp: new Date(),
-      hostname: os.hostname()
-    }
-    return this.reporter.documentStore.collection('monitoring').insert(monitoring)
-  }
-
-  init () {
-    this._interval = setInterval(() => {
-      this.execute().catch((e) => this.reporter.logger.warn('unable to persist monitoring info, but no need to worry, we will retry, details:' + e.stack))
-    }, 60000)
-    this._interval.unref()
-  }
-
-  close () {
-    clearInterval(this._interval)
-  }
-}
-
-module.exports = (reporter) => {
-  reporter.documentStore.registerEntityType('MonitoringType', {
-    cpu: { type: 'Edm.Int32' },
-    freemem: { type: 'Edm.Int32' },
-    timestamp: { type: 'Edm.DateTimeOffset', schema: { type: 'null' } },
-    hostname: { type: 'Edm.String' }
-  })
-
-  reporter.documentStore.registerEntitySet('monitoring', {
-    entityType: 'jsreport.MonitoringType',
-    exportable: false,
-    shared: true
-  })
-
-  reporter.monitoring = new Monitoring(reporter)
-}