@tstdl/base 0.83.27 → 0.84.0

package/examples/pdf/basic.js

@@ -1,5 +1,9 @@
 "use strict";
+var import_node_fs = require("node:fs");
+var import_node_path = require("node:path");
+var import_node_url = require("node:url");
 var import_application = require("../../application/application.js");
+var import_browser_service = require("../../browser/browser.service.js");
 var import_container = require("../../container/index.js");
 var import_core = require("../../core.js");
 var import_pdf_service = require("../../pdf/pdf.service.js");
@@ -8,18 +12,40 @@ var import_file_template_provider = require("../../templates/providers/file.temp
 var import_handlebars_template_renderer = require("../../templates/renderers/handlebars.template-renderer.js");
 var import_mjml_template_renderer = require("../../templates/renderers/mjml.template-renderer.js");
 var import_file_template_resolver = require("../../templates/resolvers/file.template-resolver.js");
-var import_node_path = require("node:path");
+const import_meta = {};
+let dirname;
+try {
+  dirname = (0, import_node_url.fileURLToPath)(new URL(".", import_meta.url));
+} catch {
+  dirname = __dirname;
+}
 (0, import_core.configureTstdl)();
 (0, import_module.configureTemplates)({
   templateProvider: import_file_template_provider.FileTemplateProvider,
   templateResolvers: [import_file_template_resolver.FileTemplateResolver],
   templateRenderers: [import_mjml_template_renderer.MjmlTemplateRenderer, import_handlebars_template_renderer.HandlebarsTemplateRenderer]
 });
-(0, import_file_template_provider.configureFileTemplateProvider)({ basePath: (0, import_node_path.resolve)(__dirname, "templates") });
-(0, import_file_template_resolver.configureFileTemplateResolver)({ basePath: (0, import_node_path.resolve)(__dirname.replace("dist", "source"), "templates") });
-async function test() {
+(0, import_file_template_provider.configureFileTemplateProvider)({ basePath: (0, import_node_path.resolve)(dirname, "templates") });
+(0, import_file_template_resolver.configureFileTemplateResolver)({ basePath: (0, import_node_path.resolve)(dirname.replace("dist", "source"), "templates") });
+async function main() {
+  const browserService = await import_container.container.resolveAsync(import_browser_service.BrowserService);
   const pdfService = await import_container.container.resolveAsync(import_pdf_service.PdfService);
-  const result = await pdfService.renderTemplate("hello-name", { name: "Max Mustermann" });
-  console.log(`Resulting PDF has ${result.length} bytes.`);
+  const [result1, result2] = await Promise.all([
+    pdfService.renderTemplate("hello-name", { name: "Max Mustermann" }),
+    pdfService.renderUrl("https://google.de")
+  ]);
+  console.log(`Resulting PDFs have ${result1.length} and ${result2.length} bytes.`);
+  (0, import_node_fs.writeFileSync)("/tmp/template.pdf", result1);
+  (0, import_node_fs.writeFileSync)("/tmp/page.pdf", result2);
+  const browser = await browserService.newBrowser({ headless: false });
+  const context = await browser.newContext();
+  const page1 = await context.newPage();
+  const page2 = await context.newPage();
+  await Promise.all([
+    page1.navigate("file:///tmp/template.pdf"),
+    page2.navigate("file:///tmp/page.pdf")
+  ]);
+  await page1.waitForClose();
+  await page2.waitForClose();
 }
-import_application.Application.run(test);
+import_application.Application.run(main);

package/examples/pdf/templates/hello-name.js

@@ -21,17 +21,25 @@ __export(hello_name_exports, {
   default: () => hello_name_default
 });
 module.exports = __toCommonJS(hello_name_exports);
+var import_node_path = require("node:path");
+var import_node_url = require("node:url");
 var import_pdf_service = require("../../../pdf/pdf.service.js");
 var import_file_template_resolver = require("../../../templates/resolvers/file.template-resolver.js");
 var import_string_template_resolver = require("../../../templates/resolvers/string.template-resolver.js");
-var import_node_path = require("node:path");
+const import_meta = {};
+let dirname;
+try {
+  dirname = (0, import_node_url.fileURLToPath)(new URL(".", import_meta.url));
+} catch {
+  dirname = __dirname;
+}
 function reverse(value) {
   return value.split("").reverse().join("");
 }
 const template = (0, import_pdf_service.pdfTemplate)("hello-name", {
   body: (0, import_file_template_resolver.fileTemplateField)({
     renderer: "handlebars",
-    templateFile: (0, import_node_path.resolve)(__dirname.replace("dist", "source"), "hello-name.hbs"),
+    templateFile: (0, import_node_path.resolve)(dirname.replace("dist", "source"), "hello-name.hbs"),
     options: {
       partials: {
         sometext: (0, import_string_template_resolver.stringTemplateField)({

package/http/client/http-client-request.js

@@ -97,7 +97,7 @@ class HttpClientRequest {
    * can be used to cancel the request. Throws HttpError
    */
   get abortToken() {
-    return this._abortToken.asReadonly;
+    return this._abortToken.asReadonly();
   }
   constructor(urlOrObject, method, options = {}) {
     if ((0, import_type_guards.isString)(urlOrObject)) {

package/http/server/node/node-http-server.js

@@ -133,7 +133,7 @@ let NodeHttpServer = class NodeHttpServer2 extends import_http_server.HttpServer
       }
       if (connections > 0) {
         this.logger.info(`Waiting for ${connections} connections to end`);
-        await (0, import_timing.cancelableTimeout)(250, import_cancellation_token.CancellationToken.fromObservable(close$));
+        await (0, import_timing.cancelableTimeout)(250, import_cancellation_token.CancellationToken.from(close$));
       }
     }
     this.untrackConnectedSockets?.();

package/lock/web/web-lock.js

@@ -55,9 +55,9 @@ let WebLock = class WebLock2 extends import_lock.Lock {
         releasePromise.resolve();
       }
     };
-    const timeoutToken = (0, import_type_guards.isDefined)(timeout) && timeout > 0 ? import_cancellation_token.CancellationToken.fromObservable((0, import_rxjs.timer)(timeout).pipe((0, import_rxjs.map)(() => true))) : void 0;
+    const timeoutToken = (0, import_type_guards.isDefined)(timeout) && timeout > 0 ? import_cancellation_token.CancellationToken.from((0, import_rxjs.timer)(timeout).pipe((0, import_rxjs.map)(() => true))) : void 0;
     void navigator.locks.request(this.resource, {
-      signal: (0, import_type_guards.isDefined)(timeoutToken) ? timeoutToken.asAbortSignal : void 0,
+      signal: (0, import_type_guards.isDefined)(timeoutToken) ? timeoutToken.asAbortSignal() : void 0,
       ifAvailable: (0, import_type_guards.isDefined)(timeout) && timeout <= 0
     }, async (lock) => {
       if ((0, import_type_guards.isNull)(lock)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.83.27",
+  "version": "0.84.0",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -21,7 +21,7 @@
     "luxon": "^3.3",
     "reflect-metadata": "^0.1",
     "rxjs": "^7.8",
-    "type-fest": "^3.8"
+    "type-fest": "^3.9"
   },
   "devDependencies": {
     "@types/chroma-js": "2.4",
@@ -35,7 +35,7 @@
     "@typescript-eslint/parser": "5.59",
     "concurrently": "8.0",
     "esbuild": "0.17",
-    "eslint": "8.38",
+    "eslint": "8.39",
     "eslint-import-resolver-typescript": "3.5",
     "eslint-plugin-import": "2.27",
     "tsc-alias": "1.8",
@@ -45,7 +45,7 @@
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.7",
     "@koa/router": "^12.0",
-    "@tstdl/angular": "^0.83",
+    "@tstdl/angular": "^0.84",
     "@zxcvbn-ts/core": "^2.2",
     "@zxcvbn-ts/language-common": "^2.0",
     "@zxcvbn-ts/language-de": "^2.1",
@@ -54,13 +54,13 @@
     "handlebars": "^4.7",
     "knex": "^2.4",
     "koa": "^2.14",
-    "minio": "^7.0",
+    "minio": "^7.1",
     "mjml": "^4.14",
     "mongodb": "^5.3",
     "nodemailer": "^6.9",
+    "playwright": "^1.33",
     "preact": "^10.13",
     "preact-render-to-string": "^6.0",
-    "puppeteer": "^19.11",
     "undici": "^5.22",
     "urlpattern-polyfill": "^8.0"
   },

package/pdf/pdf.service.d.ts

@@ -1,48 +1,15 @@
-import type { AfterResolve, Injectable } from '../container/index.js';
-import { afterResolve, type resolveArgumentType } from '../container/index.js';
-import type { AsyncDisposable } from '../disposable/disposable.js';
-import { disposeAsync } from '../disposable/disposable.js';
-import { Logger } from '../logger/index.js';
+import { BrowserContextController } from '../browser/browser-context-controller.js';
+import type { BrowserControllerArgument } from '../browser/browser-controller.js';
+import { BrowserController } from '../browser/browser-controller.js';
+import { PdfRenderOptions } from '../browser/pdf-options.js';
+import type { Injectable } from '../container/index.js';
+import { resolveArgumentType } from '../container/index.js';
 import type { TemplateField } from '../templates/index.js';
 import { Template, TemplateService } from '../templates/index.js';
-export declare enum PdfFormat {
-    Letter = "letter",
-    Legal = "legal",
-    Tabloid = "tabloid",
-    Ledger = "ledger",
-    A0 = "a0",
-    A1 = "a1",
-    A2 = "a2",
-    A3 = "a3",
-    A4 = "a4",
-    A5 = "a5",
-    A6 = "a6"
-}
-export declare class PdfMarginObject {
-    top?: number | string;
-    bottom?: number | string;
-    right?: number | string;
-    left?: number | string;
-}
-export declare class PdfRenderOptions {
-    language?: string;
-    omitDefaultBackground?: boolean;
-    renderBackground?: boolean;
-    landscape?: boolean;
-    format?: PdfFormat;
-    width?: string | number;
-    height?: string | number;
-    scale?: number;
-    margin?: string | number | PdfMarginObject;
-    displayHeaderFooter?: boolean;
+export declare class PdfServiceRenderOptions extends PdfRenderOptions {
+    browserContext?: BrowserContextController;
+    locale?: string;
     waitForNetworkIdle?: boolean;
-    headerTemplate?: string;
-    footerTemplate?: string;
-    /**
-     * Timeout for closing render context in case something went wrong.
-     * @default 60000 (1 minute)
-     */
-    timeout?: number;
 }
 export type PdfTemplateOptions = PdfRenderOptions;
 export declare class PdfTemplate<Context extends object = any> extends Template<{
@@ -53,46 +20,45 @@ export declare class PdfTemplate<Context extends object = any> extends Template<
     options?: PdfTemplateOptions;
 }
 export type PdfServiceOptions = {
-    language?: string;
+    locale?: string;
+};
+export type PdfServiceArgument = PdfServiceOptions & {
+    browserControllerArgument: BrowserControllerArgument;
 };
-export type PdfServiceArgument = PdfServiceOptions;
-export declare class PdfService implements AsyncDisposable, AfterResolve, Injectable<PdfServiceArgument> {
+export declare class PdfService implements Injectable<PdfServiceArgument> {
     private readonly templateService;
-    private readonly logger;
-    private readonly pool;
+    private readonly browserController;
+    private readonly defaultLocale;
     readonly [resolveArgumentType]: PdfServiceArgument;
-    constructor(templateService: TemplateService, logger: Logger, options?: PdfServiceOptions);
-    [afterResolve](): void;
-    [disposeAsync](): Promise<void>;
-    dispose(): Promise<void>;
+    constructor(templateService: TemplateService, browserController: BrowserController, options?: PdfServiceOptions);
     /**
      * Renders HTML to pdf stream
      * @param html html to render
      * @param options render options
      * @returns pdf stream
      */
-    renderHtmlStream(html: string, options?: PdfRenderOptions): ReadableStream<Uint8Array>;
+    renderHtmlStream(html: string, options?: PdfServiceRenderOptions): ReadableStream<Uint8Array>;
     /**
      * Renders HTML to pdf
      * @param html html to render
      * @param options render options
      * @returns pdf bytes
      */
-    renderHtml(html: string, options?: PdfRenderOptions): Promise<Uint8Array>;
+    renderHtml(html: string, options?: PdfServiceRenderOptions): Promise<Uint8Array>;
     /**
      * Renders an url to pdf stream
      * @param url url to load and render
      * @param options render options
      * @returns pdf stream
      */
-    renderUrlStream(url: string, options?: PdfRenderOptions): ReadableStream<Uint8Array>;
+    renderUrlStream(url: string, options?: PdfServiceRenderOptions): ReadableStream<Uint8Array>;
     /**
      * Renders an url to pdf
      * @param url url to load and render
      * @param options render options
      * @returns pdf bytes
      */
-    renderUrl(url: string, options?: PdfRenderOptions): Promise<Uint8Array>;
+    renderUrl(url: string, options?: PdfServiceRenderOptions): Promise<Uint8Array>;
     /**
      * Renders a template to pdf
      * @param key template key
@@ -100,7 +66,7 @@ export declare class PdfService implements AsyncDisposable, AfterResolve, Inject
      * @param options additional options, overwrites options specified in template
      * @returns pdf bytes
      */
-    renderTemplateStream<Context extends object>(keyOrTemplate: string | PdfTemplate<Context>, templateContext?: Context, options?: PdfRenderOptions): ReadableStream<Uint8Array>;
+    renderTemplateStream<Context extends object>(keyOrTemplate: string | PdfTemplate<Context>, templateContext?: Context, options?: PdfServiceRenderOptions): ReadableStream<Uint8Array>;
     /**
      * Renders a template to pdf
      * @param key template key
@@ -108,9 +74,8 @@ export declare class PdfService implements AsyncDisposable, AfterResolve, Inject
      * @param options additional options, overwrites options specified in template
      * @returns pdf bytes
      */
-    renderTemplate(keyOrTemplate: string | PdfTemplate, templateContext?: object, options?: PdfRenderOptions): Promise<Uint8Array>;
+    renderTemplate(keyOrTemplate: string | PdfTemplate, templateContext?: object, options?: PdfServiceRenderOptions): Promise<Uint8Array>;
     private renderStream;
-    private convertOptions;
 }
 export declare function pdfTemplate(name: string, fields: {
     body: TemplateField;

package/pdf/pdf.service.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,39 +15,25 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var pdf_service_exports = {};
 __export(pdf_service_exports, {
-  PdfFormat: () => PdfFormat,
-  PdfMarginObject: () => PdfMarginObject,
-  PdfRenderOptions: () => PdfRenderOptions,
   PdfService: () => PdfService,
+  PdfServiceRenderOptions: () => PdfServiceRenderOptions,
   PdfTemplate: () => PdfTemplate,
   pdfTemplate: () => pdfTemplate
 });
 module.exports = __toCommonJS(pdf_service_exports);
+var import_browser_context_controller = require("../browser/browser-context-controller.js");
+var import_browser_controller = require("../browser/browser-controller.js");
+var import_pdf_options = require("../browser/pdf-options.js");
 var import_container = require("../container/index.js");
-var import_core = require("../core.js");
-var import_disposable = require("../disposable/disposable.js");
-var import_logger = require("../logger/index.js");
-var import_pool = require("../pool/pool.js");
 var import_schema = require("../schema/index.js");
 var import_templates = require("../templates/index.js");
 var import_finalize_stream = require("../utils/stream/finalize-stream.js");
-var import_readable_stream_adapter = require("../utils/stream/readable-stream-adapter.js");
 var import_readable_stream_from_promise = require("../utils/stream/readable-stream-from-promise.js");
 var import_stream_reader = require("../utils/stream/stream-reader.js");
 var import_type_guards = require("../utils/type-guards.js");
-var import_units = require("../utils/units.js");
-var puppeteer = __toESM(require("puppeteer"), 1);
 var __decorate = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -69,148 +53,38 @@ var __param = function(paramIndex, decorator) {
     decorator(target, key, paramIndex);
   };
 };
-var PdfFormat;
-(function(PdfFormat2) {
-  PdfFormat2["Letter"] = "letter";
-  PdfFormat2["Legal"] = "legal";
-  PdfFormat2["Tabloid"] = "tabloid";
-  PdfFormat2["Ledger"] = "ledger";
-  PdfFormat2["A0"] = "a0";
-  PdfFormat2["A1"] = "a1";
-  PdfFormat2["A2"] = "a2";
-  PdfFormat2["A3"] = "a3";
-  PdfFormat2["A4"] = "a4";
-  PdfFormat2["A5"] = "a5";
-  PdfFormat2["A6"] = "a6";
-})(PdfFormat || (PdfFormat = {}));
-class PdfMarginObject {
-  top;
-  bottom;
-  right;
-  left;
-}
-__decorate([
-  (0, import_schema.Optional)([Number, String]),
-  __metadata("design:type", Object)
-], PdfMarginObject.prototype, "top", void 0);
-__decorate([
-  (0, import_schema.Optional)([Number, String]),
-  __metadata("design:type", Object)
-], PdfMarginObject.prototype, "bottom", void 0);
-__decorate([
-  (0, import_schema.Optional)([Number, String]),
-  __metadata("design:type", Object)
-], PdfMarginObject.prototype, "right", void 0);
-__decorate([
-  (0, import_schema.Optional)([Number, String]),
-  __metadata("design:type", Object)
-], PdfMarginObject.prototype, "left", void 0);
-class PdfRenderOptions {
-  language;
-  omitDefaultBackground;
-  renderBackground;
-  landscape;
-  format;
-  width;
-  height;
-  scale;
-  margin;
-  displayHeaderFooter;
+class PdfServiceRenderOptions extends import_pdf_options.PdfRenderOptions {
+  browserContext;
+  locale;
   waitForNetworkIdle;
-  headerTemplate;
-  footerTemplate;
-  /**
-   * Timeout for closing render context in case something went wrong.
-   * @default 60000 (1 minute)
-   */
-  timeout;
 }
 __decorate([
   (0, import_schema.Optional)(),
-  __metadata("design:type", String)
-], PdfRenderOptions.prototype, "language", void 0);
+  __metadata("design:type", import_browser_context_controller.BrowserContextController)
+], PdfServiceRenderOptions.prototype, "browserContext", void 0);
 __decorate([
   (0, import_schema.Optional)(),
-  __metadata("design:type", Boolean)
-], PdfRenderOptions.prototype, "omitDefaultBackground", void 0);
-__decorate([
-  (0, import_schema.Optional)(),
-  __metadata("design:type", Boolean)
-], PdfRenderOptions.prototype, "renderBackground", void 0);
-__decorate([
-  (0, import_schema.Optional)(),
-  __metadata("design:type", Boolean)
-], PdfRenderOptions.prototype, "landscape", void 0);
-__decorate([
-  (0, import_schema.Optional)(),
-  (0, import_schema.Enumeration)(PdfFormat),
   __metadata("design:type", String)
-], PdfRenderOptions.prototype, "format", void 0);
-__decorate([
-  (0, import_schema.Optional)([String, Number]),
-  __metadata("design:type", Object)
-], PdfRenderOptions.prototype, "width", void 0);
-__decorate([
-  (0, import_schema.Optional)([String, Number]),
-  __metadata("design:type", Object)
-], PdfRenderOptions.prototype, "height", void 0);
-__decorate([
-  (0, import_schema.Optional)(),
-  __metadata("design:type", Number)
-], PdfRenderOptions.prototype, "scale", void 0);
-__decorate([
-  (0, import_schema.Optional)([String, Number, PdfMarginObject]),
-  __metadata("design:type", Object)
-], PdfRenderOptions.prototype, "margin", void 0);
+], PdfServiceRenderOptions.prototype, "locale", void 0);
 __decorate([
   (0, import_schema.Optional)(),
   __metadata("design:type", Boolean)
-], PdfRenderOptions.prototype, "displayHeaderFooter", void 0);
-__decorate([
-  (0, import_schema.Optional)(),
-  __metadata("design:type", Boolean)
-], PdfRenderOptions.prototype, "waitForNetworkIdle", void 0);
-__decorate([
-  (0, import_schema.Optional)(),
-  __metadata("design:type", String)
-], PdfRenderOptions.prototype, "headerTemplate", void 0);
-__decorate([
-  (0, import_schema.Optional)(),
-  __metadata("design:type", String)
-], PdfRenderOptions.prototype, "footerTemplate", void 0);
-__decorate([
-  (0, import_schema.Optional)(),
-  __metadata("design:type", Number)
-], PdfRenderOptions.prototype, "timeout", void 0);
+], PdfServiceRenderOptions.prototype, "waitForNetworkIdle", void 0);
 class PdfTemplate extends import_templates.Template {
 }
 __decorate([
   (0, import_schema.Optional)(),
   __metadata("design:type", Object)
 ], PdfTemplate.prototype, "options", void 0);
+const browserArguments = ["--font-render-hinting=none", "--disable-web-security", "--disable-features=IsolateOrigins", "--disable-site-isolation-trials"];
 let PdfService = class PdfService2 {
   templateService;
-  logger;
-  pool;
-  constructor(templateService, logger, options = {}) {
+  browserController;
+  defaultLocale;
+  constructor(templateService, browserController, options = {}) {
     this.templateService = templateService;
-    this.logger = logger;
-    const args = ["--font-render-hinting=none", "--disable-web-security", "--disable-features=IsolateOrigins", "--disable-site-isolation-trials"];
-    const env = {};
-    if ((0, import_type_guards.isDefined)(options.language)) {
-      args.push(`--lang=${options.language}`);
-      env["LANGUAGE"] = options.language;
-    }
-    this.pool = new import_pool.Pool(async () => puppeteer.launch({ headless: true, args, env }), async (browser) => browser.close(), logger);
-  }
-  [import_container.afterResolve]() {
-    import_core.disposer.add(this);
-  }
-  async [import_disposable.disposeAsync]() {
-    return this.dispose();
-  }
-  async dispose() {
-    return this.pool.dispose();
+    this.browserController = browserController;
+    this.defaultLocale = options.locale;
   }
   /**
    * Renders HTML to pdf stream
@@ -219,7 +93,7 @@ let PdfService = class PdfService2 {
    * @returns pdf stream
    */
   renderHtmlStream(html, options) {
-    return this.renderStream(async (page) => page.setContent(html, { waitUntil: options?.waitForNetworkIdle == true ? "networkidle2" : "load" }), options);
+    return this.renderStream(async (page) => page.setContent(html, { waitUntil: options?.waitForNetworkIdle == true ? "networkidle" : "load" }), options);
   }
   /**
    * Renders HTML to pdf
@@ -238,8 +112,8 @@ let PdfService = class PdfService2 {
    * @returns pdf stream
    */
   renderUrlStream(url, options) {
-    return this.renderStream(async (page) => {
-      await page.goto(url, { waitUntil: options?.waitForNetworkIdle == true ? "networkidle2" : "load" });
+    return this.renderStream(async (controller) => {
+      await controller.navigate(url, { waitUntil: options?.waitForNetworkIdle == true ? "networkidle" : "load" });
     }, options);
   }
   /**
@@ -262,8 +136,8 @@ let PdfService = class PdfService2 {
   renderTemplateStream(keyOrTemplate, templateContext, options) {
     return this.renderStream(async (page) => {
       const { fields: { header, body, footer }, options: optionsFromTemplate } = await this.templateService.render(keyOrTemplate, templateContext);
-      await page.setContent(body, { ...optionsFromTemplate, headerTemplate: header, footerTemplate: footer, waitUntil: options?.waitForNetworkIdle == true ? "networkidle2" : "load", ...options });
-      return { ...optionsFromTemplate, headerTemplate: header, footerTemplate: footer, ...options };
+      await page.setContent(body, { timeout: options?.timeout, waitUntil: options?.waitForNetworkIdle == true ? "networkidle" : "load" });
+      return { ...optionsFromTemplate, headerTemplate: header, footerTemplate: footer };
     }, options);
   }
   /**
@@ -279,67 +153,23 @@ let PdfService = class PdfService2 {
   }
   renderStream(handler, options = {}) {
     return (0, import_readable_stream_from_promise.readableStreamFromPromise)(async () => {
-      const browser = await this.pool.get();
-      try {
-        let page;
-        try {
-          page = await browser.newPage();
-        } catch (error) {
-          await this.pool.disposeInstance(browser);
-          throw error;
-        }
-        if ((0, import_type_guards.isDefined)(options.language)) {
-          await page.setExtraHTTPHeaders({ "Accept-Language": options.language });
-        }
-        const timeoutRef = setTimeout(() => void page.close().catch((error) => this.logger.error(error)), options.timeout ?? import_units.millisecondsPerMinute);
-        const optionsFromHandler = await handler(page) ?? {};
-        const mergedOptions = { ...optionsFromHandler, ...options };
-        const createPdfOptions = this.convertOptions(mergedOptions);
-        const pdfStream = await page.createPDFStream(createPdfOptions);
-        return (0, import_finalize_stream.finalizeStream)((0, import_readable_stream_adapter.getReadableStreamFromIterable)(pdfStream), async () => {
-          clearTimeout(timeoutRef);
-          try {
-            await page.close();
-          } catch (error) {
-            this.logger.error(error);
-            throw error;
-          } finally {
-            await this.pool.release(browser);
-          }
-        });
-      } catch (error) {
-        await this.pool.release(browser);
-        throw error;
-      }
+      const page = (0, import_type_guards.isDefined)(options.browserContext) ? await options.browserContext.newPage() : await this.browserController.newPage({ locale: options.locale ?? this.defaultLocale });
+      const optionsFromHandler = await handler(page);
+      const pdfStream = page.renderPdfStream({ ...optionsFromHandler, ...options });
+      const close = async () => page.close();
+      return (0, import_finalize_stream.finalizeStream)(pdfStream, {
+        beforeDone: close,
+        beforeCancel: close,
+        error: close
+      });
     });
   }
-  convertOptions(options) {
-    const margin = (0, import_type_guards.isUndefined)(options.margin) ? void 0 : (0, import_type_guards.isObject)(options.margin) ? options.margin : {
-      top: options.margin,
-      bottom: options.margin,
-      right: options.margin,
-      left: options.margin
-    };
-    return {
-      format: options.format ?? "a4",
-      scale: options.scale,
-      landscape: options.landscape,
-      width: options.width,
-      height: options.height,
-      omitBackground: options.omitDefaultBackground,
-      printBackground: options.renderBackground,
-      margin,
-      displayHeaderFooter: options.displayHeaderFooter ?? ((0, import_type_guards.isDefined)(options.headerTemplate) || (0, import_type_guards.isDefined)(options.footerTemplate)),
-      headerTemplate: options.headerTemplate,
-      footerTemplate: options.footerTemplate
-    };
-  }
 };
 PdfService = __decorate([
   (0, import_container.singleton)(),
-  __param(1, (0, import_container.resolveArg)("PdfService")),
+  __param(1, (0, import_container.forwardArg)((argument) => argument?.browserControllerArgument ?? { browserArguments })),
   __param(2, (0, import_container.injectArg)()),
-  __metadata("design:paramtypes", [import_templates.TemplateService, import_logger.Logger, Object])
+  __metadata("design:paramtypes", [import_templates.TemplateService, import_browser_controller.BrowserController, Object])
 ], PdfService);
 function pdfTemplate(name, fields, options) {
   return {

package/pool/pool.d.ts

@@ -34,6 +34,7 @@ export declare class Pool<T extends object> implements AsyncDisposable {
     private disposed;
     get length(): number;
     constructor(factory: PoolInstanceFactory<T>, disposer: PoolInstanceDisposer<T>, logger: Logger, options?: PoolOptions);
+    owns(instance: T): boolean;
     get(): Promise<T>;
     release(instance: T): Promise<void>;
     /**

package/pool/pool.js

@@ -50,6 +50,9 @@ class Pool {
     this.placeholderInstances = 0;
     this.disposed = false;
   }
+  owns(instance) {
+    return this.usedInstances.includes(instance) || this.freeInstances.includes(instance);
+  }
   async get() {
     if (this.disposed) {
       throw new Error("Pool was disposed.");
@@ -79,6 +82,9 @@ class Pool {
     return this.get();
   }
   async release(instance) {
+    if (this.freeInstances.includes(instance)) {
+      throw new Error("Instance is free already.");
+    }
     if (!this.usedInstances.has(instance)) {
       throw new Error("Instance is not from this pool.");
     }