Merge branch 'master' of https://github.com/jsreport/jsreport

packages/advanced-workers/lib/pool.js

@@ -79,18 +79,24 @@ module.exports = ({
         }
       }
 
+      let timeoutId
+
       return new Promise((resolve, reject) => {
         const task = { resolve, reject }
         this.tasksQueue.push(task)
         if (opts && opts.timeout) {
-          setTimeout(() => {
+          timeoutId = setTimeout(() => {
             const taskIndex = this.tasksQueue.indexOf(task)
             if (taskIndex !== -1) {
               this.tasksQueue.splice(taskIndex, 1)
               task.reject(new Error('Timeout when waiting for worker'))
             }
           }, opts.timeout).unref()
         }
+      }).finally(() => {
+        if (timeoutId != null) {
+          clearTimeout(timeoutId)
+        }
       })
     },
 

packages/advanced-workers/lib/threadWorker.js

@@ -1,9 +1,7 @@
 const serializator = require('@jsreport/serializator')
 
 function asyncAwaiter (id) {
-  const awaiter = {
-    isResolved: false
-  }
+  const awaiter = {}
   awaiter.promise = new Promise((resolve, reject) => {
     awaiter.resolve = (v) => {
       awaiter.isSettled = true
@@ -27,16 +25,19 @@ module.exports = ({
   let closingWhenWaitingForMainExecution
 
   worker.on('message', (m) => {
-    currentAsyncAwaiter.resolve(m)
+    if (currentAsyncAwaiter) {
+      currentAsyncAwaiter.resolve(m)
+    }
   })
 
   function postAndWait (m, { executeMain, timeout }) {
+    let timeoutId
     worker.ref()
     // eslint-disable-next-line
     return new Promise(async (resolve, reject) => {
       let isDone = false
       if (timeout) {
-        setTimeout(() => {
+        timeoutId = setTimeout(() => {
           if (!isDone) {
             isDone = true
             const e = new Error(`Timeout occurred when waiting for the worker${m.systemAction != null ? ` action "${m.systemAction}"` : ''}`)
@@ -102,15 +103,34 @@ module.exports = ({
           }
         }
       }
+    }).finally(() => {
+      if (timeoutId != null) {
+        clearTimeout(timeoutId)
+      }
+
+      // we only clear the awaiter here for the cases in which
+      // we are sure there is not work pending (timeouts, top level errors on worker),
+      // for the rest we let other logic to run and clear the awaiter
+      // at specific places
+      if (currentAsyncAwaiter && currentAsyncAwaiter.isSettled) {
+        // cleanup to avoid a hanging promise
+        currentAsyncAwaiter = null
+      }
     })
   }
 
   let closingAwaiter
+  let closingTimeoutId
   let exited = false
+
   worker.on('exit', (exitCode) => {
     exited = true
     if (closingAwaiter && !closingAwaiter.isSettled) {
       closingAwaiter.resolve()
+      // cleanup to avoid a hanging promise
+      closingAwaiter = null
+      clearTimeout(closingTimeoutId)
+      closingTimeoutId = null
     } else {
       if (currentAsyncAwaiter && !currentAsyncAwaiter.isSettled) {
         const err = new Error('Worker unexpectedly exited')
@@ -119,6 +139,8 @@ module.exports = ({
           workerCrashed: true,
           err
         })
+        // cleanup to avoid a hanging promise
+        currentAsyncAwaiter = null
       }
     }
     worker.unref()
@@ -130,6 +152,8 @@ module.exports = ({
       workerCrashed: true,
       err
     })
+    // cleanup to avoid a hanging promise
+    currentAsyncAwaiter = null
     worker.unref()
   })
 
@@ -159,24 +183,31 @@ module.exports = ({
           workerCrashed: true,
           err
         })
+        // cleanup to avoid a hanging promise
+        currentAsyncAwaiter = null
         worker.unref()
       } else {
         closingWhenWaitingForMainExecution = true
       }
 
-      setTimeout(() => {
-        if (!exited && !closingAwaiter.isSettled) {
+      closingTimeoutId = setTimeout(() => {
+        if (!exited && closingAwaiter && !closingAwaiter.isSettled) {
           worker.terminate()
           closingAwaiter.resolve()
+          // cleanup to avoid a hanging promise
+          closingAwaiter = null
           worker.unref()
         }
+
+        closingTimeoutId = null
       }, closeTimeout).unref()
 
       closingAwaiter = asyncAwaiter()
       worker.ref()
       worker.postMessage({
         systemAction: 'close'
       })
+
       return closingAwaiter.promise
     }
   }

packages/advanced-workers/lib/workerHandler.js

@@ -61,7 +61,7 @@ async function processAndResponse (m, fn) {
   try {
     parentPort.postMessage(message)
   } catch (e) {
-    // the errors are tricky and may contain unserializable props, we should probably omit these somehow but still keep ours
+    // the errors are tricky and may contain un-serializable props, we should probably omit these somehow but still keep ours
     if (message.errorData) {
       parentPort.postMessage({
         type: 'response',
@@ -96,7 +96,9 @@ parentPort.on('message', (m) => {
     return processAndResponse(m, init)
   }
   if (m.systemAction === 'close') {
-    workerModule.close()
+    const closePromise = typeof workerModule.close === 'function' ? workerModule.close() : Promise.resolve()
+
+    closePromise
       .finally(() => {
         // it seems it is important to exit on next tick
         // otherwise the node.js crash with FATAL ERROR
@@ -112,11 +114,15 @@ parentPort.on('message', (m) => {
   if (m.systemAction === 'callback-response') {
     if (!m.errorData) {
       currentCallbackResponseAwaiter.resolve(m.userData)
+      // cleanup to avoid a hanging promise
+      currentCallbackResponseAwaiter = null
     } else {
       const error = new Error(m.errorData.message)
       error.stack = m.errorData.stack
       Object.assign(error, m.errorData)
       currentCallbackResponseAwaiter.reject(error)
+      // cleanup to avoid a hanging promise
+      currentCallbackResponseAwaiter = null
     }
   }
 })

packages/advanced-workers/test/workers/timeout.js

@@ -9,7 +9,7 @@ module.exports = (initData) => {
         return
       }
       while (true) {
-        // endles loop
+        // endless loop
       }
     }
   }

packages/jsreport-assets/lib/main.js

@@ -70,7 +70,8 @@ module.exports = function (reporter, definition) {
         await response({
           previewOptions: reporter.options.office != null && reporter.options.office.preview != null ? reporter.options.office.preview : {},
           officeDocumentType: path.extname(asset.filename).slice(1),
-          buffer: asset.buffer
+          buffer: asset.buffer,
+          logger: reporter.logger
         }, req, res)
 
         res.setHeader('Content-Type', res.meta.contentType)

packages/jsreport-core/lib/main/profiler.js

@@ -29,7 +29,7 @@ module.exports = (reporter) => {
   const profilerRequestMap = new Map()
 
   function runInProfilerChain (fnOrOptions, req) {
-    if (req.context.profiling.mode === 'disabled') {
+    if (req.context.profiling == null || req.context.profiling.mode === 'disabled') {
       return
     }
 
@@ -352,7 +352,7 @@ module.exports = (reporter) => {
                 type: 'log',
                 level: info.level,
                 message: info.message,
-                previousOperationId: req.context.profiling.lastOperationId
+                previousOperationId: req.context.profiling?.lastOperationId
               }, req)],
               log: false
             }, req)

packages/jsreport-core/lib/main/reporter.js

@@ -266,7 +266,7 @@ class MainReporter extends Reporter {
 
       this._workersManager = this._workersManagerFactory
         ? this._workersManagerFactory(workersManagerOptions, workersManagerSystemOptions)
-        : WorkersManager(workersManagerOptions, workersManagerSystemOptions, this.logger)
+        : WorkersManager(workersManagerOptions, workersManagerSystemOptions)
 
       const workersStart = new Date().getTime()
 

packages/jsreport-core/lib/worker/render/render.js

@@ -3,7 +3,6 @@
  *
  * Orchestration of the rendering process
  */
-const { Readable } = require('stream')
 const extend = require('node.extend.without.arrays')
 const ExecuteEngine = require('./executeEngine')
 const Request = require('../../shared/request')
@@ -101,10 +100,6 @@ module.exports = (reporter) => {
 
   async function afterRender (reporter, request, response) {
     await reporter.afterRenderListeners.fire(request, response)
-
-    response.stream = Readable.from(response.content)
-    response.result = response.stream
-
     return response
   }
 

packages/jsreport-docx/.gitignore

@@ -34,6 +34,8 @@ node_modules
 
 # jsreport files
 data
+!test/data
+
 logs
 jsreport.config.json
 

packages/jsreport-docx/lib/decodeXML.js

@@ -0,0 +1,5 @@
+const { decode } = require('html-entities')
+
+module.exports = function decodeXML (str) {
+  return decode(str, { level: 'xml' })
+}

packages/jsreport-docx/lib/imageUtils.js

@@ -5,41 +5,55 @@ const { pxToEMU, cmToEMU, getDimension } = require('./utils')
 module.exports.resolveImageSrc = async function resolveImageSrc (src) {
   let imageBuffer
   let imageExtension
+  let imageSource
 
-  if (src && src.startsWith('data:')) {
-    const imageSrc = src
+  try {
+    if (src && src.startsWith('data:')) {
+      const imageSrc = src
 
-    imageExtension = imageSrc.split(';')[0].split('/')[1]
+      imageSource = 'inline'
 
-    imageBuffer = Buffer.from(
-      imageSrc.split(';')[1].substring('base64,'.length),
-      'base64'
-    )
-  } else {
-    const response = await axios({
-      url: src,
-      responseType: 'arraybuffer',
-      method: 'GET'
-    })
+      imageExtension = imageSrc.split(';')[0].split('/')[1]
+      // we remove subtypes "+..." from the type, like in the case of "svg+xml"
+      imageExtension = imageExtension.split('+')[0]
 
-    const contentType = response.headers['content-type'] || response.headers['Content-Type']
+      imageBuffer = Buffer.from(
+        imageSrc.split(';')[1].substring('base64,'.length),
+        'base64'
+      )
+    } else {
+      imageSource = 'remote'
 
-    if (!contentType) {
-      throw new Error(`Empty content-type for remote image at "${src}"`)
-    }
+      const response = await axios({
+        url: src,
+        responseType: 'arraybuffer',
+        method: 'GET'
+      })
 
-    const extensionsParts = contentType.split(';')[0].split('/').filter((p) => p)
+      const contentType = response.headers['content-type'] || response.headers['Content-Type']
 
-    if (extensionsParts.length === 0 || extensionsParts.length > 2) {
-      throw new Error(`Invalid content-type "${contentType}" for remote image at "${src}"`)
-    }
+      if (!contentType) {
+        throw new Error(`Empty content-type for remote image at "${src}"`)
+      }
 
-    // some servers returns the image content type without the "image/" prefix
-    imageExtension = extensionsParts.length === 1 ? extensionsParts[0] : extensionsParts[1]
-    imageBuffer = Buffer.from(response.data)
+      const extensionsParts = contentType.split(';')[0].split('/').filter((p) => p)
+
+      if (extensionsParts.length === 0 || extensionsParts.length > 2) {
+        throw new Error(`Invalid content-type "${contentType}" for remote image at "${src}"`)
+      }
+
+      // some servers returns the image content type without the "image/" prefix
+      imageExtension = extensionsParts.length === 1 ? extensionsParts[0] : extensionsParts[1]
+      // we remove subtypes "+..." from the type, like in the case of "svg+xml"
+      imageExtension = imageExtension.split('+')[0]
+      imageBuffer = Buffer.from(response.data)
+    }
+  } catch (error) {
+    error.imageSource = imageSource
+    throw error
   }
 
-  return { imageBuffer, imageExtension }
+  return { imageSource, imageBuffer, imageExtension }
 }
 
 module.exports.getImageSizeInEMU = function getImageSizeInEMU (imageBuffer, customSize = {}) {