@brilab-mailer/provider-mailtrap 0.0.5-5 → 0.2.0

package/lib/mailtrap-api.provider.d.ts

@@ -1,12 +1,12 @@
 import { MailtrapClient, type MailtrapClientConfig } from 'mailtrap';
-import { MailerProvider, type MailerMessagesResolved } from '@brilab-mailer/contracts';
-import { Mail } from "mailtrap/dist/types/mailtrap.js";
+import { MailerProvider, type MailerMessagesResolved, type MailerSendResult } from '@brilab-mailer/contracts';
+import type { Mail } from "mailtrap/dist/types/mailtrap.js";
 export declare class MailtrapApiProvider implements MailerProvider<MailtrapClientConfig, MailtrapClient, Mail> {
     private readonly options;
     private readonly _client;
     constructor(options: MailtrapClientConfig);
     getClient(): MailtrapClient;
     createPayload(resolved: MailerMessagesResolved): Mail;
-    send(payload: Mail): Promise<void>;
+    send(payload: Mail): Promise<MailerSendResult>;
 }
 //# sourceMappingURL=mailtrap-api.provider.d.ts.map

package/lib/mailtrap-api.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mailtrap-api.provider.d.ts","sourceRoot":"","sources":["../../src/lib/mailtrap-api.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EACN,cAAc,EAEd,KAAK,sBAAsB,EAC3B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAEvD,qBACa,mBAAoB,YAAW,cAAc,CAAC,oBAAoB,EAAE,cAAc,EAAE,IAAI,CAAC;IAKpG,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;gBAIvB,OAAO,EAAE,oBAAoB;IAYxC,SAAS,IAAI,cAAc;IAI3B,aAAa,CAAC,QAAQ,EAAE,sBAAsB,GAAG,IAAI;IAqB/C,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CAG/C"}
+{"version":3,"file":"mailtrap-api.provider.d.ts","sourceRoot":"","sources":["../../src/lib/mailtrap-api.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AACrE,OAAO,EACN,cAAc,EAGd,KAAK,sBAAsB,EAC3B,KAAK,gBAAgB,EAGrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAI5D,qBACa,mBAAoB,YAAW,cAAc,CAAC,oBAAoB,EAAE,cAAc,EAAE,IAAI,CAAC;IAKpG,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;gBAIvB,OAAO,EAAE,oBAAoB;IAcxC,SAAS,IAAI,cAAc;IAI3B,aAAa,CAAC,QAAQ,EAAE,sBAAsB,GAAG,IAAI;IAe/C,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAW3D"}

package/lib/mailtrap-api.provider.js

@@ -1,7 +1,8 @@
 import { __decorate, __metadata, __param } from "tslib";
 import { Inject, Injectable } from '@nestjs/common';
 import { MailtrapClient } from 'mailtrap';
-import { MAILER_PROVIDER_OPTIONS, } from '@brilab-mailer/contracts';
+import { MAILER_PROVIDER_OPTIONS, toMailerSendError, resolveBodies, } from '@brilab-mailer/contracts';
+const toAddress = (a) => ({ email: a.email, name: a.name });
 let MailtrapApiProvider = class MailtrapApiProvider {
     options;
     _client;
@@ -13,33 +14,39 @@ let MailtrapApiProvider = class MailtrapApiProvider {
         this._client = new MailtrapClient({
             token,
             testInboxId: this.options?.testInboxId,
-            accountId: this.options?.accountId
+            accountId: this.options?.accountId,
+            sandbox: this.options?.sandbox,
+            bulk: this.options?.bulk,
         });
     }
     getClient() {
         return this._client;
     }
     createPayload(resolved) {
-        const base = {
-            from: resolved.from,
-            to: resolved.to,
-            subject: resolved.subject || '',
+        const { text, html } = resolveBodies(resolved);
+        return {
+            from: toAddress(resolved.from),
+            to: resolved.to.map(toAddress),
+            cc: resolved.cc?.map(toAddress),
+            bcc: resolved.bcc?.map(toAddress),
+            reply_to: resolved.replyTo ? toAddress(resolved.replyTo) : undefined,
+            subject: resolved.subject,
+            headers: resolved.headers,
+            text: text ?? '',
+            html,
         };
-        switch (resolved.content.kind) {
-            case 'text': return { ...base, text: resolved.content.text };
-            case 'html': return { ...base, html: resolved.content.html };
-            case 'mixed':
-                return {
-                    ...base,
-                    text: resolved.content.text || '',
-                    html: resolved.content.html || ''
-                };
-            default:
-                return { ...base, text: '', html: '' };
-        }
     }
     async send(payload) {
-        await this._client.send(payload);
+        try {
+            const res = await this._client.send(payload);
+            return {
+                messageId: res.message_ids?.[0],
+                raw: res,
+            };
+        }
+        catch (err) {
+            throw toMailerSendError('MailtrapApiProvider', err);
+        }
     }
 };
 MailtrapApiProvider = __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brilab-mailer/provider-mailtrap",
-  "version": "0.0.5-5",
+  "version": "0.2.0",
   "author": "Bohdan Radchenko <radchenkobs@gmail.com>",
   "type": "module",
   "main": "./index.js",
@@ -26,8 +26,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.2.0",
+    "@brilab-mailer/core": "^0.2.0"
   },
   "peerDependenciesMeta": {
     "@brilab-mailer/contracts": {
@@ -38,6 +38,6 @@
     }
   },
   "dependencies": {
-    "mailtrap": "^3.0.0"
+    "mailtrap": "^4.6.0"
   }
 }