postpone setting http response timeout until the req.options.timeout …

…is parsed
jsreport · Apr 4, 2023 · ddef65b · ddef65b
1 parent d89d286
commit ddef65b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/packages/jsreport-core/lib/main/reporter.js b/packages/jsreport-core/lib/main/reporter.js
@@ -417,6 +417,7 @@ class MainReporter extends Reporter {
       }
 
       req = Request(req)
+      options.onReqReady?.(req)
 
       // TODO: we will probably validate in the thread
       if (this.entityTypeValidator.getSchema('TemplateType') != null) {

diff --git a/packages/jsreport-express/lib/routes.js b/packages/jsreport-express/lib/routes.js
@@ -31,7 +31,6 @@ module.exports = (app, reporter, exposedOptions) => {
   reporter.extensionsManager.extensions.forEach((e) => app.use('/extension/' + e.name, serveStatic(e.directory, { maxAge: oneMonth })))
 
   function httpRender (renderRequestContent, req, res, stream, next) {
-    res.setTimeout((reporter.getReportTimeout(req) + reporter.options.reportTimeoutMargin) * 1.2)
     res.setHeader('X-XSS-Protection', 0)
 
     const renderRequest = typeof renderRequestContent === 'string'
@@ -68,7 +67,9 @@ module.exports = (app, reporter, exposedOptions) => {
       abortEmitter.emit('abort')
     })
 
-    reporter.render(renderRequest, { abortEmitter }).then((renderResponse) => {
+    const onReqReady = (req) => res.setTimeout((reporter.getReportTimeout(req) + reporter.options.reportTimeoutMargin) * 1.2)
+
+    reporter.render(renderRequest, { abortEmitter, onReqReady }).then((renderResponse) => {
       abortEmitter.removeAllListeners('abort')
       if (stream) {
         form.append('report', renderResponse.stream, {

diff --git a/packages/jsreport-express/test/expressTest.js b/packages/jsreport-express/test/expressTest.js
@@ -539,3 +539,35 @@ describe('express with disabled cors', () => {
     r.headers.should.not.have.property('access-control-allow-methods')
   })
 })
+
+describe('express with low reportTimeout', () => {
+  let jsreport
+
+  beforeEach(() => {
+    jsreport = JsReport({
+      enableRequestReportTimeout: true,
+      reportTimeout: 100,
+      reportTimeoutMargin: 0
+    })
+      .use(require('../')())
+
+    return jsreport.init()
+  })
+
+  afterEach(() => jsreport && jsreport.close())
+
+  it('/api/report and res.setTimeout when options.timeout passed', () => {
+    return supertest(jsreport.express.app)
+      .post('/api/report')
+      .send({
+        template: {
+          content: 'hello',
+          engine: 'none',
+          helpers: 'await new Promise((resolve) => setTimeout(resolve, 110))',
+          recipe: 'html'
+        },
+        options: { timeout: 5000 }
+      })
+      .expect(200, 'hello')
+  })
+})