Merge pull request #436 from bitfinexcom/staging

Release version to master

Author: prdn

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
         submodules: recursive
     - uses: actions/setup-node@v4
       with:
-        node-version: 18.17.1
+        node-version: 20.18.1
     - name: Setup configs
       run: |
         cp config/common.json.example config/common.json \

Dockerfile.express

@@ -1,4 +1,4 @@
-FROM node:18.17.1-alpine3.18
+FROM node:20.18.1-alpine3.20
 
 ENV BIND_HOST="0.0.0.0"
 

Dockerfile.grenache-grape

@@ -1,4 +1,4 @@
-FROM node:18.17.1-alpine3.18
+FROM node:20.18.1-alpine3.20
 
 ENV BIND_HOST="0.0.0.0"
 

Dockerfile.ui-builder

@@ -1,4 +1,4 @@
-FROM node:18.17.1-alpine3.18
+FROM node:20.18.1-alpine3.20
 
 WORKDIR /home/node/bfx-report-ui
 

Dockerfile.worker

@@ -1,16 +1,42 @@
-FROM node:18.17.1-bookworm
+FROM node:20.18.1-alpine3.20
 
 ARG GRC_VER="0.7.1"
 
 WORKDIR /home/node/grenache-cli
 
-RUN apt-get update -y \
-  && apt-get install -y --no-install-recommends \
-    jq \
-    xxd \
-    git \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
+RUN apk update && apk add --no-cache --virtual \
+  .gyp \
+  python3 \
+  make \
+  jq \
+  help2man \
+  gcc \
+  musl-dev \
+  autoconf \
+  automake \
+  libtool \
+  pkgconfig \
+  file \
+  patch \
+  bison \
+  clang \
+  flex \
+  curl \
+  perl \
+  perl-dev \
+  wget \
+  g++ \
+  git \
+  openssh \
+  bash \
+  chromium \
+  nss \
+  freetype \
+  harfbuzz \
+  ca-certificates \
+  ttf-freefont
+
+ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 
 RUN wget -c https://github.com/bitfinexcom/grenache-cli/releases/download/${GRC_VER}/grenache-cli-${GRC_VER}.tar.xz \
   && tar -xf grenache-cli-${GRC_VER}.tar.xz \

bfx-report-ui

@@ -1,6 +1,6 @@
 {
   "name": "bfx-reports-framework",
-  "version": "4.21.2",
+  "version": "4.21.3",
   "description": "Bitfinex reports framework",
   "main": "worker.js",
   "license": "Apache-2.0",
@@ -13,11 +13,11 @@
     "bignumber.js": "9.1.2",
     "csv": "5.5.3",
     "grenache-nodejs-ws": "git+https://github.com:bitfinexcom/grenache-nodejs-ws.git",
-    "html-pdf": "3.0.1",
     "inversify": "6.0.1",
     "lib-js-util-base": "git+https://github.com/bitfinexcom/lib-js-util-base.git",
     "lodash": "4.17.21",
     "moment": "2.29.4",
+    "puppeteer": "24.1.0",
     "uuid": "9.0.0",
     "yargs": "17.2.1"
   },

package.json

@@ -5,7 +5,7 @@ const path = require('path')
 const argv = require('yargs').argv
 const { v4: uuidv4 } = require('uuid')
 
-const pdf = require('html-pdf')
+const puppeteer = require('puppeteer')
 
 const MainPdfWriter = require(
   'bfx-report/workers/loc.api/generate-report-file/pdf-writer'
@@ -46,6 +46,7 @@ class PdfWriter extends MainPdfWriter {
     this.processMessageManager = processMessageManager
 
     this.isElectronjsEnv = argv.isElectronjsEnv
+    this.shouldZoomBeAdjusted = false
 
     this.addTemplates({
       fileNames: TEMPLATE_FILE_NAMES,
@@ -61,9 +62,7 @@ class PdfWriter extends MainPdfWriter {
     const {
       template = 'No data',
       format = 'portrait',
-      orientation = 'Letter',
-      headerHeight = '65mm',
-      footerHeight = '28mm'
+      orientation = 'Letter'
     } = args ?? {}
 
     if (this.isElectronjsEnv) {
@@ -74,30 +73,29 @@ class PdfWriter extends MainPdfWriter {
       })
     }
 
-    const headerOpt = headerHeight
-      ? { header: { height: headerHeight } }
-      : {}
-    const footerOpt = footerHeight
-      ? { footer: { height: footerHeight } }
-      : {}
-
-    return await new Promise((resolve, reject) => {
-      pdf.create(template, {
-        ...headerOpt,
-        ...footerOpt,
-
-        format,
-        orientation,
-        type: 'pdf',
-        timeout: 90000,
-        childProcessOptions: {
-          env: { OPENSSL_CONF: '/dev/null' }
-        }
-      }).toBuffer((error, buffer) => {
-        if (error) return reject(error)
-        resolve(buffer)
-      })
+    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 Buffer.from(u8ArrayPdf)
   }
 
   async createPDFBufferUnderElectron (args) {
@@ -145,6 +143,21 @@ class PdfWriter extends MainPdfWriter {
 
     return Buffer.from(buffer)
   }
+
+  #getFooterTemplate (args) {
+    const translate = this.getTranslator(args?.language ?? 'en')
+
+    return `\
+<span style="
+    position: absolute;
+    right: 10px;
+    bottom: 10px;
+    font-weight: 400;
+    font-size: 8px;
+  ">
+  ${translate('Page', 'template.page')} <span class=pageNumber></span> ${translate('from', 'template.from')} <span class=totalPages></span>
+</span>`
+  }
 }
 
 decorateInjectable(PdfWriter, depsTypes)