@brilab-mailer/provider-sendgrid 0.0.5-5 → 0.1.0

package/lib/sendgrid-mail.provider.d.ts

@@ -1,11 +1,15 @@
-import { ConfigService } from '@nestjs/config';
-import * as sgMail from '@sendgrid/mail';
-import { type MailerMessagesResolved, MailerProvider } from '@brilab-mailer/contracts';
-export declare class SendgridMailProvider implements MailerProvider<any, any> {
-    private readonly config;
-    constructor(config: ConfigService);
-    getClient(): void;
-    createPayload(resolved: MailerMessagesResolved): sgMail.MailDataRequired;
-    send(payload: sgMail.MailDataRequired): Promise<void>;
+import { MailService } from '@sendgrid/mail';
+import type { MailDataRequired } from '@sendgrid/mail';
+import { type MailerMessagesResolved, MailerProvider, type MailerSendResult } from '@brilab-mailer/contracts';
+export type SendgridProviderOptions = {
+    apiKey: string;
+};
+export declare class SendgridMailProvider implements MailerProvider<SendgridProviderOptions, MailService, MailDataRequired> {
+    private readonly options;
+    private readonly _client;
+    constructor(options: SendgridProviderOptions);
+    getClient(): MailService;
+    createPayload(resolved: MailerMessagesResolved): MailDataRequired;
+    send(payload: MailDataRequired): Promise<MailerSendResult>;
 }
 //# sourceMappingURL=sendgrid-mail.provider.d.ts.map

package/lib/sendgrid-mail.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sendgrid-mail.provider.d.ts","sourceRoot":"","sources":["../../src/lib/sendgrid-mail.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,EACL,KAAK,sBAAsB,EAC3B,cAAc,EACf,MAAM,0BAA0B,CAAC;AAElC,qBACa,oBAAqB,YAAW,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC;IACvD,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAU3C,SAAS;IAIT,aAAa,CAAC,QAAQ,EAAE,sBAAsB,GAAG,MAAM,CAAC,gBAAgB;IAezE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAG5D"}
+{"version":3,"file":"sendgrid-mail.provider.d.ts","sourceRoot":"","sources":["../../src/lib/sendgrid-mail.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAGN,KAAK,sBAAsB,EAC3B,cAAc,EACd,KAAK,gBAAgB,EAGrB,MAAM,0BAA0B,CAAC;AAElC,MAAM,MAAM,uBAAuB,GAAG;IACrC,MAAM,EAAE,MAAM,CAAC;CACf,CAAC;AAIF,qBACa,oBAAqB,YAAW,cAAc,CAAC,uBAAuB,EAAE,WAAW,EAAE,gBAAgB,CAAC;IAKjH,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAIpB,OAAO,EAAE,uBAAuB;IAU3C,SAAS,IAAI,WAAW;IAIxB,aAAa,CAAC,QAAQ,EAAE,sBAAsB,GAAG,gBAAgB;IAkBlE,IAAI,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAWhE"}

package/lib/sendgrid-mail.provider.js

@@ -1,35 +1,56 @@
-import { __decorate, __metadata } from "tslib";
-import { Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import * as sgMail from '@sendgrid/mail';
-import { segmentedDataContentPayload, } from '@brilab-mailer/contracts';
+import { __decorate, __metadata, __param } from "tslib";
+import { Inject, Injectable } from '@nestjs/common';
+import { MailService } from '@sendgrid/mail';
+import { MAILER_PROVIDER_OPTIONS, toMailerSendError, resolveBodies, } from '@brilab-mailer/contracts';
+const toEmail = (a) => ({ email: a.email, name: a.name });
 let SendgridMailProvider = class SendgridMailProvider {
-    config;
-    constructor(config) {
-        this.config = config;
-        const apiKey = this.config.get('SENDGRID_API_KEY');
-        if (!apiKey) {
-            throw new Error('SENDGRID_API_KEY is not set');
-        }
-        sgMail.default.setApiKey(apiKey);
+    options;
+    _client;
+    constructor(options) {
+        this.options = options;
+        const apiKey = this.options?.apiKey;
+        if (!apiKey)
+            throw new Error('[SendgridMailProvider] apiKey is not set');
+        // Isolated instance (not the shared module singleton) so DI keeps its own key.
+        this._client = new MailService();
+        this._client.setApiKey(apiKey);
     }
     getClient() {
-        throw new Error('Method not implemented.');
+        return this._client;
     }
     createPayload(resolved) {
-        const base = {
-            from: resolved.from,
-            to: resolved.to,
+        const { text, html } = resolveBodies(resolved);
+        return {
+            from: toEmail(resolved.from),
+            to: resolved.to.map(toEmail),
+            cc: resolved.cc?.map(toEmail),
+            bcc: resolved.bcc?.map(toEmail),
+            replyTo: resolved.replyTo ? toEmail(resolved.replyTo) : undefined,
             subject: resolved.subject,
+            headers: resolved.headers,
+            categories: resolved.tags ? Object.values(resolved.tags) : undefined,
+            content: [
+                ...(text !== undefined ? [{ type: 'text/plain', value: text }] : []),
+                ...(html !== undefined ? [{ type: 'text/html', value: html }] : []),
+            ],
         };
-        return segmentedDataContentPayload(resolved, null, null, base);
     }
     async send(payload) {
-        await sgMail.default.send(payload);
+        try {
+            const [res] = await this._client.send(payload);
+            return {
+                messageId: res?.headers?.['x-message-id'],
+                raw: res,
+            };
+        }
+        catch (err) {
+            throw toMailerSendError('SendgridMailProvider', err);
+        }
     }
 };
 SendgridMailProvider = __decorate([
     Injectable(),
-    __metadata("design:paramtypes", [ConfigService])
+    __param(0, Inject(MAILER_PROVIDER_OPTIONS)),
+    __metadata("design:paramtypes", [Object])
 ], SendgridMailProvider);
 export { SendgridMailProvider };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brilab-mailer/provider-sendgrid",
-  "version": "0.0.5-5",
+  "version": "0.1.0",
   "author": "Bohdan Radchenko <radchenkobs@gmail.com>",
   "type": "module",
   "main": "./index.js",
@@ -25,9 +25,8 @@
   },
   "peerDependencies": {
     "@nestjs/common": "^10.0.0",
-    "@nestjs/config": "^3.0.0",
-    "@brilab-mailer/contracts": "^0.0.5-5",
-    "@brilab-mailer/core": "^0.0.5-5"
+    "@brilab-mailer/contracts": "^0.1.0",
+    "@brilab-mailer/core": "^0.1.0"
   },
   "peerDependenciesMeta": {
     "@brilab-mailer/contracts": {
@@ -39,10 +38,5 @@
   },
   "dependencies": {
     "@sendgrid/mail": "^8.0.0"
-  },
-  "nx": {
-    "tags": [
-      "disabled"
-    ]
   }
 }