1.0.30

.gitlab-ci.yml

@@ -19,23 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/mailgun",
-  "version": "1.0.26",
+  "version": "1.0.30",
   "private": false,
   "description": "an api abstraction package for mailgun",
   "main": "dist_ts/index.js",
@@ -13,18 +13,19 @@
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.22",
-    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/qenv": "^4.0.6",
-    "@pushrocks/tapbundle": "^3.2.1",
-    "@types/node": "^13.13.4",
-    "tslint": "^6.1.1",
+    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tstest": "^1.0.44",
+    "@pushrocks/qenv": "^4.0.10",
+    "@pushrocks/tapbundle": "^3.2.9",
+    "@types/node": "^14.0.27",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@pushrocks/smartfile": "^7.0.12",
-    "@pushrocks/smartmail": "^1.0.11",
+    "@pushrocks/smartfile": "^8.0.0",
+    "@pushrocks/smartmail": "^1.0.18",
     "@pushrocks/smartrequest": "^1.1.47",
+    "@pushrocks/smartsmtp": "^1.0.8",
     "@pushrocks/smartstring": "^3.0.18"
   },
   "files": [
@@ -38,5 +39,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

qenv.yml

@@ -1,2 +1,3 @@
 required:
-  - MAILGUN_API_TOKEN
+  - MAILGUN_API_TOKEN
+  - MAILGUN_SMTP_CREDENTIALS

test/test.ts

@@ -12,6 +12,7 @@ let testSmartmail: smartmail.Smartmail<IMailgunMessage>;
 
 tap.test('should create a mailgun account', async () => {
   testMailgunAccount = new mailgun.MailgunAccount(testQenv.getEnvVarOnDemand('MAILGUN_API_TOKEN'));
+  testMailgunAccount.addSmtpCredentials(testQenv.getEnvVarOnDemand('MAILGUN_SMTP_CREDENTIALS'));
   expect(testMailgunAccount).to.be.instanceOf(mailgun.MailgunAccount);
 });
 
@@ -19,15 +20,27 @@ tap.test('should create a smartmail', async () => {
   testSmartmail = new smartmail.Smartmail({
     body: 'hi there. This is the body.',
     from: 'Lossless GmbH <noreply@mail.lossless.com>',
-    subject: 'TestMessage from @mojoio/mailgun test'
+    subject: 'TestMessage from @mojoio/mailgun test',
   });
-  return testSmartmail;
+  expect(testSmartmail).to.be.instanceOf(smartmail.Smartmail);
 });
 
 tap.test('should send a smartmail', async () => {
   await testMailgunAccount.sendSmartMail(testSmartmail, 'Sandbox Team <sandbox@mail.git.zone>');
 });
 
+tap.test('should send a smartmail with empty body', async () => {
+  const emptyBodySmartmail = new smartmail.Smartmail<IMailgunMessage>({
+    body: '',
+    from: 'Lossless GmbH <noreply@mail.lossless.one>',
+    subject: 'A message with no body from @mojoio/mailgun test',
+  });
+  await testMailgunAccount.sendSmartMail(
+    emptyBodySmartmail,
+    'Sandbox Team <sandbox@mail.git.zone>'
+  );
+});
+
 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=='

ts/mailgun.classes.account.ts

@@ -5,10 +5,28 @@ export class MailgunAccount {
   public baseUrl = 'https://api.mailgun.net/v3';
   public apiToken: string;
 
+  public smartSmtps: { [domain: string]: plugins.smartsmtp.Smartsmtp } = {};
+
   constructor(apiTokenArg: string) {
     this.apiToken = apiTokenArg;
   }
 
+  /**
+   * allows adding smtp credentials
+   * Format: [domain]|[username]|[password]
+   */
+  public addSmtpCredentials(credentials: string) {
+    const credentialArray = credentials.split('|');
+    if (credentialArray.length !== 3) {
+      throw new Error('credentials are in the wrong format');
+    }
+    this.smartSmtps[credentialArray[0]] = new plugins.smartsmtp.Smartsmtp({
+      smtpServer: 'smtp.mailgun.org',
+      smtpUser: credentialArray[1],
+      smtpPassword: credentialArray[2],
+    });
+  }
+
   public async getRequest(routeArg: string, binaryArg: boolean = false) {
     let requestUrl = routeArg;
     const needsBaseUrlPrefix = !routeArg.startsWith('https://');
@@ -18,8 +36,9 @@ export class MailgunAccount {
       method: 'GET',
       headers: {
         Authorization: `Basic ${plugins.smartstring.base64.encode(`api:${this.apiToken}`)}`,
-        'Content-Type': 'application/json'
-      }
+        'Content-Type': 'application/json',
+      },
+      keepAlive: false,
     };
     let response: plugins.smartrequest.IExtendedIncomingMessage;
     if (!binaryArg) {
@@ -36,8 +55,9 @@ export class MailgunAccount {
       requestUrl,
       {
         headers: {
-          Authorization: `Basic ${plugins.smartstring.base64.encode(`api:${this.apiToken}`)}`
-        }
+          Authorization: `Basic ${plugins.smartstring.base64.encode(`api:${this.apiToken}`)}`,
+        },
+        keepAlive: false,
       },
       formFields
     );
@@ -57,23 +77,23 @@ export class MailgunAccount {
       {
         name: 'from',
         type: 'string',
-        payload: smartmailArg.options.from
+        payload: smartmailArg.options.from,
       },
       {
         name: 'to',
         type: 'string',
-        payload: toArg
+        payload: toArg,
       },
       {
         name: 'subject',
         type: 'string',
-        payload: smartmailArg.getSubject(dataArg)
+        payload: smartmailArg.getSubject(dataArg),
       },
       {
         name: 'html',
         type: 'string',
-        payload: smartmailArg.getBody(dataArg)
-      }
+        payload: smartmailArg.getBody(dataArg),
+      },
     ];
 
     console.log(smartmailArg.attachments);
@@ -83,16 +103,39 @@ export class MailgunAccount {
         name: 'attachment',
         type: 'Buffer',
         payload: attachment.contentBuffer,
-        fileName: attachment.parsedPath.base
+        fileName: attachment.parsedPath.base,
       });
     }
 
-    const response = await this.postFormData(`/${domain}/messages`, formFields);
-    if (response.statusCode === 200) {
-      return response.body;
+    if (smartmailArg.getBody(dataArg)) {
+      console.log('All requirements for API met');
+      const response = await this.postFormData(`/${domain}/messages`, formFields);
+      if (response.statusCode === 200) {
+        console.log(
+          `Sent mail with subject ${smartmailArg.getSubject(
+            dataArg
+          )} to ${toArg} using the mailgun API`
+        );
+        return response.body;
+      } else {
+        console.log(response.body);
+        throw new Error('could not send email');
+      }
     } else {
-      console.log(response.body);
-      throw new Error('could not send email');
+      console.log(
+        'An empty body was provided. This does not work via the API, but using SMTP instead.'
+      );
+      const wantedSmartsmtp = this.smartSmtps[domain];
+      if (!wantedSmartsmtp) {
+        console.log('did not find appropriate smtp credentials');
+        return;
+      }
+      wantedSmartsmtp.sendSmartMail(smartmailArg, toArg);
+      console.log(
+        `Sent mail with subject ${smartmailArg.getSubject(
+          dataArg
+        )} to ${toArg} using an smtp transport over Mailgun`
+      );
     }
   }
 
@@ -107,7 +150,7 @@ export class MailgunAccount {
       from: responseBody.From,
       body: responseBody['body-html'],
       subject: responseBody.Subject,
-      creationObjectRef: responseBody
+      creationObjectRef: responseBody,
     });
 
     // lets care about attachments
@@ -119,7 +162,7 @@ export class MailgunAccount {
           new plugins.smartfile.Smartfile({
             path: `./${attachmentName}`,
             base: `./${attachmentName}`,
-            contentBuffer: attachmentContents.body
+            contentBuffer: attachmentContents.body,
           })
         );
       }

ts/mailgun.plugins.ts

@@ -2,6 +2,7 @@
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartmail from '@pushrocks/smartmail';
 import * as smartrequest from '@pushrocks/smartrequest';
+import * as smartsmtp from '@pushrocks/smartsmtp';
 import * as smartstring from '@pushrocks/smartstring';
 
-export { smartfile, smartmail, smartrequest, smartstring };
+export { smartfile, smartmail, smartrequest, smartsmtp, smartstring };