1.0.22

.gitlab-ci.yml

@@ -4,13 +4,13 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -20,17 +20,19 @@ mirror:
   script:
     - npmci git mirror
   tags:
+    - lossless
     - docker
     - notpriv
 
 snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -47,6 +49,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
     - priv
 
@@ -59,6 +62,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -70,6 +74,7 @@ release:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -85,6 +90,7 @@ codequality:
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
+    - lossless
     - docker
     - priv
 
@@ -95,6 +101,7 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -107,6 +114,7 @@ pages:
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/mailgun",
-  "version": "1.0.18",
+  "version": "1.0.22",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -248,9 +248,9 @@
       }
     },
     "@pushrocks/smartmail": {
-      "version": "1.0.8",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartmail/-/smartmail-1.0.8.tgz",
-      "integrity": "sha512-ILUmtrJ0TlBe183/LXmJYAq268NueB6A0vA75qqR9+DeZjBAuYOcIAJxLOXyxtMcG/pSnr+AKTDBzsRn/RMz1g==",
+      "version": "1.0.11",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartmail/-/smartmail-1.0.11.tgz",
+      "integrity": "sha512-m6qtwoaDXp/2IAmWEccMGhkAtl8cTncBIm1bJo7bKr9GqWvNmnJi8ObnyjzDFFxbtYnmyYbipmo3Blj+i3m/2g==",
       "requires": {
         "@pushrocks/smartfile": "^7.0.6",
         "@pushrocks/smartmustache": "^2.0.9"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/mailgun",
-  "version": "1.0.18",
+  "version": "1.0.22",
   "private": false,
   "description": "an api abstraction package for mailgun",
   "main": "dist/index.js",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@pushrocks/smartfile": "^7.0.6",
-    "@pushrocks/smartmail": "^1.0.8",
+    "@pushrocks/smartmail": "^1.0.11",
     "@pushrocks/smartrequest": "^1.1.47",
     "@pushrocks/smartstring": "^3.0.17"
   },

test/test.ts

@@ -5,12 +5,13 @@ import * as smartmail from '@pushrocks/smartmail';
 const testQenv = new Qenv('./', './.nogit');
 
 import * as mailgun from '../ts/index';
+import { IMailgunMessage } from '../ts/index';
 
 
 let testMailgunAccount: mailgun.MailgunAccount;
-let testSmartmail: smartmail.Smartmail;
+let testSmartmail: smartmail.Smartmail<IMailgunMessage>;
 
-tap.test('first test', async () => {
+tap.test('should create a mailgun account', async () => {
   testMailgunAccount = new mailgun.MailgunAccount(testQenv.getEnvVarOnDemand('MAILGUN_API_TOKEN'));
   expect(testMailgunAccount).to.be.instanceOf(mailgun.MailgunAccount);
 });
@@ -30,9 +31,11 @@ tap.test('should send a smartmail', async () => {
 
 tap.test('should retrieve a mail using a retrieval url', async () => {
   const result = await testMailgunAccount.retrieveSmartMailFromMessageUrl('https://sw.api.mailgun.net/v3/domains/mail.lossless.one/messages/AgMFnnnAKC8xp_dDa79LyoxhloxtaVmnRA==');
+  if (result) {
     result.options.subject = 'hi there. This is a testmail with attachment';
     result.options.from = 'noreply@mail.lossless.com';
     testMailgunAccount.sendSmartMail(result, 'sandbox@mail.git.zone');
+  }
 });
 
 tap.start();

ts/interfaces/message.ts

@@ -15,14 +15,14 @@ export interface IMailgunMessage {
   'X-Gm-Message-State': string;
   'body-plain': string;
   attachments: Array<{
-      url: string,
-      'content-type': string,
-      name: string,
-      size: number
+    url: string;
+    'content-type': string;
+    name: string;
+    size: number;
   }>;
   'body-html': string;
   'Mime-Version': string;
-  Date: string,
+  Date: string;
   'Message-Id': string;
   'Content-Type': string;
   'X-Google-Smtp-Source': string;

ts/interfaces/notification.ts

@@ -11,8 +11,8 @@ export interface IMailgunNotification {
   'X-Google-Dkim-Signature': string;
   To: string;
   'Dkim-Signature': string;
-  subject: 'Booking confirmation (Order 12PN8P)';
-  from: 'buchungsbestaetigung@bahn.de';
+  subject: string;
+  from: string;
   'X-Received': string[];
   'Ironport-Sdr': string;
   'Arc-Authentication-Results': string[];
@@ -32,13 +32,16 @@ export interface IMailgunNotification {
   'X-Forwarded-For': string;
   'X-Gm-Message-State': string;
   'X-Google-Smtp-Source': string;
-  'X-Envelope-From': '<phil+caf_=invoiceinbox=mail.lossless.one@lossless.com>';
-  'Content-Type': 'multipart/mixed; boundary="----=_Part_220882_156025801.1578848484963"';
-  'X-Forwarded-To': 'invoiceinbox@mail.lossless.one';
+  'X-Envelope-From': string;
+  'Content-Type': string;
+  'X-Forwarded-To': string;
   Subject: string;
   attachments: string;
   'body-plain': string;
   'stripped-text': string;
   'stripped-html': string;
   'stripped-signature': string;
+
+  // Lossless specific
+  "X-Lossless-Auth": string;
 }

ts/mailgun.classes.account.ts

@@ -51,7 +51,7 @@ export class MailgunAccount {
   /**
    * sends a SmartMail
    */
-  public async sendSmartMail(smartmailArg: plugins.smartmail.Smartmail, toArg: string, dataArg = {}) {
+  public async sendSmartMail(smartmailArg: plugins.smartmail.Smartmail<interfaces.IMailgunMessage>, toArg: string, dataArg = {}) {
     const domain = smartmailArg.options.from.split('@')[1];
     const formFields: plugins.smartrequest.IFormField[] = [
       {
@@ -98,14 +98,19 @@ export class MailgunAccount {
 
   public async retrieveSmartMailFromMessageUrl(messageUrlArg: string) {
     const response = await this.getRequest(messageUrlArg);
+    if (response.statusCode === 404) {
+      console.log(response.body.message);
+      return null;
+    }
     const responseBody: interfaces.IMailgunMessage = response.body;
-    const smartmail = new plugins.smartmail.Smartmail({
+    const smartmail = new plugins.smartmail.Smartmail<interfaces.IMailgunMessage>({
       from: responseBody.From,
       body: responseBody["body-html"],
       subject: responseBody.Subject,
     });
 
     // lets care about attachments
+    if (responseBody.attachments && responseBody.attachments instanceof Array) {
       for (const attachmentInfo of responseBody.attachments) {
         const attachmentName = attachmentInfo.name;
         const attachmentContents = await this.getRequest(attachmentInfo.url, true);
@@ -115,6 +120,7 @@ export class MailgunAccount {
           contentBuffer: attachmentContents.body
         }));
       }
+    }
 
     return smartmail;
   }