@tstdl/base 0.81.16 → 0.81.17
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/package.json +2 -2
- package/pdf/pdf.service.d.ts +10 -4
- package/pdf/pdf.service.js +20 -3
- package/pdf/pdf.service.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tstdl/base",
|
|
3
|
-
"version": "0.81.
|
|
3
|
+
"version": "0.81.17",
|
|
4
4
|
"author": "Patrick Hein",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"got": "^12.5",
|
|
45
45
|
"handlebars": "^4.7",
|
|
46
46
|
"knex": "^2.3",
|
|
47
|
-
"koa": "^2.
|
|
47
|
+
"koa": "^2.14",
|
|
48
48
|
"minio": "^7.0",
|
|
49
49
|
"mjml": "^4.13",
|
|
50
50
|
"mongodb": "4.12",
|
package/pdf/pdf.service.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { afterResolve } from "../container";
|
|
1
|
+
import { AfterResolve, afterResolve, Injectable, resolveArgumentType } from "../container";
|
|
3
2
|
import type { AsyncDisposable } from "../disposable/disposable";
|
|
4
3
|
import { disposeAsync } from "../disposable/disposable";
|
|
5
4
|
import { Logger } from "../logger";
|
|
@@ -25,6 +24,7 @@ export declare class PdfMarginObject {
|
|
|
25
24
|
left?: number | string;
|
|
26
25
|
}
|
|
27
26
|
export declare class PdfRenderOptions {
|
|
27
|
+
lang?: string;
|
|
28
28
|
omitDefaultBackground?: boolean;
|
|
29
29
|
renderBackground?: boolean;
|
|
30
30
|
landscape?: boolean;
|
|
@@ -51,11 +51,17 @@ export declare class PdfTemplate extends Template<{
|
|
|
51
51
|
}, PdfRenderOptions> {
|
|
52
52
|
options?: PdfTemplateOptions;
|
|
53
53
|
}
|
|
54
|
-
export declare
|
|
54
|
+
export declare type PdfServiceOptions = {
|
|
55
|
+
lang?: string;
|
|
56
|
+
};
|
|
57
|
+
export declare type PdfServiceArgument = PdfServiceOptions;
|
|
58
|
+
export declare class PdfService implements AsyncDisposable, AfterResolve, Injectable<PdfServiceArgument> {
|
|
55
59
|
private readonly templateService;
|
|
56
60
|
private readonly logger;
|
|
57
61
|
private readonly pool;
|
|
58
|
-
|
|
62
|
+
private readonly options;
|
|
63
|
+
[resolveArgumentType]: PdfServiceArgument;
|
|
64
|
+
constructor(templateService: TemplateService, logger: Logger, options?: PdfServiceOptions);
|
|
59
65
|
[afterResolve](): void;
|
|
60
66
|
[disposeAsync](): Promise<void>;
|
|
61
67
|
dispose(): Promise<void>;
|
package/pdf/pdf.service.js
CHANGED
|
@@ -65,6 +65,7 @@ __decorate([
|
|
|
65
65
|
], PdfMarginObject.prototype, "left", void 0);
|
|
66
66
|
exports.PdfMarginObject = PdfMarginObject;
|
|
67
67
|
class PdfRenderOptions {
|
|
68
|
+
lang;
|
|
68
69
|
omitDefaultBackground;
|
|
69
70
|
renderBackground;
|
|
70
71
|
landscape;
|
|
@@ -83,6 +84,10 @@ class PdfRenderOptions {
|
|
|
83
84
|
*/
|
|
84
85
|
timeout;
|
|
85
86
|
}
|
|
87
|
+
__decorate([
|
|
88
|
+
(0, schema_1.Optional)(),
|
|
89
|
+
__metadata("design:type", String)
|
|
90
|
+
], PdfRenderOptions.prototype, "lang", void 0);
|
|
86
91
|
__decorate([
|
|
87
92
|
(0, schema_1.Optional)(),
|
|
88
93
|
__metadata("design:type", Boolean)
|
|
@@ -148,10 +153,18 @@ let PdfService = class PdfService {
|
|
|
148
153
|
templateService;
|
|
149
154
|
logger;
|
|
150
155
|
pool;
|
|
151
|
-
|
|
156
|
+
options;
|
|
157
|
+
constructor(templateService, logger, options = {}) {
|
|
152
158
|
this.templateService = templateService;
|
|
153
159
|
this.logger = logger;
|
|
154
|
-
this.
|
|
160
|
+
this.options = options;
|
|
161
|
+
const args = ['--font-render-hinting=none'];
|
|
162
|
+
const env = {};
|
|
163
|
+
if ((0, type_guards_1.isDefined)(options.lang)) {
|
|
164
|
+
args.push(`--lang=${options.lang}`);
|
|
165
|
+
env['LANGUAGE'] = options.lang;
|
|
166
|
+
}
|
|
167
|
+
this.pool = new pool_1.Pool(async () => puppeteer.launch({ headless: true, args, env }), async (browser) => browser.close(), logger);
|
|
155
168
|
}
|
|
156
169
|
[container_1.afterResolve]() {
|
|
157
170
|
core_1.disposer.add(this);
|
|
@@ -239,6 +252,9 @@ let PdfService = class PdfService {
|
|
|
239
252
|
await this.pool.disposeInstance(browser);
|
|
240
253
|
throw error;
|
|
241
254
|
}
|
|
255
|
+
if ((0, type_guards_1.isDefined)(options.lang)) {
|
|
256
|
+
page.setExtraHTTPHeaders({ 'Accept-Language': options.lang });
|
|
257
|
+
}
|
|
242
258
|
const timeoutRef = setTimeout(() => void page.close().catch((error) => this.logger.error(error)), (options.timeout ?? units_1.millisecondsPerMinute));
|
|
243
259
|
const optionsFromHandler = await handler(page) ?? {};
|
|
244
260
|
const mergedOptions = { ...optionsFromHandler, ...options };
|
|
@@ -293,7 +309,8 @@ let PdfService = class PdfService {
|
|
|
293
309
|
PdfService = __decorate([
|
|
294
310
|
(0, container_1.singleton)(),
|
|
295
311
|
__param(1, (0, container_1.resolveArg)('PdfService')),
|
|
296
|
-
|
|
312
|
+
__param(2, (0, container_1.injectArg)()),
|
|
313
|
+
__metadata("design:paramtypes", [templates_1.TemplateService, logger_1.Logger, Object])
|
|
297
314
|
], PdfService);
|
|
298
315
|
exports.PdfService = PdfService;
|
|
299
316
|
function pdfTemplate(fields, options) {
|
package/pdf/pdf.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pdf.service.js","sourceRoot":"","sources":["../../source/pdf/pdf.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"pdf.service.js","sourceRoot":"","sources":["../../source/pdf/pdf.service.ts"],"names":[],"mappings":"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"}
|