@tstdl/base 0.78.0-beta70 → 0.78.0-beta72

package/examples/template/basic.js

@@ -21,5 +21,5 @@ async function test() {
     const result = await templateService.render('hello-name', { name: 'Max Mustermann' });
     console.log(result.fields);
 }
-void application_1.Application.run(test);
+application_1.Application.run(test);
 //# sourceMappingURL=basic.js.map

package/examples/template/basic.js.map

@@ -1 +1 @@
-{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../../source/examples/template/basic.ts"],"names":[],"mappings":";;AAAA,mDAA4C;AAC5C,+CAAwC;AACxC,qCAAwC;AACxC,+CAAkE;AAClE,6FAAmH;AACnH,yGAAgG;AAChG,6FAAmH;AACnH,+BAA+B;AAE/B,IAAA,qBAAc,GAAE,CAAC;AAEjB,IAAA,8BAAkB,EAAC;IACjB,gBAAgB,EAAE,6CAAoB;IACtC,iBAAiB,EAAE,CAAC,6CAAoB,CAAC;IACzC,iBAAiB,EAAE,CAAC,yDAA0B,CAAC;CAChD,CAAC,CAAC;AAEH,IAAA,sDAA6B,EAAC,EAAE,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AAC7E,IAAA,sDAA6B,EAAC,EAAE,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AAEvG,KAAK,UAAU,IAAI;IACjB,MAAM,eAAe,GAAG,MAAM,qBAAS,CAAC,YAAY,CAAC,2BAAe,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAEtF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,KAAK,yBAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../../source/examples/template/basic.ts"],"names":[],"mappings":";;AAAA,mDAA4C;AAC5C,+CAAwC;AACxC,qCAAwC;AACxC,+CAAkE;AAClE,6FAAmH;AACnH,yGAAgG;AAChG,6FAAmH;AACnH,+BAA+B;AAE/B,IAAA,qBAAc,GAAE,CAAC;AAEjB,IAAA,8BAAkB,EAAC;IACjB,gBAAgB,EAAE,6CAAoB;IACtC,iBAAiB,EAAE,CAAC,6CAAoB,CAAC;IACzC,iBAAiB,EAAE,CAAC,yDAA0B,CAAC;CAChD,CAAC,CAAC;AAEH,IAAA,sDAA6B,EAAC,EAAE,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AAC7E,IAAA,sDAA6B,EAAC,EAAE,QAAQ,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AAEvG,KAAK,UAAU,IAAI;IACjB,MAAM,eAAe,GAAG,MAAM,qBAAS,CAAC,YAAY,CAAC,2BAAe,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAEtF,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,yBAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC"}

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

@@ -62,7 +62,7 @@ let NodeHttpServer = NodeHttpServer_1 = class NodeHttpServer extends http_server
             let listeningListener;
             let errorListener; // eslint-disable-line prefer-const
             listeningListener = () => {
-                this.logger.info(`listening on port ${port}`);
+                this.logger.info(`Listening on port ${port}`);
                 this.untrackConnectedSockets = trackConnectedSockets(this.httpServer, this.sockets);
                 this.httpServer.removeListener('error', errorListener);
                 resolve();
@@ -76,7 +76,7 @@ let NodeHttpServer = NodeHttpServer_1 = class NodeHttpServer extends http_server
         });
     }
     async close(timeout) {
-        this.logger.info('closing http server');
+        this.logger.info('Closing http server');
         const timer = new timer_1.Timer(true);
         const close$ = (0, rxjs_1.bindNodeCallback)(this.httpServer.close.bind(this.httpServer))().pipe((0, rxjs_1.share)());
         close$.subscribe();
@@ -86,12 +86,12 @@ let NodeHttpServer = NodeHttpServer_1 = class NodeHttpServer extends http_server
                 break;
             }
             if (timer.milliseconds >= timeout) {
-                this.logger.info(`force closing of ${connections} remaining sockets after waiting for ${timeout} milliseconds`);
+                this.logger.info(`Force closing of ${connections} remaining sockets after waiting for ${timeout} milliseconds`);
                 destroySockets(this.sockets);
                 break;
             }
             if (connections > 0) {
-                this.logger.info(`waiting for ${connections} connections to end`);
+                this.logger.info(`Waiting for ${connections} connections to end`);
                 await (0, timing_1.cancelableTimeout)(250, cancellation_token_1.CancellationToken.fromObservable(close$));
             }
         }

package/message-bus/message-bus-base.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageBusBase = void 0;
 const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
 const disposable_1 = require("../disposable");
 const cancellation_token_1 = require("../utils/cancellation-token");
 const message_bus_1 = require("./message-bus");
@@ -12,7 +11,7 @@ class MessageBusBase extends message_bus_1.MessageBus {
         this.logger = logger;
         this.publishSubject = new rxjs_1.Subject();
         this.disposeToken = new cancellation_token_1.CancellationToken();
-        this.messages$ = (0, rxjs_1.defer)(() => this._messages$).pipe((0, operators_1.takeUntil)(this.disposeToken.set$), (0, operators_1.share)());
+        this.messages$ = (0, rxjs_1.defer)(() => this._messages$).pipe((0, rxjs_1.takeUntil)(this.disposeToken.set$), (0, rxjs_1.share)());
         this.allMessages$ = (0, rxjs_1.merge)(this.messages$, this.publishSubject);
     }
     publishAndForget(message) {

package/message-bus/message-bus-base.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-bus-base.js","sourceRoot":"","sources":["../../source/message-bus/message-bus-base.ts"],"names":[],"mappings":";;;AAEA,+BAA6C;AAC7C,8CAAkD;AAClD,8CAA6C;AAC7C,oEAAgE;AAChE,+CAA2C;AAG3C,MAAsB,cAAkB,SAAQ,wBAAa;IAa3D,YAAY,MAAc;QACxB,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,cAAc,GAAG,IAAI,cAAO,EAAE,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,IAAI,sCAAiB,EAAE,CAAC;QAE5C,IAAI,CAAC,SAAS,GAAG,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,IAAA,iBAAK,GAAE,CAAC,CAAC;QAC/F,IAAI,CAAC,YAAY,GAAG,IAAA,YAAK,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACjE,CAAC;IAED,gBAAgB,CAAC,OAAU;QACzB,KAAK,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAU;QACtB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QAED,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,CAAC,yBAAY,CAAC;QAClB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QAED,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;QAE/B,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;IAC9B,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,OAAU;QACxC,IAAI;YACF,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC7B;QACD,OAAO,KAAc,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAc,CAAC,CAAC;SACnC;IACH,CAAC;CASF;AAjED,wCAiEC"}
+{"version":3,"file":"message-bus-base.js","sourceRoot":"","sources":["../../source/message-bus/message-bus-base.ts"],"names":[],"mappings":";;;AAEA,+BAA+D;AAC/D,8CAA6C;AAC7C,oEAAgE;AAChE,+CAA2C;AAG3C,MAAsB,cAAkB,SAAQ,wBAAa;IAa3D,YAAY,MAAc;QACxB,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,cAAc,GAAG,IAAI,cAAO,EAAE,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,IAAI,sCAAiB,EAAE,CAAC;QAE5C,IAAI,CAAC,SAAS,GAAG,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAA,gBAAS,EAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,IAAA,YAAK,GAAE,CAAC,CAAC;QAC/F,IAAI,CAAC,YAAY,GAAG,IAAA,YAAK,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACjE,CAAC;IAED,gBAAgB,CAAC,OAAU;QACzB,KAAK,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAU;QACtB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QAED,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,CAAC,yBAAY,CAAC;QAClB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QAED,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;QAE/B,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;IAC9B,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,OAAU;QACxC,IAAI;YACF,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC7B;QACD,OAAO,KAAc,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAc,CAAC,CAAC;SACnC;IACH,CAAC;CASF;AAjED,wCAiEC"}

package/notification/api.d.ts

@@ -0,0 +1,20 @@
+import type { ApiServerResult } from "../api";
+import { Notification } from './model';
+declare const notificationApiDefinition: {
+    readonly resource: string;
+    endpoints: {
+        get: {
+            parameters: import("../schema").ObjectSchema<{
+                for: string;
+            }, {
+                for: string;
+            }>;
+            result: import("../schema").ValueSchema<any, Notification[]>;
+        };
+    };
+};
+declare type NotificationApiDefinition = typeof notificationApiDefinition;
+export declare class NotificationApi {
+    get(): Promise<ApiServerResult<NotificationApiDefinition, 'get'>>;
+}
+export {};

package/notification/api.js

@@ -0,0 +1,35 @@
+"use strict";
+var __decorate = (this && this.__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") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NotificationApi = void 0;
+const api_1 = require("../api");
+const server_1 = require("../api/server");
+const schema_1 = require("../schema");
+const model_1 = require("./model");
+const module_1 = require("./module");
+const notificationApiDefinition = (0, api_1.defineApi)({
+    get resource() { return module_1.notificationModuleConfig.apiResource; },
+    endpoints: {
+        get: {
+            parameters: (0, schema_1.object)({
+                for: (0, schema_1.string)()
+            }),
+            result: (0, schema_1.array)(model_1.Notification)
+        }
+    }
+});
+let NotificationApi = class NotificationApi {
+    async get() {
+        return [];
+    }
+};
+NotificationApi = __decorate([
+    (0, server_1.apiController)(notificationApiDefinition)
+], NotificationApi);
+exports.NotificationApi = NotificationApi;
+//# sourceMappingURL=api.js.map

package/notification/api.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../source/notification/api.ts"],"names":[],"mappings":";;;;;;;;;AACA,gCAAkC;AAClC,0CAA6C;AAC7C,sCAAiD;AACjD,mCAAuC;AACvC,qCAAoD;AAEpD,MAAM,yBAAyB,GAAG,IAAA,eAAS,EAAC;IAC1C,IAAI,QAAQ,KAAK,OAAO,iCAAwB,CAAC,WAAW,CAAC,CAAC,CAAC;IAC/D,SAAS,EAAE;QACT,GAAG,EAAE;YACH,UAAU,EAAE,IAAA,eAAM,EAAC;gBACjB,GAAG,EAAE,IAAA,eAAM,GAAE;aACd,CAAC;YACF,MAAM,EAAE,IAAA,cAAK,EAAC,oBAAY,CAAC;SAC5B;KACF;CACF,CAAC,CAAC;AAMI,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,KAAK,CAAC,GAAG;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAA;AAJY,eAAe;IAD3B,IAAA,sBAAa,EAAC,yBAAyB,CAAC;GAC5B,eAAe,CAI3B;AAJY,0CAAe"}

package/notification/model.d.ts

@@ -0,0 +1,18 @@
+export declare class Notification {
+    /**
+     *
+     */
+    for: string;
+    /**
+     * Timestamp at which the notification was created.
+     */
+    timestamp: number;
+    /**
+     * Timestamp at which the notification was marked as read.
+     */
+    read: number | null;
+    /**
+     * Custom data.
+     */
+    data: any;
+}

package/notification/model.js

@@ -0,0 +1,36 @@
+"use strict";
+var __decorate = (this && this.__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") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Notification = void 0;
+const schema_1 = require("../schema");
+let Notification = class Notification {
+};
+__decorate([
+    (0, schema_1.Property)(),
+    __metadata("design:type", String)
+], Notification.prototype, "for", void 0);
+__decorate([
+    (0, schema_1.Property)(),
+    __metadata("design:type", Number)
+], Notification.prototype, "timestamp", void 0);
+__decorate([
+    (0, schema_1.Property)(),
+    __metadata("design:type", Object)
+], Notification.prototype, "read", void 0);
+__decorate([
+    (0, schema_1.Any)(),
+    __metadata("design:type", Object)
+], Notification.prototype, "data", void 0);
+Notification = __decorate([
+    (0, schema_1.Type)()
+], Notification);
+exports.Notification = Notification;
+//# sourceMappingURL=model.js.map

package/notification/model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../source/notification/model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAA+C;AAGxC,IAAM,YAAY,GAAlB,MAAM,YAAY;CAwBxB,CAAA;AApBC;IAAC,IAAA,iBAAQ,GAAE;;yCACC;AAKZ;IAAC,IAAA,iBAAQ,GAAE;;+CACO;AAKlB;IAAC,IAAA,iBAAQ,GAAE;;0CACS;AAKpB;IAAC,IAAA,YAAG,GAAE;;0CACI;AAvBC,YAAY;IADxB,IAAA,aAAI,GAAE;GACM,YAAY,CAwBxB;AAxBY,oCAAY"}

package/notification/module.d.ts

@@ -0,0 +1,9 @@
+export declare type NotificationModuleConfig = {
+    apiResource: string;
+};
+export declare const notificationModuleConfig: NotificationModuleConfig;
+/**
+ * Configure notifiation module.
+ * @param config configuration
+ */
+export declare function configureNotification(config: Partial<NotificationModuleConfig>): void;

package/notification/module.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.configureNotification = exports.notificationModuleConfig = void 0;
+exports.notificationModuleConfig = {
+    apiResource: 'notifications'
+};
+/**
+ * Configure notifiation module.
+ * @param config configuration
+ */
+function configureNotification(config) {
+    exports.notificationModuleConfig.apiResource = config.apiResource ?? exports.notificationModuleConfig.apiResource;
+}
+exports.configureNotification = configureNotification;
+//# sourceMappingURL=module.js.map

package/notification/module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../source/notification/module.ts"],"names":[],"mappings":";;;AAIa,QAAA,wBAAwB,GAA6B;IAChE,WAAW,EAAE,eAAe;CAC7B,CAAC;AAEF;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,MAAyC;IAC7E,gCAAwB,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,gCAAwB,CAAC,WAAW,CAAC;AACpG,CAAC;AAFD,sDAEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.78.0-beta70",
+  "version": "0.78.0-beta72",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -39,7 +39,7 @@
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.4",
     "@koa/router": "^12.0",
-    "@tstdl/angular": "^0.11.0-beta70",
+    "@tstdl/angular": "^0.11.0-beta72",
     "chroma-js": "^2.4",
     "got": "^12.5",
     "handlebars": "^4.7",
@@ -48,10 +48,10 @@
     "minio": "^7.0",
     "mjml": "^4.13",
     "mongodb": "4.10",
-    "nodemailer": "^6.7",
+    "nodemailer": "^6.8",
     "puppeteer": "^18.0",
     "undici": "^5.10",
-    "urlpattern-polyfill": "^5.0"
+    "urlpattern-polyfill": "^6.0"
   },
   "peerDependenciesMeta": {
     "@tstdl/angular": {

package/pdf/pdf.service.d.ts

@@ -104,6 +104,7 @@ export declare class PdfService implements AsyncDisposable, AfterResolve {
      */
     renderTemplate(key: string, templateContext?: object, options?: PdfRenderOptions): Promise<Uint8Array>;
     private renderStream;
+    private convertOptions;
 }
 export declare function pdfTemplate(fields: {
     body: TemplateField;

package/pdf/pdf.service.js

@@ -127,7 +127,7 @@ let PdfService = class PdfService {
     constructor(templateService, logger) {
         this.templateService = templateService;
         this.logger = logger;
-        this.pool = new pool_1.Pool(async () => puppeteer.launch(), async (browser) => browser.close());
+        this.pool = new pool_1.Pool(async () => puppeteer.launch(), async (browser) => browser.close(), logger);
     }
     [container_1.afterResolve]() {
         core_1.disposer.add(this);
@@ -204,46 +204,66 @@ let PdfService = class PdfService {
         return (0, stream_reader_1.readBinaryStream)(stream);
     }
     renderStream(handler, options = {}) {
-        return (0, readable_stream_from_promise_1.readableStreamFromPromise)(async () => this.pool.use(async (browser) => {
-            const page = await browser.newPage();
-            const timeoutRef = setTimeout(() => void page.close().catch((error) => this.logger.error(error)), (options.timeout ?? units_1.millisecondsPerMinute));
+        return (0, readable_stream_from_promise_1.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;
+                }
+                const timeoutRef = setTimeout(() => void page.close().catch((error) => this.logger.error(error)), (options.timeout ?? units_1.millisecondsPerMinute));
                 const optionsFromHandler = await handler(page) ?? {};
                 const mergedOptions = { ...optionsFromHandler, ...options };
-                const margin = (0, type_guards_1.isUndefined)(mergedOptions.margin)
-                    ? undefined
-                    : (0, type_guards_1.isObject)(mergedOptions.margin)
-                        ? mergedOptions.margin
-                        : {
-                            top: mergedOptions.margin,
-                            bottom: mergedOptions.margin,
-                            right: mergedOptions.margin,
-                            left: mergedOptions.margin
-                        };
-                const pdfStream = await page.createPDFStream({
-                    format: mergedOptions.format ?? 'a4',
-                    scale: mergedOptions.scale,
-                    landscape: mergedOptions.landscape,
-                    width: mergedOptions.width,
-                    height: mergedOptions.height,
-                    omitBackground: mergedOptions.omitDefaultBackground,
-                    printBackground: mergedOptions.renderBackground,
-                    margin,
-                    displayHeaderFooter: mergedOptions.displayHeaderFooter ?? ((0, type_guards_1.isDefined)(mergedOptions.headerTemplate) || (0, type_guards_1.isDefined)(mergedOptions.footerTemplate)),
-                    headerTemplate: mergedOptions.headerTemplate,
-                    footerTemplate: mergedOptions.footerTemplate
-                });
+                const createPdfOptions = this.convertOptions(mergedOptions);
+                const pdfStream = await page.createPDFStream(createPdfOptions);
                 return (0, finalize_stream_1.finalizeStream)((0, readable_stream_adapter_1.getReadableStreamFromIterable)(pdfStream), async () => {
-                    await page.close();
                     clearTimeout(timeoutRef);
+                    try {
+                        await page.close();
+                    }
+                    catch (error) {
+                        this.logger.error(error);
+                        throw error;
+                    }
+                    finally {
+                        await this.pool.release(browser);
+                    }
                 });
             }
             catch (error) {
-                await page.close();
-                clearTimeout(timeoutRef);
+                await this.pool.release(browser);
                 throw error;
             }
-        }));
+        });
+    }
+    convertOptions(options) {
+        const margin = (0, type_guards_1.isUndefined)(options.margin)
+            ? undefined
+            : (0, type_guards_1.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, type_guards_1.isDefined)(options.headerTemplate) || (0, type_guards_1.isDefined)(options.footerTemplate)),
+            headerTemplate: options.headerTemplate,
+            footerTemplate: options.footerTemplate
+        };
     }
 };
 PdfService = __decorate([

package/pdf/pdf.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"pdf.service.js","sourceRoot":"","sources":["../../source/pdf/pdf.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pdf.service.js","sourceRoot":"","sources":["../../source/pdf/pdf.service.ts"],"names":[],"mappings":"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"}

package/pool/pool.d.ts

@@ -1,29 +1,43 @@
 import type { AsyncDisposable } from "../disposable/disposable";
 import { disposeAsync } from "../disposable/disposable";
+import type { Logger } from "../logger";
 export declare type PoolOptions = {
     /**
      * maximum number of instances
      * @default number of cpu cores
      */
     size?: number;
+};
+export declare type PoolUseOptions = {
     /**
-     * dipose instances on error instead of reusing them
+     * Dipose used instance on error instead of reusing it.
+     * @default false
      */
     disposeOnError?: boolean;
 };
 export declare type PoolInstanceFactory<T> = () => T | Promise<T>;
 export declare type PoolInstanceDisposer<T> = (instance: T) => any | Promise<any>;
-export declare class Pool<T> implements AsyncDisposable {
+export declare class Pool<T extends object> implements AsyncDisposable {
     private readonly size;
     private readonly disposeOnError;
     private readonly freeInstances;
     private readonly usedInstances;
     private readonly factory;
     private readonly disposer;
+    private readonly logger;
+    private placeholderInstances;
     private disposed;
     get length(): number;
-    constructor(factory: PoolInstanceFactory<T>, disposer: PoolInstanceDisposer<T>, options?: PoolOptions);
+    constructor(factory: PoolInstanceFactory<T>, disposer: PoolInstanceDisposer<T>, logger: Logger, options?: PoolOptions);
+    get(): Promise<T>;
+    release(instance: T): Promise<void>;
+    /**
+     * Get an instance from the pool and use it
+     * @param handler consumer of instance
+     * @returns instance
+     */
+    use<R>(handler: (instance: T) => R | Promise<R>, options?: PoolUseOptions): Promise<R>;
+    disposeInstance(instance: T): Promise<void>;
     dispose(): Promise<void>;
     [disposeAsync](): Promise<void>;
-    use<R>(handler: (instance: T) => R | Promise<R>): Promise<R>;
 }

package/pool/pool.js

@@ -4,82 +4,115 @@ exports.Pool = void 0;
 const data_structures_1 = require("../data-structures");
 const set_1 = require("../data-structures/set");
 const disposable_1 = require("../disposable/disposable");
+const type_guards_1 = require("../utils/type-guards");
 const os_1 = require("os");
-const rxjs_1 = require("rxjs");
-const placeholder = Symbol('pool placeholder');
 class Pool {
-    constructor(factory, disposer, options) {
+    constructor(factory, disposer, logger, options) {
         this.size = options?.size ?? (0, os_1.cpus)().length;
-        this.disposeOnError = options?.disposeOnError ?? true;
         this.factory = factory;
         this.disposer = disposer;
+        this.logger = logger;
         this.freeInstances = new data_structures_1.ArrayList();
         this.usedInstances = new set_1.Set();
+        this.placeholderInstances = 0;
         this.disposed = false;
     }
     get length() {
-        return this.freeInstances.size + this.usedInstances.size;
+        return this.freeInstances.size + this.usedInstances.size + this.placeholderInstances;
     }
-    async dispose() {
-        return this[disposable_1.disposeAsync]();
-    }
-    async [disposable_1.disposeAsync]() {
-        this.disposed = true;
-        while (this.freeInstances.size > 0) {
-            const instance = this.freeInstances.removeFirst();
-            await this.disposer(instance);
+    async get() {
+        if (this.disposed) {
+            throw new Error('Pool was disposed.');
         }
-        for (const instance of this.usedInstances) {
-            if (instance[placeholder] != true) {
-                await this.disposer(instance);
-            }
-            this.usedInstances.delete(instance);
-        }
-    }
-    // eslint-disable-next-line max-lines-per-function, max-statements
-    async use(handler) {
-        let instance;
         if (this.freeInstances.hasItems) {
-            instance = this.freeInstances.removeFirst();
+            const instance = this.freeInstances.removeFirst();
+            this.usedInstances.add(instance);
+            return instance;
         }
-        else {
-            if (this.length >= this.size) {
-                await (0, rxjs_1.firstValueFrom)((0, rxjs_1.race)(this.freeInstances.change$, this.usedInstances.change$));
-                return this.use(handler);
-            }
-            const tempInstance = { [placeholder]: true };
-            this.usedInstances.add(tempInstance);
+        if (this.length < this.size) {
+            this.placeholderInstances++;
             try {
-                instance = await this.factory();
+                const newInstance = await this.factory();
                 if (this.disposed) {
-                    await this.disposer(instance);
+                    await this.disposer(newInstance);
                     throw new Error('Pool was disposed.');
                 }
+                this.usedInstances.add(newInstance);
+                return newInstance;
             }
             finally {
-                this.usedInstances.delete(tempInstance);
+                this.placeholderInstances--;
             }
         }
-        this.usedInstances.add(instance);
+        while (!this.freeInstances.hasItems) {
+            await this.freeInstances.$onItems;
+        }
+        return this.get();
+    }
+    async release(instance) {
+        if (!this.usedInstances.has(instance)) {
+            throw new Error('Instance is not from this pool.');
+        }
+        this.usedInstances.delete(instance);
+        this.freeInstances.add(instance);
+    }
+    /**
+     * Get an instance from the pool and use it
+     * @param handler consumer of instance
+     * @returns instance
+     */
+    async use(handler, options = {}) {
+        const instance = await this.get();
         try {
             const result = await handler(instance);
+            await this.release(instance);
             return result;
         }
         catch (error) {
-            try {
-                if (this.disposeOnError) {
-                    await this.disposer(instance);
+            if (options.disposeOnError == true) {
+                try {
+                    await this.disposeInstance(instance);
+                }
+                catch (disposeError) {
+                    this.logger.error(disposeError);
                 }
             }
-            finally {
-                this.usedInstances.delete(instance);
+            else {
+                await this.release(instance);
             }
             throw error;
         }
-        finally {
+    }
+    async disposeInstance(instance) {
+        let index;
+        if (this.usedInstances.has(instance)) {
+            this.usedInstances.delete(instance);
+        }
+        else if ((0, type_guards_1.isDefined)(index = this.freeInstances.indexOf(instance))) {
+            this.freeInstances.removeAt(index);
+        }
+        else {
+            throw new Error('Instance is not from this pool.');
+        }
+        await this.disposer(instance);
+    }
+    async dispose() {
+        return this[disposable_1.disposeAsync]();
+    }
+    async [disposable_1.disposeAsync]() {
+        this.disposed = true;
+        if (this.length == 0) {
+            return;
+        }
+        while (this.freeInstances.size > 0) {
+            const instance = this.freeInstances.removeFirst();
+            await this.disposer(instance);
+        }
+        for (const instance of this.usedInstances) {
+            await this.disposer(instance);
             this.usedInstances.delete(instance);
-            this.freeInstances.add(instance);
         }
+        await this[disposable_1.disposeAsync]();
     }
 }
 exports.Pool = Pool;

package/pool/pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../source/pool/pool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../source/pool/pool.ts"],"names":[],"mappings":"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"}