@tstdl/base 0.78.0-beta8 → 0.78.0-beta80

package/pdf/pdf.service.js

@@ -8,19 +8,126 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PdfService = void 0;
+exports.pdfTemplate = exports.PdfService = exports.PdfTemplate = exports.PdfRenderOptions = exports.PdfMarginObject = exports.PdfFormat = void 0;
 const container_1 = require("../container");
 const core_1 = require("../core");
 const disposable_1 = require("../disposable/disposable");
+const logger_1 = require("../logger");
 const pool_1 = require("../pool");
+const schema_1 = require("../schema");
 const templates_1 = require("../templates");
+const finalize_stream_1 = require("../utils/stream/finalize-stream");
+const readable_stream_adapter_1 = require("../utils/stream/readable-stream-adapter");
+const readable_stream_from_promise_1 = require("../utils/stream/readable-stream-from-promise");
+const stream_reader_1 = require("../utils/stream/stream-reader");
 const type_guards_1 = require("../utils/type-guards");
+const units_1 = require("../utils/units");
 const puppeteer = require("puppeteer");
+var PdfFormat;
+(function (PdfFormat) {
+    PdfFormat["Letter"] = "letter";
+    PdfFormat["Legal"] = "legal";
+    PdfFormat["Tabloid"] = "tabloid";
+    PdfFormat["Ledger"] = "ledger";
+    PdfFormat["A0"] = "a0";
+    PdfFormat["A1"] = "a1";
+    PdfFormat["A2"] = "a2";
+    PdfFormat["A3"] = "a3";
+    PdfFormat["A4"] = "a4";
+    PdfFormat["A5"] = "a5";
+    PdfFormat["A6"] = "a6";
+})(PdfFormat = exports.PdfFormat || (exports.PdfFormat = {}));
+class PdfMarginObject {
+}
+__decorate([
+    (0, schema_1.Optional)([Number, String]),
+    __metadata("design:type", Object)
+], PdfMarginObject.prototype, "top", void 0);
+__decorate([
+    (0, schema_1.Optional)([Number, String]),
+    __metadata("design:type", Object)
+], PdfMarginObject.prototype, "bottom", void 0);
+__decorate([
+    (0, schema_1.Optional)([Number, String]),
+    __metadata("design:type", Object)
+], PdfMarginObject.prototype, "right", void 0);
+__decorate([
+    (0, schema_1.Optional)([Number, String]),
+    __metadata("design:type", Object)
+], PdfMarginObject.prototype, "left", void 0);
+exports.PdfMarginObject = PdfMarginObject;
+class PdfRenderOptions {
+}
+__decorate([
+    (0, schema_1.Optional)(),
+    __metadata("design:type", Boolean)
+], PdfRenderOptions.prototype, "omitDefaultBackground", void 0);
+__decorate([
+    (0, schema_1.Optional)(),
+    __metadata("design:type", Boolean)
+], PdfRenderOptions.prototype, "renderBackground", void 0);
+__decorate([
+    (0, schema_1.Optional)(),
+    __metadata("design:type", Boolean)
+], PdfRenderOptions.prototype, "landscape", void 0);
+__decorate([
+    (0, schema_1.Optional)(),
+    (0, schema_1.Enumeration)(PdfFormat),
+    __metadata("design:type", String)
+], PdfRenderOptions.prototype, "format", void 0);
+__decorate([
+    (0, schema_1.Optional)([String, Number]),
+    __metadata("design:type", Object)
+], PdfRenderOptions.prototype, "width", void 0);
+__decorate([
+    (0, schema_1.Optional)([String, Number]),
+    __metadata("design:type", Object)
+], PdfRenderOptions.prototype, "height", void 0);
+__decorate([
+    (0, schema_1.Optional)(),
+    __metadata("design:type", Number)
+], PdfRenderOptions.prototype, "scale", void 0);
+__decorate([
+    (0, schema_1.Optional)([String, Number, PdfMarginObject]),
+    __metadata("design:type", Object)
+], PdfRenderOptions.prototype, "margin", void 0);
+__decorate([
+    (0, schema_1.Optional)(),
+    __metadata("design:type", Boolean)
+], PdfRenderOptions.prototype, "displayHeaderFooter", void 0);
+__decorate([
+    (0, schema_1.Optional)(),
+    __metadata("design:type", Boolean)
+], PdfRenderOptions.prototype, "waitForNetworkIdle", void 0);
+__decorate([
+    (0, schema_1.Optional)(),
+    __metadata("design:type", String)
+], PdfRenderOptions.prototype, "headerTemplate", void 0);
+__decorate([
+    (0, schema_1.Optional)(),
+    __metadata("design:type", String)
+], PdfRenderOptions.prototype, "footerTemplate", void 0);
+__decorate([
+    (0, schema_1.Optional)(),
+    __metadata("design:type", Number)
+], PdfRenderOptions.prototype, "timeout", void 0);
+exports.PdfRenderOptions = PdfRenderOptions;
+class PdfTemplate extends templates_1.Template {
+}
+__decorate([
+    (0, schema_1.Optional)(),
+    __metadata("design:type", Object)
+], PdfTemplate.prototype, "options", void 0);
+exports.PdfTemplate = PdfTemplate;
 let PdfService = class PdfService {
-    constructor(templateService) {
+    constructor(templateService, logger) {
         this.templateService = templateService;
-        this.pool = new pool_1.Pool(async () => puppeteer.launch(), async (browser) => browser.close());
+        this.logger = logger;
+        this.pool = new pool_1.Pool(async () => puppeteer.launch(), async (browser) => browser.close(), logger);
     }
     [container_1.afterResolve]() {
         core_1.disposer.add(this);
@@ -31,52 +138,145 @@ let PdfService = class PdfService {
     async dispose() {
         return this.pool.dispose();
     }
+    /**
+     * Renders HTML to pdf stream
+     * @param html html to render
+     * @param options render options
+     * @returns pdf stream
+     */
+    renderHtmlStream(html, options) {
+        return this.renderStream(async (page) => page.setContent(html, { waitUntil: (options?.waitForNetworkIdle == true) ? 'networkidle2' : 'load' }), options);
+    }
+    /**
+     * Renders HTML to pdf
+     * @param html html to render
+     * @param options render options
+     * @returns pdf bytes
+     */
     async renderHtml(html, options) {
-        return this.render(async (page) => page.setContent(html, { waitUntil: (options?.waitForNetworkIdle == true) ? 'networkidle2' : 'load' }), options);
+        const stream = this.renderHtmlStream(html, options);
+        return (0, stream_reader_1.readBinaryStream)(stream);
+    }
+    /**
+     * Renders an url to pdf stream
+     * @param url url to load and render
+     * @param options render options
+     * @returns pdf stream
+     */
+    renderUrlStream(url, options) {
+        return this.renderStream(async (page) => {
+            await page.goto(url, { waitUntil: (options?.waitForNetworkIdle == true) ? 'networkidle2' : 'load' });
+        }, options);
     }
+    /**
+     * Renders an url to pdf
+     * @param url url to load and render
+     * @param options render options
+     * @returns pdf bytes
+     */
     async renderUrl(url, options) {
-        return this.render(async (page) => page.goto(url, { waitUntil: (options?.waitForNetworkIdle == true) ? 'networkidle2' : 'load' }), options);
+        const stream = this.renderUrlStream(url, options);
+        return (0, stream_reader_1.readBinaryStream)(stream);
     }
+    /**
+     * Renders a template to pdf
+     * @param key template key
+     * @param templateContext context for template rendering
+     * @param options additional options, overwrites options specified in template
+     * @returns pdf bytes
+     */
+    renderTemplateStream(key, templateContext, options) {
+        return this.renderStream(async (page) => {
+            const { fields: { header, body, footer }, options: optionsFromTemplate } = await this.templateService.render(key, templateContext);
+            await page.setContent(body, { ...optionsFromTemplate, headerTemplate: header, footerTemplate: footer, waitUntil: (options?.waitForNetworkIdle == true) ? 'networkidle2' : 'load', ...options });
+            return { ...optionsFromTemplate, headerTemplate: header, footerTemplate: footer, ...options };
+        }, options);
+    }
+    /**
+     * Renders a template to pdf
+     * @param key template key
+     * @param templateContext context for template rendering
+     * @param options additional options, overwrites options specified in template
+     * @returns pdf bytes
+     */
     async renderTemplate(key, templateContext, options) {
-        const html = await this.templateService.render(key, templateContext);
-        return this.renderHtml(html, options);
+        const stream = this.renderTemplateStream(key, templateContext, options);
+        return (0, stream_reader_1.readBinaryStream)(stream);
     }
-    async render(handler, options) {
-        return this.pool.use(async (browser) => {
-            const page = await browser.newPage();
+    renderStream(handler, options = {}) {
+        return (0, readable_stream_from_promise_1.readableStreamFromPromise)(async () => {
+            const browser = await this.pool.get();
             try {
-                await handler(page);
-                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
-                        };
-                const result = await page.pdf({
-                    format: options?.format ?? 'a4',
-                    scale: options?.scale,
-                    landscape: options?.landscape,
-                    width: options?.width,
-                    height: options?.height,
-                    omitBackground: options?.omitDefaultBackground,
-                    printBackground: options?.renderBackground,
-                    margin
+                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 createPdfOptions = this.convertOptions(mergedOptions);
+                const pdfStream = await page.createPDFStream(createPdfOptions);
+                return (0, finalize_stream_1.finalizeStream)((0, readable_stream_adapter_1.getReadableStreamFromIterable)(pdfStream), async () => {
+                    clearTimeout(timeoutRef);
+                    try {
+                        await page.close();
+                    }
+                    catch (error) {
+                        this.logger.error(error);
+                        throw error;
+                    }
+                    finally {
+                        await this.pool.release(browser);
+                    }
                 });
-                return result;
             }
-            finally {
-                await page.close();
+            catch (error) {
+                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([
     (0, container_1.singleton)(),
-    __metadata("design:paramtypes", [templates_1.TemplateService])
+    __param(1, (0, container_1.resolveArg)('PdfService')),
+    __metadata("design:paramtypes", [templates_1.TemplateService, logger_1.Logger])
 ], PdfService);
 exports.PdfService = PdfService;
+function pdfTemplate(fields, options) {
+    return {
+        fields,
+        options
+    };
+}
+exports.pdfTemplate = pdfTemplate;
 //# sourceMappingURL=pdf.service.js.map

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":";;;;;;;;;;;;;;;AACA,4CAAkE;AAClE,kCAAkC;AAElC,yDAAuD;AAEvD,sCAAkC;AAClC,kCAA8B;AAC9B,sCAAiD;AAEjD,4CAAwD;AACxD,qEAAgE;AAChE,qFAAuF;AACvF,+FAAwF;AACxF,iEAAgE;AAChE,sDAAuE;AACvE,0CAAsD;AACtD,uCAAuC;AAEvC,IAAY,SAYX;AAZD,WAAY,SAAS;IACnB,8BAAiB,CAAA;IACjB,4BAAe,CAAA;IACf,gCAAmB,CAAA;IACnB,8BAAiB,CAAA;IACjB,sBAAS,CAAA;IACT,sBAAS,CAAA;IACT,sBAAS,CAAA;IACT,sBAAS,CAAA;IACT,sBAAS,CAAA;IACT,sBAAS,CAAA;IACT,sBAAS,CAAA;AACX,CAAC,EAZW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAYpB;AAED,MAAa,eAAe;CAY3B;AAXC;IAAC,IAAA,iBAAQ,EAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;;4CACL;AAEtB;IAAC,IAAA,iBAAQ,EAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;;+CACF;AAEzB;IAAC,IAAA,iBAAQ,EAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;;8CACH;AAExB;IAAC,IAAA,iBAAQ,EAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;;6CACJ;AAXzB,0CAYC;AAED,MAAa,gBAAgB;CA4C5B;AA3CC;IAAC,IAAA,iBAAQ,GAAE;;+DACqB;AAEhC;IAAC,IAAA,iBAAQ,GAAE;;0DACgB;AAE3B;IAAC,IAAA,iBAAQ,GAAE;;mDACS;AAEpB;IAAC,IAAA,iBAAQ,GAAE;IACV,IAAA,oBAAW,EAAC,SAAS,CAAC;;gDACJ;AAEnB;IAAC,IAAA,iBAAQ,EAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;;+CACH;AAExB;IAAC,IAAA,iBAAQ,EAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;;gDACF;AAEzB;IAAC,IAAA,iBAAQ,GAAE;;+CACI;AAEf;IAAC,IAAA,iBAAQ,EAAC,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;;gDACD;AAE3C;IAAC,IAAA,iBAAQ,GAAE;;6DACmB;AAE9B;IAAC,IAAA,iBAAQ,GAAE;;4DACkB;AAE7B;IAAC,IAAA,iBAAQ,GAAE;;wDACa;AAExB;IAAC,IAAA,iBAAQ,GAAE;;wDACa;AAMxB;IAAC,IAAA,iBAAQ,GAAE;;iDACM;AA3CnB,4CA4CC;AAID,MAAa,WAAY,SAAQ,oBAAwE;CAGxG;AAFC;IAAC,IAAA,iBAAQ,GAAE;;4CAC2B;AAFxC,kCAGC;AAGM,IAAM,UAAU,GAAhB,MAAM,UAAU;IAKrB,YAAY,eAAgC,EAA4C,MAAc;QACpG,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,IAAI,GAAG,IAAI,WAAI,CAClB,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,EAC9B,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAClC,MAAM,CACP,CAAC;IACJ,CAAC;IAED,CAAC,wBAAY,CAAC;QACZ,eAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,CAAC,yBAAY,CAAC;QAClB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,IAAY,EAAE,OAA0B;QACvD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,kBAAkB,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAC3J,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CAAC,IAAY,EAAE,OAA0B;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,OAAO,IAAA,gCAAgB,EAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,GAAW,EAAE,OAA0B;QACrD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACtC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,kBAAkB,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QACvG,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,OAA0B;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAClD,OAAO,IAAA,gCAAgB,EAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;OAMG;IACH,oBAAoB,CAAC,GAAW,EAAE,eAAwB,EAAE,OAA0B;QACpF,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACtC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAc,GAAG,EAAE,eAAe,CAAC,CAAC;YAChJ,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,GAAG,mBAAmB,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,kBAAkB,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;YAEhM,OAAO,EAAE,GAAG,mBAAmB,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;QAChG,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,eAAwB,EAAE,OAA0B;QACpF,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;QACxE,OAAO,IAAA,gCAAgB,EAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAEO,YAAY,CAAC,OAA+E,EAAE,UAA4B,EAAE;QAClI,OAAO,IAAA,wDAAyB,EAAC,KAAK,IAAI,EAAE;YAC1C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAEtC,IAAI;gBACF,IAAI,IAAoB,CAAC;gBAEzB,IAAI;oBACF,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;iBAChC;gBACD,OAAO,KAAK,EAAE;oBACZ,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;oBACzC,MAAM,KAAK,CAAC;iBACb;gBAED,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAc,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,6BAAqB,CAAC,CAAC,CAAC;gBAEvJ,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBAErD,MAAM,aAAa,GAAqB,EAAE,GAAG,kBAAkB,EAAE,GAAG,OAAO,EAAE,CAAC;gBAC9E,MAAM,gBAAgB,GAAyB,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;gBAClF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;gBAE/D,OAAO,IAAA,gCAAc,EAAC,IAAA,uDAA6B,EAAa,SAAS,CAAC,EAAE,KAAK,IAAI,EAAE;oBACrF,YAAY,CAAC,UAAU,CAAC,CAAC;oBAEzB,IAAI;wBACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;qBACpB;oBACD,OAAO,KAAK,EAAE;wBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAc,CAAC,CAAC;wBAClC,MAAM,KAAK,CAAC;qBACb;4BACO;wBACN,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;qBAClC;gBACH,CAAC,CAAC,CAAC;aACJ;YACD,OAAO,KAAK,EAAE;gBACZ,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACjC,MAAM,KAAK,CAAC;aACb;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,OAAyB;QAC9C,MAAM,MAAM,GAAG,IAAA,yBAAW,EAAC,OAAO,CAAC,MAAM,CAAC;YACxC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,IAAA,sBAAQ,EAAC,OAAO,CAAC,MAAM,CAAC;gBACxB,CAAC,CAAC,OAAO,CAAC,MAAM;gBAChB,CAAC,CAAC;oBACA,GAAG,EAAE,OAAO,CAAC,MAAM;oBACnB,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,KAAK,EAAE,OAAO,CAAC,MAAM;oBACrB,IAAI,EAAE,OAAO,CAAC,MAAM;iBACrB,CAAC;QAEN,OAAO;YACL,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,IAAI;YAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,cAAc,EAAE,OAAO,CAAC,qBAAqB;YAC7C,eAAe,EAAE,OAAO,CAAC,gBAAgB;YACzC,MAAM;YACN,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,IAAI,CAAC,IAAA,uBAAS,EAAC,OAAO,CAAC,cAAc,CAAC,IAAI,IAAA,uBAAS,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAC5H,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,cAAc,EAAE,OAAO,CAAC,cAAc;SACvC,CAAC;IACJ,CAAC;CACF,CAAA;AA3KY,UAAU;IADtB,IAAA,qBAAS,GAAE;IAMqC,WAAA,IAAA,sBAAU,EAAiB,YAAY,CAAC,CAAA;qCAA1D,2BAAe,EAAoD,eAAM;GAL3F,UAAU,CA2KtB;AA3KY,gCAAU;AA6KvB,SAAgB,WAAW,CAAC,MAA+E,EAAE,OAA4B;IACvI,OAAO;QACL,MAAM;QACN,OAAO;KACR,CAAC;AACJ,CAAC;AALD,kCAKC"}

package/pool/pool.d.ts

@@ -1,5 +1,6 @@
 import type { AsyncDisposable } from "../disposable/disposable";
 import { disposeAsync } from "../disposable/disposable";
+import type { Logger } from "../logger";
 export declare type PoolOptions = {
     /**
      * maximum number of instances
@@ -7,18 +8,36 @@ export declare type PoolOptions = {
      */
     size?: number;
 };
+export declare type PoolUseOptions = {
+    /**
+     * 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) => void | Promise<void>;
-export declare class Pool<T> implements AsyncDisposable {
+export declare type PoolInstanceDisposer<T> = (instance: T) => any | Promise<any>;
+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,79 +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.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);
-        }
-        for (const instance of this.usedInstances) {
-            if (instance[placeholder] != true) {
-                await this.disposer(instance);
-            }
-            this.usedInstances.delete(instance);
+    async get() {
+        if (this.disposed) {
+            throw new Error('Pool was disposed.');
         }
-    }
-    // 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 {
-                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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"}

package/promise/deferred-promise.d.ts

@@ -4,25 +4,12 @@ export declare const enum PromiseState {
     Rejected = 2
 }
 export declare class DeferredPromise<T = void> implements Promise<T> {
-    static all: {
-        <T_1>(values: Iterable<T_1 | PromiseLike<T_1>>): Promise<Awaited<T_1>[]>;
-        <T_2 extends readonly unknown[] | []>(values: T_2): Promise<{ -readonly [P in keyof T_2]: Awaited<T_2[P]>; }>;
-    };
-    static race: {
-        <T_1>(values: Iterable<T_1 | PromiseLike<T_1>>): Promise<Awaited<T_1>>;
-        <T_2 extends readonly unknown[] | []>(values: T_2): Promise<Awaited<T_2[number]>>;
-    };
-    static resolve: {
-        (): Promise<void>;
-        <T_1>(value: T_1 | PromiseLike<T_1>): Promise<T_1>;
-    };
-    static reject: <T_1 = never>(reason?: any) => Promise<T_1>;
-    static [Symbol.species]: PromiseConstructor;
+    static readonly [Symbol.species]: PromiseConstructor;
     private backingPromise;
     private resolvePromise;
     private rejectPromise;
     private state;
-    readonly [Symbol.toStringTag]: 'DeferredPromise';
+    readonly [Symbol.toStringTag] = "DeferredPromise";
     get resolved(): boolean;
     get rejected(): boolean;
     get pending(): boolean;

package/promise/deferred-promise.js

@@ -1,11 +1,10 @@
 "use strict";
-var _a;
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeferredPromise = void 0;
-const promiseConstructor = Promise;
 class DeferredPromise {
     constructor(executor) {
-        this[Symbol.toStringTag] = 'DeferredPromise';
+        this[_b] = 'DeferredPromise';
         this.reset();
         if (executor != undefined) {
             executor((value) => this.resolve(value), (reason) => this.reject(reason));
@@ -50,7 +49,7 @@ class DeferredPromise {
         this.state = 2 /* PromiseState.Rejected */;
     }
     reset() {
-        this.backingPromise = new promiseConstructor((resolve, reject) => {
+        this.backingPromise = new Promise((resolve, reject) => {
             this.resolvePromise = resolve;
             this.rejectPromise = reject;
         });
@@ -66,10 +65,6 @@ class DeferredPromise {
     }
 }
 exports.DeferredPromise = DeferredPromise;
-_a = Symbol.species, Symbol.toStringTag;
-DeferredPromise.all = promiseConstructor.all.bind(promiseConstructor);
-DeferredPromise.race = promiseConstructor.race.bind(promiseConstructor);
-DeferredPromise.resolve = promiseConstructor.resolve.bind(promiseConstructor);
-DeferredPromise.reject = promiseConstructor.reject.bind(promiseConstructor);
-DeferredPromise[_a] = promiseConstructor;
+_a = Symbol.species, _b = Symbol.toStringTag;
+DeferredPromise[_a] = Promise;
 //# sourceMappingURL=deferred-promise.js.map

package/promise/deferred-promise.js.map

@@ -1 +1 @@
-{"version":3,"file":"deferred-promise.js","sourceRoot":"","sources":["../../source/promise/deferred-promise.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deferred-promise.js","sourceRoot":"","sources":["../../source/promise/deferred-promise.ts"],"names":[],"mappings":";;;;AAMA,MAAa,eAAe;IA2B1B,YAAY,QAAiG;QAlBpG,QAAoB,GAAG,iBAAiB,CAAC;QAmBhD,IAAI,CAAC,KAAK,EAAE,CAAC;QAEb,IAAI,QAAQ,IAAI,SAAS,EAAE;YACzB,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;SAC3E;IACH,CAAC;IAtBD,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,KAAK,iCAAyB,CAAC;IAC7C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,KAAK,iCAAyB,CAAC;IAC7C,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,gCAAwB,CAAC;IAC5C,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,gCAAwB,CAAC;IAC5C,CAAC;IAUD,qEAAqE;IACrE,IAAI,CAAiC,WAAiF,EAAE,UAAmF;QACzM,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC3D,CAAC;IAED,qEAAqE;IACrE,KAAK,CAAkB,UAAiF;QACtG,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED,qEAAqE;IACrE,OAAO,CAAC,SAA2C;QACjD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,CAAC,KAAyB;QAC/B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,CAAC,KAAK,gCAAwB,CAAC;IACrC,CAAC;IAED,eAAe,CAAC,KAAyB;QACvC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpB,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,MAAM,CAAC,MAAgB;QACrB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,CAAC,KAAK,gCAAwB,CAAC;IACrC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,cAAc,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACvD,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;YAC9B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,+BAAuB,CAAC;IACpC,CAAC;IAEO,kBAAkB;QACxB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;IACH,CAAC;;AAtFH,0CAuFC;KAtFkB,MAAM,CAAC,OAAO,OAQrB,MAAM,CAAC,WAAW;AARZ,mBAAgB,GAAG,OAAO,CAAC"}

package/promise/index.d.ts

@@ -1,2 +1,3 @@
 export * from './cancelable-promise';
 export * from './deferred-promise';
+export * from './lazy-promise';

package/promise/index.js

@@ -16,4 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./cancelable-promise"), exports);
 __exportStar(require("./deferred-promise"), exports);
+__exportStar(require("./lazy-promise"), exports);
 //# sourceMappingURL=index.js.map

package/promise/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/promise/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,qDAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/promise/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,qDAAmC;AACnC,iDAA+B"}