1.0.18

.gitignore

@@ -15,6 +15,8 @@ node_modules/
 
 # builds
 dist/
-dist_*/
+dist_web/
+dist_serve/
+dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -3,44 +3,36 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-    - .npmci_cache/
+  - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
+  key: "$CI_BUILD_STAGE"
 
 stages:
-  - security
+- security
-  - test
+- test
-  - release
+- release
-  - metadata
+- metadata
-
-before_script:
-  - npm install -g @shipzone/npmci
 
 # ====================
 # security stage
 # ====================
-auditProductionDependencies:
+mirror:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
+  - npmci git mirror
-    - 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
+  - docker
-  allow_failure: true
+  - notpriv
 
-auditDevDependencies:
+snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
+    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
-    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command snyk test
-    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - docker
+  - docker
-  allow_failure: true
+  - notpriv
 
 # ====================
 # test stage
@@ -49,36 +41,37 @@ auditDevDependencies:
 testStable:
   stage: test
   script:
-    - npmci npm prepare
+  - npmci npm prepare
-    - npmci node install stable
+  - npmci node install stable
-    - npmci npm install
+  - npmci npm install
-    - npmci npm test
+  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
+  - priv
 
 testBuild:
   stage: test
   script:
-    - npmci npm prepare
+  - npmci npm prepare
-    - npmci node install stable
+  - npmci node install stable
-    - npmci npm install
+  - npmci npm install
-    - npmci command npm run build
+  - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
+  - notpriv
 
 release:
   stage: release
   script:
-    - npmci node install stable
+  - npmci node install stable
-    - npmci npm publish
+  - npmci npm publish
   only:
-    - tags
+  - tags
   tags:
-    - lossless
+  - docker
-    - docker
+  - notpriv
-    - notpriv
 
 # ====================
 # metadata stage
@@ -86,37 +79,34 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
-  only:
-    - tags
   script:
-    - npmci command npm install -g typescript
+    - npmci command npm install -g tslint typescript
     - npmci npm prepare
     - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-    - lossless
+  - docker
-    - docker
+  - priv
-    - priv
 
 trigger:
   stage: metadata
   script:
-    - npmci trigger
+  - npmci trigger
   only:
-    - tags
+  - tags
   tags:
-    - lossless
+  - docker
-    - docker
+  - notpriv
-    - notpriv
 
 pages:
   stage: metadata
   script:
-    - npmci node install stable 
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command npm run buildDocs
+    - npmci command tsdoc
   tags:
-    - lossless
     - docker
     - notpriv
   only:
@@ -124,5 +114,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-      - public
+    - public
   allow_failure: true

.gitlab/.gitlab-webide.yml

@@ -0,0 +1,8 @@
+terminal:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:stable
+  before_script:
+    - npm install -g npm-check
+  variables:
+    RAILS_ENV: "test"
+    NODE_ENV: "test"
+

.vscode/launch.json

@@ -2,10 +2,28 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "command": "npm test",
+      "name": "current file",
-      "name": "Run npm test",
+      "type": "node",
       "request": "launch",
-      "type": "node-terminal"
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
     }
   ]
 }

.vscode/settings.json

@@ -11,13 +11,7 @@
           },
           "gitzone": {
             "type": "object",
-            "description": "settings for gitzone",
+            "description": "settings for gitzone"
-            "properties": {
-              "projectType": {
-                "type": "string",
-                "enum": ["website", "element", "service", "npm", "wcc"]
-              }
-            }
           }
         }
       }

npmextra.json

@@ -1,11 +1,10 @@
 {
   "gitzone": {
-    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "mojoio",
       "gitrepo": "mailgun",
-      "description": "an api abstraction package for mailgun",
+      "shortDescription": "an api abstraction package for mailgun",
       "npmPackagename": "@mojoio/mailgun",
       "license": "MIT",
       "projectDomain": "mojo.io"

package.json

@@ -1,46 +1,41 @@
 {
   "name": "@mojoio/mailgun",
-  "version": "2.0.0",
+  "version": "1.0.18",
   "private": false,
   "description": "an api abstraction package for mailgun",
-  "main": "dist_ts/index.js",
+  "main": "dist/index.js",
-  "typings": "dist_ts/index.d.ts",
+  "typings": "dist/index.d.ts",
-  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web)",
+    "build": "(tsbuild)",
-    "format": "(gitzone format)",
+    "format": "(gitzone format)"
-    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.65",
+    "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tstest": "^1.0.73",
+    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/qenv": "^5.0.2",
+    "@pushrocks/qenv": "^4.0.6",
-    "@pushrocks/tapbundle": "^5.0.4",
+    "@pushrocks/tapbundle": "^3.2.0",
-    "@types/node": "^18.6.4"
+    "@types/node": "^13.1.6",
+    "tslint": "^5.20.1",
+    "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@pushrocks/smartfile": "^10.0.4",
+    "@pushrocks/smartfile": "^7.0.6",
-    "@pushrocks/smartmail": "^1.0.22",
+    "@pushrocks/smartmail": "^1.0.8",
-    "@pushrocks/smartrequest": "^2.0.10",
+    "@pushrocks/smartrequest": "^1.1.47",
-    "@pushrocks/smartsmtp": "^3.0.3",
+    "@pushrocks/smartstring": "^3.0.17"
-    "@pushrocks/smartstring": "^4.0.2"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_*/**/*",
+    "dist_web/**/*",
-    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
-  ],
-  "browserslist": [
-    "last 1 chrome versions"
   ]
 }

qenv.yml

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

readme.md

@@ -8,29 +8,16 @@ an api abstraction package for mailgun
 * [docs (typedoc)](https://mojoio.gitlab.io/mailgun/)
 
 ## Status for master
-
+[![build status](https://gitlab.com/mojoio/mailgun/badges/master/build.svg)](https://gitlab.com/mojoio/mailgun/commits/master)
-Status Category | Status Badge
+[![coverage report](https://gitlab.com/mojoio/mailgun/badges/master/coverage.svg)](https://gitlab.com/mojoio/mailgun/commits/master)
--- | --
+[![npm downloads per month](https://img.shields.io/npm/dm/@mojoio/mailgun.svg)](https://www.npmjs.com/package/@mojoio/mailgun)
-GitLab Pipelines | [![pipeline status](https://gitlab.com/mojoio/mailgun/badges/master/pipeline.svg)](https://lossless.cloud)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@mojoio/mailgun/badge.svg)](https://snyk.io/test/npm/@mojoio/mailgun)
-GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/mojoio/mailgun/badges/master/coverage.svg)](https://lossless.cloud)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@mojoio/mailgun)](https://lossless.cloud)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/mojoio/mailgun)](https://lossless.cloud)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
-TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
-node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
-PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@mojoio/mailgun)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@mojoio/mailgun)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@mojoio/mailgun)](https://lossless.cloud)
-Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
-Use TypeScript for best in class intellisense.
-
-## Contribution
-
-We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
-
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.ts

@@ -4,60 +4,35 @@ import * as smartmail from '@pushrocks/smartmail';
 
 const testQenv = new Qenv('./', './.nogit');
 
-import * as mailgun from '../ts/index.js';
+import * as mailgun from '../ts/index';
-import { IMailgunMessage } from '../ts/index.js';
+
 
 let testMailgunAccount: mailgun.MailgunAccount;
-let testSmartmail: smartmail.Smartmail<IMailgunMessage>;
+let testSmartmail: smartmail.Smartmail;
 
-tap.test('should create a mailgun account', async () => {
+tap.test('first test', async () => {
-  testMailgunAccount = new mailgun.MailgunAccount({
+  testMailgunAccount = new mailgun.MailgunAccount(testQenv.getEnvVarOnDemand('MAILGUN_API_TOKEN'));
-    apiToken: testQenv.getEnvVarOnDemand('MAILGUN_API_TOKEN'),
+  expect(testMailgunAccount).to.be.instanceOf(mailgun.MailgunAccount);
-    region: 'eu',
-  });
-  await testMailgunAccount.addSmtpCredentials(
-    testQenv.getEnvVarOnDemand('MAILGUN_SMTP_CREDENTIALS')
-  );
-  expect(testMailgunAccount).toBeInstanceOf(mailgun.MailgunAccount);
 });
 
 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>',
+    from: 'noreply@mail.lossless.com',
-    subject: 'TestMessage from @mojoio/mailgun test',
+    subject: 'hi there. This is the subject'
   });
-  expect(testSmartmail).toBeInstanceOf(smartmail.Smartmail);
+  return testSmartmail;
 });
 
 tap.test('should send a smartmail', async () => {
-  await testMailgunAccount.sendSmartMail(testSmartmail, 'Sandbox Team <sandbox@mail.git.zone>');
+  testMailgunAccount.sendSmartMail(testSmartmail, '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(
+  const result = await testMailgunAccount.retrieveSmartMailFromMessageUrl('https://sw.api.mailgun.net/v3/domains/mail.lossless.one/messages/AgMFnnnAKC8xp_dDa79LyoxhloxtaVmnRA==');
-    'https://sw.api.mailgun.net/v3/domains/mail.lossless.one/messages/AgMFnnnAKC8xp_dDa79LyoxhloxtaVmnRA=='
+  result.options.subject = 'hi there. This is a testmail with attachment';
-  );
+  result.options.from = 'noreply@mail.lossless.com';
-  console.log(result);
+  testMailgunAccount.sendSmartMail(result, 'sandbox@mail.git.zone');
-
-  // TODO handle empty body
-  if (false) {
-    result.options.subject = 'hi there. This is a testmail with attachment';
-    result.options.from = 'noreply@mail.lossless.com';
-    await testMailgunAccount.sendSmartMail(result, 'Sandbox Team <sandbox@mail.git.zone>');
-  }
 });
 
 tap.start();

ts/00_commitinfo_data.ts

@@ -1,8 +0,0 @@
-/**
- * autocreated commitinfo by @pushrocks/commitinfo
- */
-export const commitinfo = {
-  name: '@mojoio/mailgun',
-  version: '2.0.0',
-  description: 'an api abstraction package for mailgun'
-}

ts/index.ts

@@ -1,2 +1,2 @@
-export * from './mailgun.classes.account.js';
+export * from './mailgun.classes.account';
-export * from './interfaces/index.js';
+export * from './interfaces';

ts/interfaces/index.ts

@@ -1,2 +1,2 @@
-export * from './message.js';
+export * from './message';
-export * from './notification.js';
+export * from './notification';

ts/interfaces/message.ts

@@ -15,14 +15,14 @@ export interface IMailgunMessage {
   'X-Gm-Message-State': string;
   'body-plain': string;
   attachments: Array<{
-    url: string;
+      url: string,
-    'content-type': string;
+      'content-type': string,
-    name: string;
+      name: string,
-    size: number;
+      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

@@ -6,13 +6,13 @@ export interface IMailgunNotification {
   'Received-Spf': string;
   From: string;
   'Return-Path': string;
-  'Arc-Seal': string[];
+  'Arc-Seal': string[],
   'Delivered-To': string;
   'X-Google-Dkim-Signature': string;
   To: string;
   'Dkim-Signature': string;
-  subject: string;
+  subject: 'Booking confirmation (Order 12PN8P)';
-  from: string;
+  from: 'buchungsbestaetigung@bahn.de';
   'X-Received': string[];
   'Ironport-Sdr': string;
   'Arc-Authentication-Results': string[];
@@ -32,16 +32,13 @@ export interface IMailgunNotification {
   'X-Forwarded-For': string;
   'X-Gm-Message-State': string;
   'X-Google-Smtp-Source': string;
-  'X-Envelope-From': string;
+  'X-Envelope-From': '<phil+caf_=invoiceinbox=mail.lossless.one@lossless.com>';
-  'Content-Type': string;
+  'Content-Type': 'multipart/mixed; boundary="----=_Part_220882_156025801.1578848484963"';
-  'X-Forwarded-To': string;
+  'X-Forwarded-To': 'invoiceinbox@mail.lossless.one';
   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

@@ -1,57 +1,27 @@
-import * as plugins from './mailgun.plugins.js';
+import * as plugins from './mailgun.plugins';
-import * as interfaces from './interfaces/index.js';
+import * as interfaces from './interfaces';
-
-export interface IMailgunAccountContructorOptions {
-  apiToken: string;
-  region: 'eu' | 'us';
-}
 
 export class MailgunAccount {
-  public apiBaseUrl: string;
+  public baseUrl = 'https://api.mailgun.net/v3';
+  public apiToken: string;
 
-  public options: IMailgunAccountContructorOptions;
+  constructor(apiTokenArg: string) {
-
+    this.apiToken = apiTokenArg;
-  public smartSmtps: { [domain: string]: plugins.smartsmtp.Smartsmtp } = {};
-
-  constructor(optionsArg: IMailgunAccountContructorOptions) {
-    this.options = optionsArg;
-    this.apiBaseUrl =
-      this.options.region === 'eu'
-        ? 'https://api.eu.mailgun.net/v3'
-        : 'https://api..mailgun.net/v3';
-  }
-
-  /**
-   * allows adding smtp credentials
-   * Format: [domain]|[username]|[password]
-   */
-  public async addSmtpCredentials(credentials: string) {
-    const credentialArray = credentials.split('|');
-    if (credentialArray.length !== 3) {
-      throw new Error('credentials are in the wrong format');
-    }
-    this.smartSmtps[credentialArray[0]] =
-      await plugins.smartsmtp.Smartsmtp.createSmartsmtpWithRelay({
-        smtpServer: 'smtp.eu.mailgun.org',
-        smtpUser: credentialArray[1],
-        smtpPassword: credentialArray[2],
-      });
   }
 
   public async getRequest(routeArg: string, binaryArg: boolean = false) {
     let requestUrl = routeArg;
     const needsBaseUrlPrefix = !routeArg.startsWith('https://');
-    if (needsBaseUrlPrefix) {
+    needsBaseUrlPrefix ? requestUrl = `${this.baseUrl}${routeArg}` : null;
-      requestUrl = `${this.apiBaseUrl}${routeArg}`;
-    }
     console.log(requestUrl);
     const requestOptions: plugins.smartrequest.ISmartRequestOptions = {
       method: 'GET',
       headers: {
-        Authorization: `Basic ${plugins.smartstring.base64.encode(`api:${this.options.apiToken}`)}`,
+        Authorization: `Basic ${plugins.smartstring.base64.encode(
-        'Content-Type': 'application/json',
+          `api:${this.apiToken}`
-      },
+        )}`,
-      keepAlive: false,
+        'Content-Type': 'application/json'
+      }
     };
     let response: plugins.smartrequest.IExtendedIncomingMessage;
     if (!binaryArg) {
@@ -63,17 +33,15 @@ export class MailgunAccount {
   }
 
   public async postFormData(routeArg: string, formFields: plugins.smartrequest.IFormField[]) {
-    const requestUrl = `${this.apiBaseUrl}${routeArg}`;
+    const requestUrl = `${this.baseUrl}${routeArg}`; // TODO;
-    console.log(requestUrl);
     const response = await plugins.smartrequest.postFormData(
       requestUrl,
       {
         headers: {
           Authorization: `Basic ${plugins.smartstring.base64.encode(
-            `api:${this.options.apiToken}`
+            `api:${this.apiToken}`
-          )}`,
+          )}`
-        },
+        }
-        keepAlive: false,
       },
       formFields
     );
@@ -83,33 +51,29 @@ export class MailgunAccount {
   /**
    * sends a SmartMail
    */
-  public async sendSmartMail(
+  public async sendSmartMail(smartmailArg: plugins.smartmail.Smartmail, toArg: string, dataArg = {}) {
-    smartmailArg: plugins.smartmail.Smartmail<interfaces.IMailgunMessage>,
+    const domain = smartmailArg.options.from.split('@')[1];
-    toArg: string,
-    dataArg = {}
-  ) {
-    const domain = smartmailArg.options.from.split('@')[1].replace('>', '');
     const formFields: plugins.smartrequest.IFormField[] = [
       {
         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);
@@ -119,75 +83,42 @@ export class MailgunAccount {
         name: 'attachment',
         type: 'Buffer',
         payload: attachment.contentBuffer,
-        fileName: attachment.parsedPath.base,
+        fileName: attachment.parsedPath.base
       });
     }
 
-    if (smartmailArg.getBody(dataArg)) {
+    const response = await this.postFormData(`/${domain}/messages`, formFields);
-      console.log('All requirements for API met');
+    if (response.statusCode === 200) {
-      const response = await this.postFormData(`/${domain}/messages`, formFields);
+      return response.body;
-      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(
+      console.log(response.body);
-        'An empty body was provided. This does not work via the API, but using SMTP instead.'
+      throw new Error('could not send email');
-      );
-      const wantedSmartsmtp = this.smartSmtps[domain];
-      if (!wantedSmartsmtp) {
-        console.log('did not find appropriate smtp credentials');
-        return;
-      }
-      await wantedSmartsmtp.sendSmartMail(smartmailArg, toArg);
-      console.log(
-        `Sent mail with subject "${smartmailArg.getSubject(
-          dataArg
-        )}" to "${toArg}" using an smtp transport over Mailgun.`
-      );
     }
   }
 
   public async retrieveSmartMailFromMessageUrl(messageUrlArg: string) {
-    console.log(`retrieving message for ${messageUrlArg}`);
     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<interfaces.IMailgunMessage>({
+    const smartmail = new plugins.smartmail.Smartmail({
       from: responseBody.From,
-      body: responseBody['body-html'],
+      body: responseBody["body-html"],
       subject: responseBody.Subject,
-      creationObjectRef: responseBody,
     });
 
     // lets care about attachments
-    if (responseBody.attachments && responseBody.attachments instanceof Array) {
+    for (const attachmentInfo of responseBody.attachments) {
-      for (const attachmentInfo of responseBody.attachments) {
+      const attachmentName = attachmentInfo.name;
-        const attachmentName = attachmentInfo.name;
+      const attachmentContents = await this.getRequest(attachmentInfo.url, true);
-        const attachmentContents = await this.getRequest(attachmentInfo.url, true);
+      smartmail.addAttachment(new plugins.smartfile.Smartfile({
-        smartmail.addAttachment(
+        path: `./${attachmentName}`,
-          new plugins.smartfile.Smartfile({
+        base: `./${attachmentName}`,
-            path: `./${attachmentName}`,
+        contentBuffer: attachmentContents.body
-            base: `./${attachmentName}`,
+      }));
-            contentBuffer: attachmentContents.body,
-          })
-        );
-      }
     }
 
     return smartmail;
   }
-
+  
   public async retrieveSmartMailFromNotifyPayload(notifyPayloadArg: any) {
     return await this.retrieveSmartMailFromMessageUrl(notifyPayloadArg['message-url']);
   }

ts/mailgun.plugins.ts

@@ -2,7 +2,6 @@
 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, smartsmtp, smartstring };
+export { smartfile, smartmail, smartrequest, smartstring };

tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "compilerOptions": {
-    "experimentalDecorators": true,
-    "useDefineForClassFields": false,
-    "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "nodenext",
-    "esModuleInterop": true
-  }
-}

tslint.json

@@ -0,0 +1,17 @@
+{
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
+}