@tstdl/base 0.90.25 → 0.90.26

package/examples/mail/basic.js

@@ -23,7 +23,7 @@ catch {
 }
 configureTstdl();
 configureMail({
-    clientConfig: {
+    defaultClientConfig: {
         host: string('HOST', '127.0.0.01'),
         port: integer('PORT', 25),
         auth: {

package/mail/clients/nodemailer.mail-client.d.ts

@@ -1,9 +1,12 @@
-import { MailClient, MailClientConfig } from '../mail.client.js';
+import type { Disposable } from '../../disposable/disposable.js';
+import type { MailClientConfig } from '../mail.client.js';
+import { MailClient } from '../mail.client.js';
 import type { MailData, MailSendResult } from '../models/index.js';
-export declare class NodemailerMailClient extends MailClient {
-    private readonly transporter;
-    constructor(config: MailClientConfig);
-    send(data: MailData): Promise<MailSendResult>;
+export declare class NodemailerMailClient extends MailClient implements Disposable {
+    #private;
+    [Symbol.dispose](): void;
+    send(data: MailData, clientConfig?: MailClientConfig): Promise<MailSendResult>;
+    private getTransport;
 }
 /**
  * @param register whether to register for {@link MailClient}

package/mail/clients/nodemailer.mail-client.js

@@ -4,26 +4,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
 import { createTransport } from 'nodemailer';
-import { InjectArg, Singleton } from '../../injector/index.js';
+import { Singleton, injectArgument } from '../../injector/index.js';
 import { Injector } from '../../injector/injector.js';
-import { isUndefined } from '../../utils/type-guards.js';
-import { MailClient, MailClientConfig } from '../mail.client.js';
+import { assertDefined, isUndefined } from '../../utils/type-guards.js';
+import { MailClient } from '../mail.client.js';
 let NodemailerMailClient = class NodemailerMailClient extends MailClient {
-    transporter;
-    constructor(config) {
-        super();
-        const options = convertConfig(config);
-        this.transporter = createTransport(options);
+    #stack = new DisposableStack();
+    #transports = new Map();
+    #defaultClientConfig = injectArgument(this, { optional: true });
+    [Symbol.dispose]() {
+        this.#stack.dispose();
     }
-    async send(data) {
-        const result = await this.transporter.sendMail({
+    async send(data, clientConfig) {
+        const config = clientConfig ?? this.#defaultClientConfig;
+        assertDefined(config, 'No mail client config provided.');
+        const transport = this.getTransport(config);
+        const result = await transport.sendMail({
             from: data.from,
             sender: data.sender,
             to: data.to,
@@ -44,11 +41,20 @@ let NodemailerMailClient = class NodemailerMailClient extends MailClient {
             pending: result.pending
         };
     }
+    getTransport(config) {
+        const options = convertConfig(config);
+        const optionsJson = JSON.stringify(options);
+        if (this.#transports.has(optionsJson)) {
+            return this.#transports.get(optionsJson);
+        }
+        const transport = createTransport(options);
+        this.#transports.set(optionsJson, transport);
+        this.#stack.adopt(transport, () => transport.close());
+        return transport;
+    }
 };
 NodemailerMailClient = __decorate([
-    Singleton(),
-    __param(0, InjectArg()),
-    __metadata("design:paramtypes", [MailClientConfig])
+    Singleton()
 ], NodemailerMailClient);
 export { NodemailerMailClient };
 function convertConfig(config) {

package/mail/mail.client.d.ts

@@ -13,5 +13,5 @@ export declare class MailClientConfig {
 }
 export declare abstract class MailClient implements Resolvable<MailClientConfig> {
     readonly [resolveArgumentType]: MailClientConfig;
-    abstract send(data: MailData): Promise<MailSendResult>;
+    abstract send(data: MailData, clientConfig?: MailClientConfig): Promise<MailSendResult>;
 }

package/mail/mail.service.d.ts

@@ -1,16 +1,11 @@
-import { Logger } from '../logger/index.js';
-import { TemplateService } from '../templates/template.service.js';
 import type { TypedOmit } from '../types.js';
-import { MailLogRepository } from './repositories/mail-log.repository.js';
-import { MailClient } from './mail.client.js';
-import type { DefaultMailData, MailData, MailSendResult, MailTemplate } from './models/index.js';
+import type { MailData, MailSendResult, MailTemplate } from './models/index.js';
 export declare class MailService {
     private readonly mailClient;
     private readonly templateService;
     private readonly mailLogRepository;
     private readonly defaultData;
     private readonly logger;
-    constructor(mailClient: MailClient, templateService: TemplateService, mailLogRepository: MailLogRepository | undefined, logger: Logger, defaultData: DefaultMailData | undefined);
     send(mailData: MailData): Promise<MailSendResult>;
     /** @deprecated internal */
     send(mailData: MailData, templateName?: string): Promise<MailSendResult>;

package/mail/mail.service.js

@@ -4,34 +4,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-import { Inject, Optional, ResolveArg, Singleton } from '../injector/index.js';
+import { Singleton, inject } from '../injector/index.js';
 import { Logger } from '../logger/index.js';
 import { TemplateService } from '../templates/template.service.js';
 import { currentTimestamp } from '../utils/date-time.js';
 import { formatError } from '../utils/format-error.js';
 import { isDefined } from '../utils/type-guards.js';
-import { MailLogRepository } from './repositories/mail-log.repository.js';
 import { MailClient } from './mail.client.js';
+import { MailLogRepository } from './repositories/mail-log.repository.js';
 import { MAIL_DEFAULT_DATA } from './tokens.js';
 let MailService = class MailService {
-    mailClient;
-    templateService;
-    mailLogRepository;
-    defaultData;
-    logger;
-    constructor(mailClient, templateService, mailLogRepository, logger, defaultData) {
-        this.mailClient = mailClient;
-        this.templateService = templateService;
-        this.mailLogRepository = mailLogRepository;
-        this.defaultData = defaultData ?? {};
-        this.logger = logger;
-    }
+    mailClient = inject(MailClient);
+    templateService = inject(TemplateService);
+    mailLogRepository = inject(MailLogRepository, undefined, { optional: true });
+    defaultData = inject(MAIL_DEFAULT_DATA, undefined, { optional: true });
+    logger = inject(Logger, 'MailService');
     async send(mailData, templateName) {
         const data = { ...this.defaultData, ...mailData };
         let mailLog;
@@ -71,13 +58,6 @@ let MailService = class MailService {
     }
 };
 MailService = __decorate([
-    Singleton(),
-    __param(2, Inject(MailLogRepository)),
-    __param(2, Optional()),
-    __param(3, ResolveArg('MailService')),
-    __param(4, Inject(MAIL_DEFAULT_DATA)),
-    __param(4, Optional()),
-    __metadata("design:paramtypes", [MailClient,
-        TemplateService, Object, Logger, Object])
+    Singleton()
 ], MailService);
 export { MailService };

package/mail/module.d.ts

@@ -1,9 +1,9 @@
 import type { Type } from '../types.js';
-import { MailLogRepository } from './repositories/mail-log.repository.js';
 import { MailClient, MailClientConfig } from './mail.client.js';
 import type { DefaultMailData } from './models/index.js';
+import { MailLogRepository } from './repositories/mail-log.repository.js';
 export type MailModuleConfig = {
-    clientConfig: MailClientConfig;
+    defaultClientConfig: MailClientConfig;
     client: Type<MailClient>;
     logRepository: Type<MailLogRepository>;
     defaultData: DefaultMailData;
@@ -11,4 +11,4 @@ export type MailModuleConfig = {
 /**
  * configure mail module
  */
-export declare function configureMail({ clientConfig, client, logRepository, defaultData }: Partial<MailModuleConfig>): void;
+export declare function configureMail({ defaultClientConfig, client, logRepository, defaultData }: Partial<MailModuleConfig>): void;

package/mail/module.js

@@ -1,14 +1,14 @@
 import { Injector } from '../injector/injector.js';
 import { isDefined } from '../utils/type-guards.js';
-import { MailLogRepository } from './repositories/mail-log.repository.js';
 import { MailClient, MailClientConfig } from './mail.client.js';
+import { MailLogRepository } from './repositories/mail-log.repository.js';
 import { MAIL_DEFAULT_DATA } from './tokens.js';
 /**
  * configure mail module
  */
-export function configureMail({ clientConfig, client, logRepository, defaultData }) {
-    if (isDefined(clientConfig)) {
-        Injector.registerSingleton(MailClientConfig, { useValue: clientConfig });
+export function configureMail({ defaultClientConfig, client, logRepository, defaultData }) {
+    if (isDefined(defaultClientConfig)) {
+        Injector.registerSingleton(MailClientConfig, { useValue: defaultClientConfig });
     }
     if (isDefined(client)) {
         Injector.registerSingleton(MailClient, { useToken: client });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.90.25",
+  "version": "0.90.26",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"