@tstdl/base 0.93.174 → 0.93.176

package/mail/mail.service.js

@@ -4,45 +4,62 @@ 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;
 };
-import { Singleton, inject, provide } from '../injector/index.js';
+import { sql } from 'drizzle-orm';
+import { serializeError } from '../errors/index.js';
+import { Singleton, afterResolve, inject, provide } from '../injector/index.js';
 import { Logger } from '../logger/index.js';
+import { buildJsonb } from '../orm/index.js';
 import { DatabaseConfig, injectRepository } from '../orm/server/index.js';
+import { TaskProcessResult, TaskQueue } from '../task-queue/task-queue.js';
 import { TemplateService } from '../templates/template.service.js';
 import { currentTimestamp } from '../utils/date-time.js';
-import { formatError } from '../errors/index.js';
 import { assertDefined } from '../utils/type-guards.js';
 import { MailClient, MailClientConfig } from './mail.client.js';
 import { MailLog } from './models/index.js';
+import { mailLog as mailLogTable } from './models/schemas.js';
 import { MailModuleConfig } from './module.js';
 import { MAIL_DEFAULT_DATA } from './tokens.js';
 let MailService = class MailService {
     #mailClient = inject(MailClient);
     #templateService = inject(TemplateService);
     #mailLogRepository = injectRepository(MailLog);
+    #taskQueue = inject((TaskQueue), 'mail');
     #defaultClientConfig = inject(MailClientConfig, undefined, { optional: true });
     #defaultData = inject(MAIL_DEFAULT_DATA, undefined, { optional: true });
     #logger = inject(Logger, 'MailService');
-    async send(mailData, clientConfigOrTemplateName, templateNameOrNothing) {
-        const clientConfig = (typeof clientConfigOrTemplateName == 'object') ? clientConfigOrTemplateName : this.#defaultClientConfig;
-        const templateName = (typeof clientConfigOrTemplateName == 'object') ? templateNameOrNothing : clientConfigOrTemplateName;
-        assertDefined(clientConfig, 'No mail client config provided.');
+    [afterResolve](_, { cancellationSignal }) {
+        this.#taskQueue.process({ cancellationSignal, types: ['send-email', 'send-template-email'] }, async (context) => {
+            if (context.type == 'send-email') {
+                await this.send(context.data);
+            }
+            else {
+                await this.sendTemplate(context.data.templateKey, context.data.mailData, context.data.templateContext);
+            }
+            return TaskProcessResult.Complete();
+        });
+    }
+    async send(mailData, options) {
+        const config = options?.clientConfig ?? this.#defaultClientConfig;
+        assertDefined(config, 'No mail client config provided.');
         const data = { ...this.#defaultData, ...mailData };
         let mailLog;
         mailLog = await this.#mailLogRepository.insert({
             timestamp: currentTimestamp(),
-            template: templateName ?? null,
+            template: options?.templateName ?? null,
             data,
             sendResult: null,
-            errors: null,
+            errors: [],
         });
         try {
-            const result = await this.#mailClient.send(data, clientConfig);
+            const result = await this.#mailClient.send(data, config);
             await this.#mailLogRepository.update(mailLog.id, { sendResult: result });
             return result;
         }
         catch (error) {
             try {
-                await this.#mailLogRepository.update(mailLog.id, { errors: [formatError(error)] });
+                await this.#mailLogRepository.update(mailLog.id, {
+                    errors: sql `${mailLogTable.errors} || ${buildJsonb([serializeError(error)])}`,
+                });
             }
             catch (logError) {
                 this.#logger.error(logError);
@@ -50,16 +67,30 @@ let MailService = class MailService {
             throw error;
         }
     }
-    async sendTemplate(keyOrTemplate, mailData, templateContext, clientConfig) {
+    async sendTemplate(keyOrTemplate, mailData, templateContext, options) {
         const { name, fields: { subject, html, text } } = await this.#templateService.render(keyOrTemplate, templateContext);
         const fullMailData = { ...mailData, subject, content: { html, text } };
-        return await this.send(fullMailData, clientConfig, name);
+        return await this.send(fullMailData, { ...options, templateName: name });
+    }
+    async enqueue(mailData, options) {
+        const data = { ...this.#defaultData, ...mailData };
+        await this.#taskQueue.enqueue('send-email', data, options);
+    }
+    async enqueueTemplate(keyOrTemplate, mailData, templateContext, options) {
+        if (typeof keyOrTemplate == 'string') {
+            await this.#taskQueue.enqueue('send-template-email', { templateKey: keyOrTemplate, mailData, templateContext }, options);
+        }
+        else {
+            const { fields: { subject, html, text } } = await this.#templateService.render(keyOrTemplate, templateContext);
+            const fullMailData = { ...mailData, subject, content: { html, text } };
+            await this.enqueue(fullMailData, options);
+        }
     }
 };
 MailService = __decorate([
     Singleton({
         providers: [
-            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(MailModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: 2 }) }),
+            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(MailModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) }),
         ],
     })
 ], MailService);

package/mail/models/mail-log.model.d.ts

@@ -1,3 +1,4 @@
+import type { SerializedError } from '../../errors/format.js';
 import { BaseEntity, type Json, type Timestamp } from '../../orm/index.js';
 import type { MailData } from './mail-data.model.js';
 import type { MailSendResult } from './mail-send-result.model.js';
@@ -6,5 +7,5 @@ export declare class MailLog extends BaseEntity {
     template: string | null;
     data: Json<MailData>;
     sendResult: Json<MailSendResult> | null;
-    errors: string[] | null;
+    errors: Json<SerializedError[]>;
 }

package/mail/models/mail-log.model.js

@@ -33,7 +33,7 @@ __decorate([
     __metadata("design:type", Object)
 ], MailLog.prototype, "sendResult", void 0);
 __decorate([
-    StringProperty({ array: true, nullable: true }),
+    JsonProperty(),
     __metadata("design:type", Object)
 ], MailLog.prototype, "errors", void 0);
 MailLog = __decorate([

package/mail/task-definitions.d.ts

@@ -0,0 +1,20 @@
+import type { TaskDefinitionMap } from '../task-queue/types.js';
+import type { Record, TypedOmit } from '../types/index.js';
+import type { MailData } from './models/index.js';
+export type MailTemplateTaskData = {
+    templateKey: string;
+    mailData: TypedOmit<MailData, 'content' | 'subject'>;
+    templateContext?: Record<string>;
+};
+export type MailTaskDefinitions = TaskDefinitionMap<{
+    'send-email': {
+        data: MailData;
+        state: void;
+        result: void;
+    };
+    'send-template-email': {
+        data: MailTemplateTaskData;
+        state: void;
+        result: void;
+    };
+}>;

package/mail/task-definitions.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.174",
+  "version": "0.93.176",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -152,8 +152,8 @@
     "type-fest": "^5.5"
   },
   "peerDependencies": {
-    "@aws-sdk/client-s3": "^3.1014",
-    "@aws-sdk/s3-request-presigner": "^3.1014",
+    "@aws-sdk/client-s3": "^3.1015",
+    "@aws-sdk/s3-request-presigner": "^3.1015",
     "@genkit-ai/google-genai": "^1.30",
     "@google-cloud/storage": "^7.19",
     "@toon-format/toon": "^2.1.0",

package/rate-limit/postgres/postgres-rate-limiter.js

@@ -56,7 +56,7 @@ PostgresRateLimiter = __decorate([
     Singleton({
         argumentIdentityProvider: JSON.stringify,
         providers: [
-            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(PostgresRateLimiterModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: 2 }) }),
+            provide(DatabaseConfig, { useFactory: (_, context) => context.resolve(PostgresRateLimiterModuleConfig).database ?? context.resolve(DatabaseConfig, undefined, { skipSelf: true }) }),
         ],
     })
 ], PostgresRateLimiter);

package/task-queue/postgres/drizzle/0001_rapid_infant_terrible.sql

@@ -0,0 +1,16 @@
+ALTER TABLE "task_queue"."task" RENAME COLUMN "error" TO "errors";--> statement-breakpoint
+ALTER TABLE "task_queue"."task" ALTER COLUMN "errors" SET DATA TYPE jsonb USING (
+  CASE 
+    WHEN "errors" IS NULL THEN '[]'::jsonb
+    ELSE jsonb_build_array("errors")
+  END
+);--> statement-breakpoint
+ALTER TABLE "task_queue"."task" ALTER COLUMN "errors" SET NOT NULL;--> statement-breakpoint
+ALTER TABLE "task_queue"."task_archive" RENAME COLUMN "error" TO "errors";--> statement-breakpoint
+ALTER TABLE "task_queue"."task_archive" ALTER COLUMN "errors" SET DATA TYPE jsonb USING (
+  CASE 
+    WHEN "errors" IS NULL THEN '[]'::jsonb
+    ELSE jsonb_build_array("errors")
+  END
+);--> statement-breakpoint
+ALTER TABLE "task_queue"."task_archive" ALTER COLUMN "errors" SET NOT NULL;