Merge pull request #515 from bitfinexcom/staging

Release version to master

Author: btrdnch

bfx-report-ui

@@ -1,6 +1,6 @@
 {
   "name": "@bitfinex/bfx-reports-framework",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "Bitfinex reports framework",
   "main": "worker.js",
   "engines": {
@@ -15,9 +15,8 @@
     "@bitfinex/lib-js-util-base": "git+https://github.com/bitfinexcom/lib-js-util-base.git",
     "bignumber.js": "9.1.2",
     "csv": "5.5.3",
-    "grenache-nodejs-ws": "git+https://github.com/bitfinexcom/grenache-nodejs-ws.git",
+    "grenache-nodejs-ws": "1.0.0",
     "inversify": "6.0.1",
-    "lodash": "4.17.23",
     "mathjs": "14.8.1",
     "moment": "2.29.4",
     "puppeteer": "24.1.0",
@@ -26,11 +25,11 @@
   },
   "devDependencies": {
     "@bitfinex/bfx-report-express": "git+https://github.com/bitfinexcom/bfx-report-express.git",
-    "bfx-api-mock-srv": "git+https://github.com/bitfinexcom/bfx-api-mock-srv.git",
+    "bfx-api-mock-srv": "2.0.0",
     "chai": "4.3.4",
     "concurrently": "9.2.1",
     "cross-env": "10.1.0",
-    "grenache-grape": "git+https://github.com/bitfinexcom/grenache-grape.git",
+    "grenache-grape": "1.0.0",
     "mocha": "11.1.0",
     "nodemon": "3.1.14",
     "standard": "17.0.0",

package-lock.json

@@ -36,7 +36,8 @@ const argv = require('yargs')
   .argv
 
 const {
-  PDFBufferUnderElectronCreationError
+  PDFBufferUnderElectronCreationError,
+  PDFBufferUnderFrameworkCreationError
 } = require('@bitfinex/bfx-report/workers/loc.api/errors')
 
 const appDeps = require('./loc.api/di/app.deps')
@@ -208,7 +209,10 @@ class WrkReportFrameWorkApi extends WrkReportServiceApi {
     await wsTransport.start()
 
     processorQueue.on('error:base', (err, job) => {
-      if (!(err instanceof PDFBufferUnderElectronCreationError)) {
+      if (
+        !(err instanceof PDFBufferUnderElectronCreationError) &&
+        !(err instanceof PDFBufferUnderFrameworkCreationError)
+      ) {
         return
       }
 

package.json

@@ -1,6 +1,6 @@
 'use strict'
 
-const { orderBy } = require('lodash')
+const { orderBy } = require('../../../helpers')
 
 module.exports = (migrationFileDirents) => {
   const metadata = migrationFileDirents.reduce((accum, dirent) => {

workers/api.framework.report.wrk.js

@@ -16,7 +16,8 @@ const {
 
 const TEMPLATE_FILE_NAMES = require('./template-file-names')
 const {
-  PDFBufferUnderElectronCreationError
+  PDFBufferUnderElectronCreationError,
+  PDFBufferUnderFrameworkCreationError
 } = require('@bitfinex/bfx-report/workers/loc.api/errors')
 
 const { decorateInjectable } = require('../../di/utils')
@@ -59,43 +60,51 @@ class PdfWriter extends MainPdfWriter {
    * @override
    */
   async createPDFBuffer (args) {
-    const {
-      template = 'No data',
-      format = 'portrait',
-      orientation = 'Letter'
-    } = args ?? {}
+    const _args = {
+      template: 'No data',
+      format: 'portrait',
+      orientation: 'Letter',
+      timeout: 10 * 60 * 1000,
+      ...args
+    }
 
     if (this.isElectronjsEnv) {
-      return await this.createPDFBufferUnderElectron({
-        template,
-        format,
-        orientation
-      })
+      return await this.createPDFBufferUnderElectron(_args)
     }
 
-    const browser = await puppeteer.launch({
-      args: ['--no-sandbox', '--disable-gpu']
-    })
-    const page = await browser.newPage()
-    await page.setContent(template, {
-      waitUntil: 'domcontentloaded'
-    })
-    await page.emulateMediaType('print')
-    const u8ArrayPdf = await page.pdf({
-      landscape: format !== 'portrait',
-      format: orientation,
-      margins: {
-        top: 0,
-        bottom: 0,
-        left: 0,
-        right: 0
-      },
-      displayHeaderFooter: true,
-      footerTemplate: this.#getFooterTemplate(args)
-    })
-    await browser.close()
+    return await this.createPDFBufferUnderFramework(_args)
+  }
+
+  async createPDFBufferUnderFramework (args) {
+    try {
+      const browser = await puppeteer.launch({
+        args: ['--no-sandbox', '--disable-gpu'],
+        protocolTimeout: args?.timeout,
+        timeout: 60_000
+      })
+      const page = await browser.newPage()
+      await page.setContent(args?.template, {
+        waitUntil: 'domcontentloaded'
+      })
+      await page.emulateMediaType('print')
+      const u8ArrayPdf = await page.pdf({
+        landscape: args?.format !== 'portrait',
+        format: args?.orientation,
+        margins: {
+          top: 0,
+          bottom: 0,
+          left: 0,
+          right: 0
+        },
+        displayHeaderFooter: true,
+        footerTemplate: this.#getFooterTemplate(args)
+      })
+      await browser.close()
 
-    return Buffer.from(u8ArrayPdf)
+      return Buffer.from(u8ArrayPdf)
+    } catch (err) {
+      throw new PDFBufferUnderFrameworkCreationError(err)
+    }
   }
 
   async createPDFBufferUnderElectron (args) {
@@ -117,7 +126,8 @@ class PdfWriter extends MainPdfWriter {
         templateFilePath: uniqueFileName,
         format: args?.format,
         orientation: args?.orientation,
-        uid
+        uid,
+        timeout: args?.timeout
       }
     )
 

workers/loc.api/di/factories/helpers/get-migration-file-metadata.js

@@ -11,7 +11,8 @@ const {
   sumAllObjectsNumbers,
   pickAllLowerObjectsNumbers,
   sumArrayVolumes,
-  pushLargeArr
+  pushLargeArr,
+  orderBy
 } = require('./utils')
 const {
   isSubAccountApiKeys,
@@ -35,5 +36,6 @@ module.exports = {
   pickAllLowerObjectsNumbers,
   sumArrayVolumes,
   pushLargeArr,
+  orderBy,
   isBfxApiStaging
 }