@jsreport/jsreport-core 3.4.0 → 3.4.1

package/README.md

@@ -282,6 +282,11 @@ jsreport.documentStore.collection('templates')
 
 ## Changelog
 
+### 3.4.1
+
+- fix passing data to async report
+- fix blob appends
+
 ### 3.4.0
 
 - fix for reports execution

package/lib/main/blobStorage/blobStorage.js

@@ -25,6 +25,7 @@ module.exports = (reporter, options) => {
         let existingBuf = Buffer.from([])
         try {
           existingBuf = await provider.read(blobName, req)
+          await provider.remove(blobName, req)
         } catch (e) {
           // so far blob storage throws when blob doesnt exit
         }

package/lib/main/reporter.js

@@ -25,7 +25,7 @@ const setupValidateShortid = require('./store/setupValidateShortid')
 const documentStoreActions = require('./store/mainActions')
 const blobStorageActions = require('./blobStorage/mainActions')
 const Reporter = require('../shared/reporter')
-const Request = require('../shared/request')
+const Request = require('./request')
 const generateRequestId = require('../shared/generateRequestId')
 const Profiler = require('./profiler')
 const Monitoring = require('./monitoring')
@@ -315,17 +315,11 @@ class MainReporter extends Reporter {
    *
    * @public
    */
-  async render (req, parentReq) {
+  async render (req, options = {}) {
     if (!this._initialized) {
       throw new Error('Not initialized, you need to call jsreport.init().then before rendering')
     }
 
-    let options = {}
-    if (parentReq && !parentReq.__isJsreportRequest__) {
-      options = parentReq
-      parentReq = null
-    }
-
     req = Object.assign({}, req)
     req.context = Object.assign({}, req.context)
     req.context.rootId = req.context.rootId || generateRequestId()
@@ -351,10 +345,7 @@ class MainReporter extends Reporter {
         throw this.createError('Request aborted by client')
       }
 
-      let isDataStoredInWorker = false
-
       if (req.rawContent) {
-        isDataStoredInWorker = true
         const result = await worker.execute({
           actionName: 'parse',
           req,
@@ -365,13 +356,7 @@ class MainReporter extends Reporter {
         req = result
       }
 
-      req = Request(req, parentReq)
-
-      if (isDataStoredInWorker) {
-        // we unset this because we want the Request() call in worker to evaluate the data
-        // and determine if the original was empty or not
-        delete req.context.originalInputDataIsEmpty
-      }
+      req = Request(req)
 
       // TODO: we will probably validate in the thread
       if (this.entityTypeValidator.getSchema('TemplateType') != null) {
@@ -405,7 +390,17 @@ class MainReporter extends Reporter {
       if (req.context.returnResponseAndKeepWorker) {
         keepWorker = true
         res.stream = Readable.from(res.content)
-        await this.afterRenderListeners.fire(req, res)
+
+        // just temporary workaround until we change how report render works
+        await this.documentStore.collection('profiles').update({
+          _id: req.context.profiling.entity._id
+        }, {
+          $set: {
+            state: 'success',
+            finishedOn: new Date(),
+            blobPersisted: true
+          }
+        }, req)
         return res
       }
 

package/lib/main/request.js

@@ -0,0 +1,21 @@
+const extend = require('node.extend.without.arrays')
+
+module.exports = (obj) => {
+  const request = Object.create({}, {
+    __isJsreportRequest__: {
+      value: true,
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }
+  })
+
+  request.template = extend(true, {}, obj.template)
+
+  request.options = extend(true, {}, request.options, obj.options)
+  request.context = extend(true, {}, request.context, obj.context)
+  request.context.shared = extend(true, {}, request.context.shared)
+  request.data = obj.data
+
+  return request
+}

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.4.1",
   "description": "javascript based business reporting",
   "keywords": [
     "report",