Skip to content

Commit 7ac0f68

Browse files
authored
Merge pull request #358 from bitfinexcom/staging
Release version to master
2 parents 54eaa43 + 142a5cc commit 7ac0f68

File tree

6 files changed

+110
-6
lines changed

6 files changed

+110
-6
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: npm i
3232
- name: Run tests
3333
run: npm test -- --reporter=json --reporter-option output=test-report.json
34-
- uses: actions/upload-artifact@v3
34+
- uses: actions/upload-artifact@v4
3535
if: success() || failure()
3636
with:
3737
name: test-results

.github/workflows/test-report.yml

+12-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,22 @@ jobs:
1717
name: Web Page Report
1818
runs-on: ubuntu-22.04
1919
steps:
20-
- uses: dorny/test-reporter@v1
20+
- name: Download test results
21+
uses: actions/download-artifact@v4
22+
with:
23+
run-id: ${{ github.event.workflow_run.id }}
24+
github-token: ${{ secrets.GITHUB_TOKEN }}
25+
name: test-results
26+
path: test-results
27+
- uses: dorny/[email protected]
2128
id: test-results
2229
with:
23-
artifact: test-results
2430
name: Mocha Tests
25-
path: test-report.json
31+
path: test-results/test-report.json
2632
reporter: mocha-json
33+
# Workaround for error 'fatal: not a git repository' caused by a call to 'git ls-files'
34+
# See: https://github.com/dorny/test-reporter/issues/169#issuecomment-1583560458
35+
max-annotations: 0
2736
- name: Test Report Summary
2837
run: |
2938
echo "### Test Report page is ready! :rocket:" >> $GITHUB_STEP_SUMMARY

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bfx-report",
3-
"version": "4.9.0",
3+
"version": "4.10.0",
44
"description": "Reporting tool",
55
"main": "worker.js",
66
"license": "Apache-2.0",

workers/api.service.report.wrk.js

+8
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ const TYPES = require('./loc.api/di/types')
4646
const {
4747
setLoggerDeps
4848
} = require('./loc.api/logger/logger-deps')
49+
const {
50+
PDFBufferUnderElectronCreationError
51+
} = require('./loc.api/errors')
4952

5053
class WrkReportServiceApi extends WrkApi {
5154
constructor (conf, ctx) {
@@ -209,6 +212,11 @@ class WrkReportServiceApi extends WrkApi {
209212
aggregatorQueue.on('job', aggregator)
210213

211214
processorQueue.on('error:base', (err) => {
215+
// This error is intercepted and processed in the framework mode
216+
if (err instanceof PDFBufferUnderElectronCreationError) {
217+
return
218+
}
219+
212220
this.logger.error(`PROCESSOR:QUEUE: ${err.stack || err}`)
213221
})
214222
aggregatorQueue.on('error:base', (err) => {

workers/loc.api/errors/index.js

+13-1
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,17 @@ class WeightedAveragesTimeframeError extends UnprocessableEntityError {
178178
}
179179
}
180180

181+
class PDFBufferUnderElectronCreationError extends BaseError {
182+
constructor (electronErrStr) {
183+
const _args = getErrorArgs(
184+
{ data: { electronErrStr } },
185+
'ERR_PDF_BUFFER_UNDER_ELECTRON_HAS_NOT_BEEN_CREATED'
186+
)
187+
188+
super(_args)
189+
}
190+
}
191+
181192
module.exports = {
182193
BaseError,
183194
BadRequestError,
@@ -201,5 +212,6 @@ module.exports = {
201212
GrcSlackAvailabilityError,
202213
GrcPDFAvailabilityError,
203214
ImplementationError,
204-
WeightedAveragesTimeframeError
215+
WeightedAveragesTimeframeError,
216+
PDFBufferUnderElectronCreationError
205217
}

workers/loc.api/generate-report-file/pdf-writer/translations.yml

+75
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,78 @@ ru:
2727
copyright: Авторское право © 2013-2024 iFinex Inc. Все права защищены.
2828
page: Стр.
2929
from: из
30+
31+
zh-CN:
32+
template:
33+
title: 报告
34+
statementDetails: 结算明细
35+
statementDate: 结算日期
36+
snapshotAt: 快照时间
37+
period: 期间
38+
username: 用户名
39+
email: 电子邮箱
40+
errorMessage: 无法建立档案,请重试
41+
reportGenAt: 报告创建时间
42+
copyright: Copyright © 2013-2024 iFinex Inc. All rights reserved.
43+
page: 页数
44+
from:
45+
46+
zh-TW:
47+
template:
48+
title: 報告
49+
statementDetails: 結算明細
50+
statementDate: 結算日期
51+
snapshotAt: 快照時間:
52+
period: 期間
53+
username: 用戶名
54+
email: 電子郵箱
55+
errorMessage: 無法建立檔案,請重試
56+
reportGenAt: 報告建立時間:
57+
copyright: Copyright © 2013-2024 iFinex Inc. All rights reserved.
58+
page: 頁數
59+
from:
60+
61+
es-EM:
62+
template:
63+
title: Reporte
64+
statementDetails: Detalles del Estado
65+
statementDate: Fecha del Estado
66+
snapshotAt: Captura al
67+
period: Periodo
68+
username: Nombre de Usuario
69+
email: Correo
70+
errorMessage: Tu archivo no pudo ser completado, por favor inténtalo de nuevo
71+
reportGenAt: Reporte generado al
72+
copyright: Copyright © 2013-2024 iFinex Inc. Todos los derechos reservados.
73+
page: Página
74+
from: de
75+
76+
tr:
77+
template:
78+
title: Rapor
79+
statementDetails: Beyanname Detayları
80+
statementDate: Beyanname Tarihi
81+
snapshotAt: 'Anlık Görüntü:'
82+
period: Dönem
83+
username: Kullanıcı Adı
84+
email: Email
85+
errorMessage: Dosyanız tamamlanamadı, lütfen tekrar deneyin
86+
reportGenAt: 'Rapor şu tarihte oluşturuldu:'
87+
copyright: Telif Hakkı © 2013-2024 iFinex Inc. Tüm hakları saklıdır.
88+
page: Sayfa
89+
from: İtibaren
90+
91+
pt-BR:
92+
template:
93+
title: Informes
94+
statementDetails: Detalhes da declaração
95+
statementDate: Data da declaração
96+
snapshotAt: Captura de
97+
period: Período
98+
username: Nome de Usuário
99+
email: e-mail
100+
errorMessage: Seu arquivo não pode ser completado, por favor tente novamente
101+
reportGenAt: 'Informe gerado em '
102+
copyright: Copyright © 2013-2024 iFinex Inc. Todos os direitos reservados.
103+
page: Página
104+
from: de

0 commit comments

Comments
 (0)