@resolveio/server-lib 20.12.35 → 20.12.37
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/collections/report-builder-report.collection.js +0 -20
- package/collections/report-builder-report.collection.js.map +1 -1
- package/methods/cron-jobs.js +1 -1
- package/methods/cron-jobs.js.map +1 -1
- package/methods/pdf.js +106 -38
- package/methods/pdf.js.map +1 -1
- package/methods/report-builder.js +35 -147
- package/methods/report-builder.js.map +1 -1
- package/methods.ts +2 -2
- package/models/report-builder-report.model.d.ts +0 -7
- package/models/report-builder-report.model.js.map +1 -1
- package/package.json +1 -1
- package/util/schema-report-builder.js +1 -1
- package/util/schema-report-builder.js.map +1 -1
package/methods/pdf.js
CHANGED
|
@@ -49,8 +49,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
49
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
50
|
exports.loadPDFMethods = loadPDFMethods;
|
|
51
51
|
var fs = require("fs");
|
|
52
|
-
var path = require("path");
|
|
53
52
|
var os = require("os");
|
|
53
|
+
var path = require("path");
|
|
54
54
|
var pdf_lib_1 = require("pdf-lib");
|
|
55
55
|
var puppeteer = require("puppeteer");
|
|
56
56
|
var simpl_schema_1 = require("simpl-schema");
|
|
@@ -154,6 +154,7 @@ function launchPDFBrowser(headless, devtools) {
|
|
|
154
154
|
function loadPDFMethods(methodManager) {
|
|
155
155
|
methodManager.methods({
|
|
156
156
|
generatePDF: {
|
|
157
|
+
bypassSession: true,
|
|
157
158
|
check: new simpl_schema_1.default({
|
|
158
159
|
html: {
|
|
159
160
|
type: String
|
|
@@ -184,7 +185,7 @@ function loadPDFMethods(methodManager) {
|
|
|
184
185
|
}),
|
|
185
186
|
function: function (html_1, fileName_1) {
|
|
186
187
|
return __awaiter(this, arguments, void 0, function (html, fileName, orientation, fontSize, upload, uploadFileOrder, uploadFileType) {
|
|
187
|
-
var enableDebugFlag, enableDebug, browser, page, pathToFont, dejavuserif_woff, dejavuserifBold_woff, dejavuserifItalic_woff, dejavuserifBoldItalic_woff, content, tmpFileName, data, fileData;
|
|
188
|
+
var enableDebugFlag, enableDebug, maxAttempts, lastError, attempt, browser, page, pathToFont, dejavuserif_woff, dejavuserifBold_woff, dejavuserifItalic_woff, dejavuserifBoldItalic_woff, content, tmpFileName, data, fileData, err_1;
|
|
188
189
|
if (orientation === void 0) { orientation = 'portrait'; }
|
|
189
190
|
if (fontSize === void 0) { fontSize = '12px'; }
|
|
190
191
|
if (upload === void 0) { upload = false; }
|
|
@@ -196,11 +197,21 @@ function loadPDFMethods(methodManager) {
|
|
|
196
197
|
case 1:
|
|
197
198
|
enableDebugFlag = _a.sent();
|
|
198
199
|
enableDebug = !!(enableDebugFlag && enableDebugFlag.value);
|
|
199
|
-
|
|
200
|
+
maxAttempts = 2;
|
|
201
|
+
lastError = null;
|
|
202
|
+
attempt = 1;
|
|
203
|
+
_a.label = 2;
|
|
200
204
|
case 2:
|
|
205
|
+
if (!(attempt <= maxAttempts)) return [3 /*break*/, 18];
|
|
206
|
+
browser = null;
|
|
207
|
+
_a.label = 3;
|
|
208
|
+
case 3:
|
|
209
|
+
_a.trys.push([3, 14, , 17]);
|
|
210
|
+
return [4 /*yield*/, launchPDFBrowser(!enableDebug, enableDebug)];
|
|
211
|
+
case 4:
|
|
201
212
|
browser = _a.sent();
|
|
202
213
|
return [4 /*yield*/, browser.newPage()];
|
|
203
|
-
case
|
|
214
|
+
case 5:
|
|
204
215
|
page = _a.sent();
|
|
205
216
|
pathToFont = '';
|
|
206
217
|
if (fs.existsSync(path.join(__dirname, ('../private/fonts/dejavuserif.woff')))) {
|
|
@@ -218,12 +229,12 @@ function loadPDFMethods(methodManager) {
|
|
|
218
229
|
dejavuserifBold_woff = 'data:application/font-woff;base64,' + Buffer.from(fs.readFileSync(pathToFont + 'dejavuserif-bold.woff').buffer).toString('base64');
|
|
219
230
|
dejavuserifItalic_woff = 'data:application/font-woff;base64,' + Buffer.from(fs.readFileSync(pathToFont + 'dejavuserif-italic.woff').buffer).toString('base64');
|
|
220
231
|
dejavuserifBoldItalic_woff = 'data:application/font-woff;base64,' + Buffer.from(fs.readFileSync(pathToFont + 'dejavuserif-bolditalic.woff').buffer).toString('base64');
|
|
221
|
-
content = "\n\t\t\t\t\t<head>\n\t\t\t\t\t\t<style type=\"text/css\">\n\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\tfont-style: normal;\n\t\t\t\t\t\t\t\tfont-weight: normal;\n\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserif_woff + "\") format('woff');\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\tfont-style: normal;\n\t\t\t\t\t\t\t\tfont-weight: bold;\n\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifBold_woff + "\") format('woff');\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\tfont-style: italic;\n\t\t\t\t\t\t\t\tfont-weight: normal;\n\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifItalic_woff + "\") format('woff');\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\tfont-style: italic;\n\t\t\t\t\t\t\t\tfont-weight: bold;\n\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifBoldItalic_woff + "\") format('woff');\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\tbody {\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif', serif;\n\t\t\t\t\t\t\t\tfont-size: " + (fontSize ? fontSize : '12px') + ";\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.row {\n\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\tdisplay: flex;\n\t\t\t\t\t\t\t\tflex-wrap: wrap;\n\t\t\t\t\t\t\t\t-webkit-flex-wrap: wrap;\n\t\t\t\t\t\t\t\tpage-break-inside: avoid !important;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.page-break {\n\t\t\t\t\t\t\t\tpage-break-before: always !important;\n\t\t\t\t\t\t\t\tpadding-top: 1px;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.cell {\n\t\t\t\t\t\t\t\tbox-sizing: border-box;\n\t\t\t\t\t\t\t\tpadding : 2px;\n\t\t\t\t\t\t\t\t-webkit-flex: 1;\n\t\t\t\t\t\t\t\tword-wrap: break-word;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.cell-no-padding {\n\t\t\t\t\t\t\t\tbox-sizing: border-box;\n\t\t\t\t\t\t\t\t-webkit-flex: 1;\n\t\t\t\t\t\t\t\tword-wrap: break-word;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.centered {\n\t\t\t\t\t\t\t\t-webkit-justify-content: center;\n\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\ttext-align: center;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.centered-left {\n\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t-webkit-justify-content: flex-start;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.centered-right {\n\t\t\t\t\t\t\t\t-webkit-justify-content: flex-end;\n\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t.box {\n\t\t\t\t\t\t\t\tborder: 1px solid black;\n\t\t\t\t\t\t\t\tmargin: -1px 0px 0px -1px;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.boxNoBorder {\n\t\t\t\t\t\t\t\tmargin: -1px 0px 0px -1px;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\tpre {\n\t\t\t\t\t\t\t\twhite-space: pre-wrap; /* css-3 */\n\t\t\t\t\t\t\t\twhite-space: -moz-pre-wrap; /* Mozilla, since 1999 */\n\t\t\t\t\t\t\t\twhite-space: -pre-wrap; /* Opera 4-6 */\n\t\t\t\t\t\t\t\twhite-space: -o-pre-wrap; /* Opera 7 */\n\t\t\t\t\t\t\t\tword-wrap: break-word; /* Internet Explorer 5.5+ */\n\t\t\t\t\t\t\t\tfont-size: 12px;\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif'; \n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t</style>\n\t\t\t\t\t</head>\n\t\t\t\t\t<body>\n\t\t\t\t" + html.replace(new RegExp('flex-basis:', 'g'), '-webkit-flex-basis:').replace(new RegExp('flex:', 'g'), '-webkit-flex:') + '</body>';
|
|
232
|
+
content = "\n\t\t\t\t\t\t\t<head>\n\t\t\t\t\t\t\t\t<style type=\"text/css\">\n\t\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\t\t\tfont-style: normal;\n\t\t\t\t\t\t\t\t\t\tfont-weight: normal;\n\t\t\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserif_woff + "\") format('woff');\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\t\t\tfont-style: normal;\n\t\t\t\t\t\t\t\t\t\tfont-weight: bold;\n\t\t\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifBold_woff + "\") format('woff');\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\t\t\tfont-style: italic;\n\t\t\t\t\t\t\t\t\t\tfont-weight: normal;\n\t\t\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifItalic_woff + "\") format('woff');\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\t\t\tfont-style: italic;\n\t\t\t\t\t\t\t\t\t\tfont-weight: bold;\n\t\t\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifBoldItalic_woff + "\") format('woff');\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\tbody {\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif', serif;\n\t\t\t\t\t\t\t\t\t\tfont-size: " + (fontSize ? fontSize : '12px') + ";\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.row {\n\t\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t\t\tdisplay: flex;\n\t\t\t\t\t\t\t\t\t\tflex-wrap: wrap;\n\t\t\t\t\t\t\t\t\t\t-webkit-flex-wrap: wrap;\n\t\t\t\t\t\t\t\t\t\tpage-break-inside: avoid !important;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.page-break {\n\t\t\t\t\t\t\t\t\t\tpage-break-before: always !important;\n\t\t\t\t\t\t\t\t\t\tpadding-top: 1px;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.cell {\n\t\t\t\t\t\t\t\t\t\tbox-sizing: border-box;\n\t\t\t\t\t\t\t\t\t\tpadding : 2px;\n\t\t\t\t\t\t\t\t\t\t-webkit-flex: 1;\n\t\t\t\t\t\t\t\t\t\tword-wrap: break-word;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.cell-no-padding {\n\t\t\t\t\t\t\t\t\t\tbox-sizing: border-box;\n\t\t\t\t\t\t\t\t\t\t-webkit-flex: 1;\n\t\t\t\t\t\t\t\t\t\tword-wrap: break-word;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.centered {\n\t\t\t\t\t\t\t\t\t\t-webkit-justify-content: center;\n\t\t\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t\t\ttext-align: center;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.centered-left {\n\t\t\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t\t\t-webkit-justify-content: flex-start;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.centered-right {\n\t\t\t\t\t\t\t\t\t\t-webkit-justify-content: flex-end;\n\t\t\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t.box {\n\t\t\t\t\t\t\t\t\t\tborder: 1px solid black;\n\t\t\t\t\t\t\t\t\t\tmargin: -1px 0px 0px -1px;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.boxNoBorder {\n\t\t\t\t\t\t\t\t\t\tmargin: -1px 0px 0px -1px;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\tpre {\n\t\t\t\t\t\t\t\t\t\twhite-space: pre-wrap; /* css-3 */\n\t\t\t\t\t\t\t\t\t\twhite-space: -moz-pre-wrap; /* Mozilla, since 1999 */\n\t\t\t\t\t\t\t\t\t\twhite-space: -pre-wrap; /* Opera 4-6 */\n\t\t\t\t\t\t\t\t\t\twhite-space: -o-pre-wrap; /* Opera 7 */\n\t\t\t\t\t\t\t\t\t\tword-wrap: break-word; /* Internet Explorer 5.5+ */\n\t\t\t\t\t\t\t\t\t\tfont-size: 12px;\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif'; \n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t</style>\n\t\t\t\t\t\t\t</head>\n\t\t\t\t\t\t\t<body>\n\t\t\t\t\t\t" + html.replace(new RegExp('flex-basis:', 'g'), '-webkit-flex-basis:').replace(new RegExp('flex:', 'g'), '-webkit-flex:') + '</body>';
|
|
222
233
|
return [4 /*yield*/, page.setContent(content, { waitUntil: ['domcontentloaded', 'load', 'networkidle0'], timeout: 0 })];
|
|
223
|
-
case
|
|
234
|
+
case 6:
|
|
224
235
|
_a.sent();
|
|
225
236
|
return [4 /*yield*/, page.evaluateHandle('document.fonts.ready')];
|
|
226
|
-
case
|
|
237
|
+
case 7:
|
|
227
238
|
_a.sent();
|
|
228
239
|
tmpFileName = (0, common_1.objectIdHexString)() + '.pdf';
|
|
229
240
|
return [4 /*yield*/, page.pdf({
|
|
@@ -238,26 +249,27 @@ function loadPDFMethods(methodManager) {
|
|
|
238
249
|
},
|
|
239
250
|
printBackground: true,
|
|
240
251
|
displayHeaderFooter: true,
|
|
241
|
-
headerTemplate: "\n\t\t\t\t\t\t<style>\n\t\t\t\t\t\t\t#header { \n\t\t\t\t\t\t\t\tpadding: 0 0 10px 10px !important; \n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t</style>\n\t\t\t\t\t\t<span></span>\n\t\t\t\t\t",
|
|
242
|
-
footerTemplate: "\n\t\t\t\t\t\t<style>\n\t\t\t\t\t\t\t#footer { \n\t\t\t\t\t\t\t\tpadding: 0 0 10px 10px !important;\n\t\t\t\t\t\t\t\tfont-size: 10px;\n\t\t\t\t\t\t\t\tfont-family: san-serif;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t</style>\n\t\t\t\t\t\t<div style=\"padding-bottom: 2px; padding-right: 15px; text-align: right; width: 100%;\">\n\t\t\t\t\t\t\tPage <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>\n\t\t\t\t\t\t</div>\n\t\t\t\t\t",
|
|
252
|
+
headerTemplate: "\n\t\t\t\t\t\t\t\t<style>\n\t\t\t\t\t\t\t\t\t#header { \n\t\t\t\t\t\t\t\t\t\tpadding: 0 0 10px 10px !important; \n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t</style>\n\t\t\t\t\t\t\t\t<span></span>\n\t\t\t\t\t\t\t",
|
|
253
|
+
footerTemplate: "\n\t\t\t\t\t\t\t\t<style>\n\t\t\t\t\t\t\t\t\t#footer { \n\t\t\t\t\t\t\t\t\t\tpadding: 0 0 10px 10px !important;\n\t\t\t\t\t\t\t\t\t\tfont-size: 10px;\n\t\t\t\t\t\t\t\t\t\tfont-family: san-serif;\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t</style>\n\t\t\t\t\t\t\t\t<div style=\"padding-bottom: 2px; padding-right: 15px; text-align: right; width: 100%;\">\n\t\t\t\t\t\t\t\t\tPage <span class=\"pageNumber\"></span> of <span class=\"totalPages\"></span>\n\t\t\t\t\t\t\t\t</div>\n\t\t\t\t\t\t\t",
|
|
243
254
|
path: path.join(__dirname, (tmpFileName)),
|
|
244
255
|
timeout: 0
|
|
245
256
|
})];
|
|
246
|
-
case
|
|
257
|
+
case 8:
|
|
247
258
|
_a.sent();
|
|
248
|
-
if (!(enableDebugFlag && enableDebugFlag.value)) return [3 /*break*/,
|
|
249
|
-
if (!(orientation === 'landscape')) return [3 /*break*/,
|
|
259
|
+
if (!(enableDebugFlag && enableDebugFlag.value)) return [3 /*break*/, 12];
|
|
260
|
+
if (!(orientation === 'landscape')) return [3 /*break*/, 10];
|
|
250
261
|
return [4 /*yield*/, page.setViewport({ width: 1100, height: 850 })];
|
|
251
|
-
case 7:
|
|
252
|
-
_a.sent();
|
|
253
|
-
return [3 /*break*/, 10];
|
|
254
|
-
case 8: return [4 /*yield*/, page.setViewport({ width: 850, height: 1100 })];
|
|
255
262
|
case 9:
|
|
256
263
|
_a.sent();
|
|
257
|
-
|
|
258
|
-
case 10: return [4 /*yield*/,
|
|
264
|
+
return [3 /*break*/, 12];
|
|
265
|
+
case 10: return [4 /*yield*/, page.setViewport({ width: 850, height: 1100 })];
|
|
259
266
|
case 11:
|
|
260
267
|
_a.sent();
|
|
268
|
+
_a.label = 12;
|
|
269
|
+
case 12: return [4 /*yield*/, browser.close()];
|
|
270
|
+
case 13:
|
|
271
|
+
_a.sent();
|
|
272
|
+
browser = null;
|
|
261
273
|
if (fs.existsSync(path.join(__dirname, (tmpFileName)))) {
|
|
262
274
|
try {
|
|
263
275
|
data = fs.readFileSync(path.join(__dirname, (tmpFileName)));
|
|
@@ -279,7 +291,27 @@ function loadPDFMethods(methodManager) {
|
|
|
279
291
|
console.log('No tmp file ', tmpFileName);
|
|
280
292
|
throw new Error('Error in Generate PDF: No tmp file');
|
|
281
293
|
}
|
|
282
|
-
return [
|
|
294
|
+
return [3 /*break*/, 17];
|
|
295
|
+
case 14:
|
|
296
|
+
err_1 = _a.sent();
|
|
297
|
+
lastError = err_1;
|
|
298
|
+
if (!browser) return [3 /*break*/, 16];
|
|
299
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
300
|
+
return [4 /*yield*/, browser.close().catch(function () { })];
|
|
301
|
+
case 15:
|
|
302
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
303
|
+
_a.sent();
|
|
304
|
+
_a.label = 16;
|
|
305
|
+
case 16:
|
|
306
|
+
if (err_1 && err_1.message && err_1.message.includes('Navigating frame was detached') && attempt < maxAttempts) {
|
|
307
|
+
console.warn(new Date(), 'Retry generatePDF after detached frame', { attempt: attempt });
|
|
308
|
+
return [3 /*break*/, 17];
|
|
309
|
+
}
|
|
310
|
+
throw err_1;
|
|
311
|
+
case 17:
|
|
312
|
+
attempt++;
|
|
313
|
+
return [3 /*break*/, 2];
|
|
314
|
+
case 18: throw lastError;
|
|
283
315
|
}
|
|
284
316
|
});
|
|
285
317
|
});
|
|
@@ -288,6 +320,7 @@ function loadPDFMethods(methodManager) {
|
|
|
288
320
|
timeoutOverride: 300000
|
|
289
321
|
},
|
|
290
322
|
generatePDFNoPageNumber: {
|
|
323
|
+
bypassSession: true,
|
|
291
324
|
check: new simpl_schema_1.default({
|
|
292
325
|
html: {
|
|
293
326
|
type: String
|
|
@@ -318,7 +351,7 @@ function loadPDFMethods(methodManager) {
|
|
|
318
351
|
}),
|
|
319
352
|
function: function (html_1, fileName_1) {
|
|
320
353
|
return __awaiter(this, arguments, void 0, function (html, fileName, orientation, fontSize, upload, uploadFileOrder, uploadFileType) {
|
|
321
|
-
var browser, page, pathToFont, dejavuserif_woff, dejavuserifBold_woff, dejavuserifItalic_woff, dejavuserifBoldItalic_woff, content, tmpFileName, data, fileData;
|
|
354
|
+
var maxAttempts, lastError, attempt, browser, page, pathToFont, dejavuserif_woff, dejavuserifBold_woff, dejavuserifItalic_woff, dejavuserifBoldItalic_woff, content, tmpFileName, data, fileData, err_2;
|
|
322
355
|
if (orientation === void 0) { orientation = 'portrait'; }
|
|
323
356
|
if (fontSize === void 0) { fontSize = '12px'; }
|
|
324
357
|
if (upload === void 0) { upload = false; }
|
|
@@ -326,11 +359,22 @@ function loadPDFMethods(methodManager) {
|
|
|
326
359
|
if (uploadFileType === void 0) { uploadFileType = ''; }
|
|
327
360
|
return __generator(this, function (_a) {
|
|
328
361
|
switch (_a.label) {
|
|
329
|
-
case 0:
|
|
362
|
+
case 0:
|
|
363
|
+
maxAttempts = 2;
|
|
364
|
+
lastError = null;
|
|
365
|
+
attempt = 1;
|
|
366
|
+
_a.label = 1;
|
|
330
367
|
case 1:
|
|
368
|
+
if (!(attempt <= maxAttempts)) return [3 /*break*/, 13];
|
|
369
|
+
browser = null;
|
|
370
|
+
_a.label = 2;
|
|
371
|
+
case 2:
|
|
372
|
+
_a.trys.push([2, 9, , 12]);
|
|
373
|
+
return [4 /*yield*/, launchPDFBrowser(true, false)];
|
|
374
|
+
case 3:
|
|
331
375
|
browser = _a.sent();
|
|
332
376
|
return [4 /*yield*/, browser.newPage()];
|
|
333
|
-
case
|
|
377
|
+
case 4:
|
|
334
378
|
page = _a.sent();
|
|
335
379
|
pathToFont = '';
|
|
336
380
|
if (fs.existsSync(path.join(__dirname, ('../private/fonts/dejavuserif.woff')))) {
|
|
@@ -348,12 +392,12 @@ function loadPDFMethods(methodManager) {
|
|
|
348
392
|
dejavuserifBold_woff = 'data:application/font-woff;base64,' + Buffer.from(fs.readFileSync(pathToFont + 'dejavuserif-bold.woff').buffer).toString('base64');
|
|
349
393
|
dejavuserifItalic_woff = 'data:application/font-woff;base64,' + Buffer.from(fs.readFileSync(pathToFont + 'dejavuserif-italic.woff').buffer).toString('base64');
|
|
350
394
|
dejavuserifBoldItalic_woff = 'data:application/font-woff;base64,' + Buffer.from(fs.readFileSync(pathToFont + 'dejavuserif-bolditalic.woff').buffer).toString('base64');
|
|
351
|
-
content = "\n\t\t\t\t\t<head>\n\t\t\t\t\t\t<style type=\"text/css\">\n\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\tfont-style: normal;\n\t\t\t\t\t\t\t\tfont-weight: normal;\n\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserif_woff + "\") format('woff');\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\tfont-style: normal;\n\t\t\t\t\t\t\t\tfont-weight: bold;\n\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifBold_woff + "\") format('woff');\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\tfont-style: italic;\n\t\t\t\t\t\t\t\tfont-weight: normal;\n\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifItalic_woff + "\") format('woff');\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\tfont-style: italic;\n\t\t\t\t\t\t\t\tfont-weight: bold;\n\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifBoldItalic_woff + "\") format('woff');\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\tbody {\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif', serif;\n\t\t\t\t\t\t\t\tfont-size: " + (fontSize ? fontSize : '12px') + ";\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.row {\n\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\tdisplay: flex;\n\t\t\t\t\t\t\t\tflex-wrap: wrap;\n\t\t\t\t\t\t\t\t-webkit-flex-wrap: wrap;\n\t\t\t\t\t\t\t\tpage-break-inside: avoid !important;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.page-break {\n\t\t\t\t\t\t\t\tpage-break-before: always !important;\n\t\t\t\t\t\t\t\tpadding-top: 1px;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.cell {\n\t\t\t\t\t\t\t\tbox-sizing: border-box;\n\t\t\t\t\t\t\t\tpadding : 2px;\n\t\t\t\t\t\t\t\t-webkit-flex: 1;\n\t\t\t\t\t\t\t\tword-wrap: break-word;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.cell-no-padding {\n\t\t\t\t\t\t\t\tbox-sizing: border-box;\n\t\t\t\t\t\t\t\t-webkit-flex: 1;\n\t\t\t\t\t\t\t\tword-wrap: break-word;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.centered {\n\t\t\t\t\t\t\t\t-webkit-justify-content: center;\n\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\ttext-align: center;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.centered-left {\n\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t-webkit-justify-content: flex-start;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.centered-right {\n\t\t\t\t\t\t\t\t-webkit-justify-content: flex-end;\n\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t.box {\n\t\t\t\t\t\t\t\tborder: 1px solid black;\n\t\t\t\t\t\t\t\tmargin: -1px 0px 0px -1px;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t.boxNoBorder {\n\t\t\t\t\t\t\t\tmargin: -1px 0px 0px -1px;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\tpre {\n\t\t\t\t\t\t\t\twhite-space: pre-wrap; /* css-3 */\n\t\t\t\t\t\t\t\twhite-space: -moz-pre-wrap; /* Mozilla, since 1999 */\n\t\t\t\t\t\t\t\twhite-space: -pre-wrap; /* Opera 4-6 */\n\t\t\t\t\t\t\t\twhite-space: -o-pre-wrap; /* Opera 7 */\n\t\t\t\t\t\t\t\tword-wrap: break-word; /* Internet Explorer 5.5+ */\n\t\t\t\t\t\t\t\tfont-size: 12px;\n\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif'; \n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t</style>\n\t\t\t\t\t\t<meta charset=\"UTF-8\">\n\t\t\t\t\t</head>\n\t\t\t\t\t<body>\n\t\t\t\t" + html.replace(new RegExp('flex-basis:', 'g'), '-webkit-flex-basis:').replace(new RegExp('flex:', 'g'), '-webkit-flex:') +
|
|
395
|
+
content = "\n\t\t\t\t\t\t\t<head>\n\t\t\t\t\t\t\t\t<style type=\"text/css\">\n\t\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\t\t\tfont-style: normal;\n\t\t\t\t\t\t\t\t\t\tfont-weight: normal;\n\t\t\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserif_woff + "\") format('woff');\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\t\t\tfont-style: normal;\n\t\t\t\t\t\t\t\t\t\tfont-weight: bold;\n\t\t\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifBold_woff + "\") format('woff');\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\t\t\tfont-style: italic;\n\t\t\t\t\t\t\t\t\t\tfont-weight: normal;\n\t\t\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifItalic_woff + "\") format('woff');\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif';\n\t\t\t\t\t\t\t\t\t\tfont-style: italic;\n\t\t\t\t\t\t\t\t\t\tfont-weight: bold;\n\t\t\t\t\t\t\t\t\t\tsrc: url(\"" + dejavuserifBoldItalic_woff + "\") format('woff');\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\tbody {\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif', serif;\n\t\t\t\t\t\t\t\t\t\tfont-size: " + (fontSize ? fontSize : '12px') + ";\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.row {\n\t\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t\t\tdisplay: flex;\n\t\t\t\t\t\t\t\t\t\tflex-wrap: wrap;\n\t\t\t\t\t\t\t\t\t\t-webkit-flex-wrap: wrap;\n\t\t\t\t\t\t\t\t\t\tpage-break-inside: avoid !important;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.page-break {\n\t\t\t\t\t\t\t\t\t\tpage-break-before: always !important;\n\t\t\t\t\t\t\t\t\t\tpadding-top: 1px;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.cell {\n\t\t\t\t\t\t\t\t\t\tbox-sizing: border-box;\n\t\t\t\t\t\t\t\t\t\tpadding : 2px;\n\t\t\t\t\t\t\t\t\t\t-webkit-flex: 1;\n\t\t\t\t\t\t\t\t\t\tword-wrap: break-word;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.cell-no-padding {\n\t\t\t\t\t\t\t\t\t\tbox-sizing: border-box;\n\t\t\t\t\t\t\t\t\t\t-webkit-flex: 1;\n\t\t\t\t\t\t\t\t\t\tword-wrap: break-word;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.centered {\n\t\t\t\t\t\t\t\t\t\t-webkit-justify-content: center;\n\t\t\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t\t\ttext-align: center;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.centered-left {\n\t\t\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t\t\t-webkit-justify-content: flex-start;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.centered-right {\n\t\t\t\t\t\t\t\t\t\t-webkit-justify-content: flex-end;\n\t\t\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t.box {\n\t\t\t\t\t\t\t\t\t\tborder: 1px solid black;\n\t\t\t\t\t\t\t\t\t\tmargin: -1px 0px 0px -1px;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\t.boxNoBorder {\n\t\t\t\t\t\t\t\t\t\tmargin: -1px 0px 0px -1px;\n\t\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t\tpre {\n\t\t\t\t\t\t\t\t\t\twhite-space: pre-wrap; /* css-3 */\n\t\t\t\t\t\t\t\t\t\twhite-space: -moz-pre-wrap; /* Mozilla, since 1999 */\n\t\t\t\t\t\t\t\t\t\twhite-space: -pre-wrap; /* Opera 4-6 */\n\t\t\t\t\t\t\t\t\t\twhite-space: -o-pre-wrap; /* Opera 7 */\n\t\t\t\t\t\t\t\t\t\tword-wrap: break-word; /* Internet Explorer 5.5+ */\n\t\t\t\t\t\t\t\t\t\tfont-size: 12px;\n\t\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif'; \n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t</style>\n\t\t\t\t\t\t\t<meta charset=\"UTF-8\">\n\t\t\t\t\t\t</head>\n\t\t\t\t\t\t<body>\n\t\t\t\t\t" + html.replace(new RegExp('flex-basis:', 'g'), '-webkit-flex-basis:').replace(new RegExp('flex:', 'g'), '-webkit-flex:') + "</body>";
|
|
352
396
|
return [4 /*yield*/, page.setContent(content, { waitUntil: ['domcontentloaded', 'load', 'networkidle0'], timeout: 0 })];
|
|
353
|
-
case
|
|
397
|
+
case 5:
|
|
354
398
|
_a.sent();
|
|
355
399
|
return [4 /*yield*/, page.evaluateHandle('document.fonts.ready')];
|
|
356
|
-
case
|
|
400
|
+
case 6:
|
|
357
401
|
_a.sent();
|
|
358
402
|
tmpFileName = (0, common_1.objectIdHexString)() + '.pdf';
|
|
359
403
|
return [4 /*yield*/, page.pdf({
|
|
@@ -368,16 +412,17 @@ function loadPDFMethods(methodManager) {
|
|
|
368
412
|
},
|
|
369
413
|
printBackground: true,
|
|
370
414
|
displayHeaderFooter: true,
|
|
371
|
-
headerTemplate: "\n\t\t\t\t\t\t<style>\n\t\t\t\t\t\t\t#header { \n\t\t\t\t\t\t\t\tpadding: 0 0 10px 10px !important; \n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t</style>\n\t\t\t\t\t\t<span></span>\n\t\t\t\t\t",
|
|
372
|
-
footerTemplate: "\n\t\t\t\t\t<style>\n\t\t\t\t\t\t#footer { \n\t\t\t\t\t\t\tpadding: 0 0 10px 10px !important;\n\t\t\t\t\t\t\tfont-size: 10px;\n\t\t\t\t\t\t\tfont-family: san-serif;\n\t\t\t\t\t\t}\n\t\t\t\t\t</style>\n\t\t\t\t\t<div style=\"padding-bottom: 2px; padding-right: 15px; text-align: right; width: 100%;\">\n\t\t\t\t\t\t\n\t\t\t\t\t</div>\n\t\t\t\t\t",
|
|
415
|
+
headerTemplate: "\n\t\t\t\t\t\t\t\t<style>\n\t\t\t\t\t\t\t\t\t#header { \n\t\t\t\t\t\t\t\t\t\tpadding: 0 0 10px 10px !important; \n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t</style>\n\t\t\t\t\t\t\t\t<span></span>\n\t\t\t\t\t\t\t",
|
|
416
|
+
footerTemplate: "\n\t\t\t\t\t\t\t<style>\n\t\t\t\t\t\t\t\t#footer { \n\t\t\t\t\t\t\t\t\tpadding: 0 0 10px 10px !important;\n\t\t\t\t\t\t\t\t\tfont-size: 10px;\n\t\t\t\t\t\t\t\t\tfont-family: san-serif;\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t</style>\n\t\t\t\t\t\t\t<div style=\"padding-bottom: 2px; padding-right: 15px; text-align: right; width: 100%;\">\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t</div>\n\t\t\t\t\t\t\t",
|
|
373
417
|
path: path.join(__dirname, (tmpFileName)),
|
|
374
418
|
timeout: 0
|
|
375
419
|
})];
|
|
376
|
-
case
|
|
420
|
+
case 7:
|
|
377
421
|
_a.sent();
|
|
378
422
|
return [4 /*yield*/, browser.close()];
|
|
379
|
-
case
|
|
423
|
+
case 8:
|
|
380
424
|
_a.sent();
|
|
425
|
+
browser = null;
|
|
381
426
|
if (fs.existsSync(path.join(__dirname, (tmpFileName)))) {
|
|
382
427
|
try {
|
|
383
428
|
data = fs.readFileSync(path.join(__dirname, (tmpFileName)));
|
|
@@ -399,7 +444,27 @@ function loadPDFMethods(methodManager) {
|
|
|
399
444
|
console.log('No tmp file ', tmpFileName);
|
|
400
445
|
throw new Error('Error in Generate PDF No Page Number: No tmp file');
|
|
401
446
|
}
|
|
402
|
-
return [
|
|
447
|
+
return [3 /*break*/, 12];
|
|
448
|
+
case 9:
|
|
449
|
+
err_2 = _a.sent();
|
|
450
|
+
lastError = err_2;
|
|
451
|
+
if (!browser) return [3 /*break*/, 11];
|
|
452
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
453
|
+
return [4 /*yield*/, browser.close().catch(function () { })];
|
|
454
|
+
case 10:
|
|
455
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
456
|
+
_a.sent();
|
|
457
|
+
_a.label = 11;
|
|
458
|
+
case 11:
|
|
459
|
+
if (err_2 && err_2.message && err_2.message.includes('Navigating frame was detached') && attempt < maxAttempts) {
|
|
460
|
+
console.warn(new Date(), 'Retry generatePDFNoPageNumber after detached frame', { attempt: attempt });
|
|
461
|
+
return [3 /*break*/, 12];
|
|
462
|
+
}
|
|
463
|
+
throw err_2;
|
|
464
|
+
case 12:
|
|
465
|
+
attempt++;
|
|
466
|
+
return [3 /*break*/, 1];
|
|
467
|
+
case 13: throw lastError;
|
|
403
468
|
}
|
|
404
469
|
});
|
|
405
470
|
});
|
|
@@ -408,6 +473,7 @@ function loadPDFMethods(methodManager) {
|
|
|
408
473
|
timeoutOverride: 300000
|
|
409
474
|
},
|
|
410
475
|
mergePDFResolve: {
|
|
476
|
+
bypassSession: true,
|
|
411
477
|
check: new simpl_schema_1.default({
|
|
412
478
|
fileKeys: {
|
|
413
479
|
type: Array
|
|
@@ -425,7 +491,7 @@ function loadPDFMethods(methodManager) {
|
|
|
425
491
|
}),
|
|
426
492
|
function: function (fileKeys, fileName, fileType) {
|
|
427
493
|
return __awaiter(this, void 0, void 0, function () {
|
|
428
|
-
var resSigneds, promises_1, fileDatas, mergedPdf_1, i, fileData, pdf, copiedPages, pdf, img, page, imgDim, copiedPages, pdf, img, page, imgDim, copiedPages, error_1, mergedPDFUint8, b64PDF,
|
|
494
|
+
var resSigneds, promises_1, fileDatas, mergedPdf_1, i, fileData, pdf, copiedPages, pdf, img, page, imgDim, copiedPages, pdf, img, page, imgDim, copiedPages, error_1, mergedPDFUint8, b64PDF, err_3;
|
|
429
495
|
var _this = this;
|
|
430
496
|
return __generator(this, function (_a) {
|
|
431
497
|
switch (_a.label) {
|
|
@@ -534,9 +600,9 @@ function loadPDFMethods(methodManager) {
|
|
|
534
600
|
return [2 /*return*/, this.callMethod('uploadFileAndSave', fileName, b64PDF, (4 * Math.ceil(b64PDF.length / 3)), -1, fileType, false)];
|
|
535
601
|
case 24: return [3 /*break*/, 26];
|
|
536
602
|
case 25:
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
throw
|
|
603
|
+
err_3 = _a.sent();
|
|
604
|
+
err_3.message = 'Error in Merge PDF Resolve: PDF Merge - Get Signed URLs - ' + err_3.message;
|
|
605
|
+
throw err_3;
|
|
540
606
|
case 26: return [2 /*return*/];
|
|
541
607
|
}
|
|
542
608
|
});
|
|
@@ -546,6 +612,7 @@ function loadPDFMethods(methodManager) {
|
|
|
546
612
|
timeoutOverride: 300000
|
|
547
613
|
},
|
|
548
614
|
mergePDFResolveNoSave: {
|
|
615
|
+
bypassSession: true,
|
|
549
616
|
check: new simpl_schema_1.default({
|
|
550
617
|
fileKeys: {
|
|
551
618
|
type: Array
|
|
@@ -556,7 +623,7 @@ function loadPDFMethods(methodManager) {
|
|
|
556
623
|
}),
|
|
557
624
|
function: function (fileKeys) {
|
|
558
625
|
return __awaiter(this, void 0, void 0, function () {
|
|
559
|
-
var resSigneds, promises_2, fileDatas, mergedPdf_2, i, fileData, pdf, copiedPages, pdf, img, page, imgDim, copiedPages, pdf, img, page, imgDim, copiedPages, error_2, mergedPDFUint8, b64PDF,
|
|
626
|
+
var resSigneds, promises_2, fileDatas, mergedPdf_2, i, fileData, pdf, copiedPages, pdf, img, page, imgDim, copiedPages, pdf, img, page, imgDim, copiedPages, error_2, mergedPDFUint8, b64PDF, err_4;
|
|
560
627
|
var _this = this;
|
|
561
628
|
return __generator(this, function (_a) {
|
|
562
629
|
switch (_a.label) {
|
|
@@ -665,9 +732,9 @@ function loadPDFMethods(methodManager) {
|
|
|
665
732
|
case 24: throw new Error('Error in Merge PDF Resolve No Save: No signed urls');
|
|
666
733
|
case 25: return [3 /*break*/, 27];
|
|
667
734
|
case 26:
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
throw
|
|
735
|
+
err_4 = _a.sent();
|
|
736
|
+
err_4.message = "Error in Merge PDF Resolve: ".concat(err_4.message);
|
|
737
|
+
throw err_4;
|
|
671
738
|
case 27: return [2 /*return*/];
|
|
672
739
|
}
|
|
673
740
|
});
|
|
@@ -677,6 +744,7 @@ function loadPDFMethods(methodManager) {
|
|
|
677
744
|
timeoutOverride: 300000
|
|
678
745
|
},
|
|
679
746
|
mergePDFResolveHtml: {
|
|
747
|
+
bypassSession: true,
|
|
680
748
|
check: new simpl_schema_1.default({
|
|
681
749
|
htmls: {
|
|
682
750
|
type: Array
|