fix(core): update

.gitlab/.gitlab-webide.yml

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

.snyk

@@ -1,4 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.5
-ignore: {}
-patch: {}

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${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"
     }
   ]
 }

package.json

@@ -5,6 +5,7 @@
   "description": "an api abstraction package for mailgun",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
@@ -13,20 +14,18 @@
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.65",
-    "@gitzone/tstest": "^1.0.44",
+    "@gitzone/tstest": "^1.0.73",
-    "@pushrocks/qenv": "^4.0.10",
+    "@pushrocks/qenv": "^5.0.2",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^14.0.27",
+    "@types/node": "^18.6.4"
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@pushrocks/smartfile": "^8.0.0",
+    "@pushrocks/smartfile": "^10.0.4",
     "@pushrocks/smartmail": "^1.0.18",
-    "@pushrocks/smartrequest": "^1.1.47",
+    "@pushrocks/smartrequest": "^2.0.10",
-    "@pushrocks/smartsmtp": "^1.0.8",
+    "@pushrocks/smartsmtp": "^2.0.0",
-    "@pushrocks/smartstring": "^3.0.18"
+    "@pushrocks/smartstring": "^4.0.2"
   },
   "files": [
     "ts/**/*",

test/test.ts

@@ -4,16 +4,19 @@ import * as smartmail from '@pushrocks/smartmail';
 
 const testQenv = new Qenv('./', './.nogit');
 
-import * as mailgun from '../ts/index';
+import * as mailgun from '../ts/index.js';
-import { IMailgunMessage } from '../ts/index';
+import { IMailgunMessage } from '../ts/index.js';
 
 let testMailgunAccount: mailgun.MailgunAccount;
 let testSmartmail: smartmail.Smartmail<IMailgunMessage>;
 
 tap.test('should create a mailgun account', async () => {
-  testMailgunAccount = new mailgun.MailgunAccount(testQenv.getEnvVarOnDemand('MAILGUN_API_TOKEN'));
+  testMailgunAccount = new mailgun.MailgunAccount({
-  testMailgunAccount.addSmtpCredentials(testQenv.getEnvVarOnDemand('MAILGUN_SMTP_CREDENTIALS'));
+    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 () => {
@@ -22,7 +25,7 @@ tap.test('should create a smartmail', async () => {
     from: 'Lossless GmbH <noreply@mail.lossless.com>',
     subject: 'TestMessage from @mojoio/mailgun test',
   });
-  expect(testSmartmail).to.be.instanceOf(smartmail.Smartmail);
+  expect(testSmartmail).toBeInstanceOf(smartmail.Smartmail);
 });
 
 tap.test('should send a smartmail', async () => {
@@ -45,7 +48,10 @@ 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) {
+  console.log(result);
+
+  // 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>');

ts/00_commitinfo_data.ts

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

ts/index.ts

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

ts/interfaces/index.ts

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

ts/mailgun.classes.account.ts

@@ -1,41 +1,54 @@
-import * as plugins from './mailgun.plugins';
+import * as plugins from './mailgun.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
+
+export interface IMailgunAccountContructorOptions {
+  apiToken: string;
+  region: 'eu' | 'us';
+}
 
 export class MailgunAccount {
-  public baseUrl = 'https://api.mailgun.net/v3';
+  public apiBaseUrl: string;
-  public apiToken: string;
+
+  public options: IMailgunAccountContructorOptions;
 
   public smartSmtps: { [domain: string]: plugins.smartsmtp.Smartsmtp } = {};
 
-  constructor(apiTokenArg: string) {
+  constructor(optionsArg: IMailgunAccountContructorOptions) {
-    this.apiToken = apiTokenArg;
+    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 addSmtpCredentials(credentials: string) {
+  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]] = new plugins.smartsmtp.Smartsmtp({
+    this.smartSmtps[credentialArray[0]] =
-      smtpServer: 'smtp.mailgun.org',
+      await plugins.smartsmtp.Smartsmtp.createSmartsmtpWithRelay({
-      smtpUser: credentialArray[1],
+        smtpServer: 'smtp.eu.mailgun.org',
-      smtpPassword: credentialArray[2],
+        smtpUser: credentialArray[1],
-    });
+        smtpPassword: credentialArray[2],
+      });
   }
 
   public async getRequest(routeArg: string, binaryArg: boolean = false) {
     let requestUrl = routeArg;
     const needsBaseUrlPrefix = !routeArg.startsWith('https://');
-    needsBaseUrlPrefix ? (requestUrl = `${this.baseUrl}${routeArg}`) : null;
+    if (needsBaseUrlPrefix) {
+      requestUrl = `${this.apiBaseUrl}${routeArg}`;
+    }
     console.log(requestUrl);
     const requestOptions: plugins.smartrequest.ISmartRequestOptions = {
       method: 'GET',
       headers: {
-        Authorization: `Basic ${plugins.smartstring.base64.encode(`api:${this.apiToken}`)}`,
+        Authorization: `Basic ${plugins.smartstring.base64.encode(`api:${this.options.apiToken}`)}`,
         'Content-Type': 'application/json',
       },
       keepAlive: false,
@@ -50,12 +63,15 @@ export class MailgunAccount {
   }
 
   public async postFormData(routeArg: string, formFields: plugins.smartrequest.IFormField[]) {
-    const requestUrl = `${this.baseUrl}${routeArg}`; // TODO;
+    const requestUrl = `${this.apiBaseUrl}${routeArg}`;
+    console.log(requestUrl);
     const response = await plugins.smartrequest.postFormData(
       requestUrl,
       {
         headers: {
-          Authorization: `Basic ${plugins.smartstring.base64.encode(`api:${this.apiToken}`)}`,
+          Authorization: `Basic ${plugins.smartstring.base64.encode(
+            `api:${this.options.apiToken}`
+          )}`,
         },
         keepAlive: false,
       },
@@ -130,16 +146,17 @@ export class MailgunAccount {
         console.log('did not find appropriate smtp credentials');
         return;
       }
-      wantedSmartsmtp.sendSmartMail(smartmailArg, toArg);
+      await wantedSmartsmtp.sendSmartMail(smartmailArg, toArg);
       console.log(
-        `Sent mail with subject ${smartmailArg.getSubject(
+        `Sent mail with subject "${smartmailArg.getSubject(
           dataArg
-        )} to ${toArg} using an smtp transport over Mailgun`
+        )}" 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);

tsconfig.json

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

tslint.json

@@ -1,17 +0,0 @@
-{
-  "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"
-}