2.0.0

.gitlab-ci.yml

@@ -26,17 +26,29 @@ mirror:
     - 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
+    - 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 --only=dev
+  tags:
+    - docker
+  allow_failure: true
+
 # ====================
 # test stage
 # ====================

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartsmtp",
-  "version": "1.0.5",
+  "version": "2.0.0",
   "private": false,
   "description": "a module for handling smtp stuff",
   "main": "dist_ts/index.js",
@@ -13,10 +13,10 @@
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.44",
     "@pushrocks/qenv": "^4.0.10",
     "@pushrocks/tapbundle": "^3.0.7",
-    "@types/node": "^14.0.27",
+    "@types/node": "^15.12.2",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },

test/test.ts

@@ -9,7 +9,7 @@ const testQenv = new Qenv('./', './.nogit');
 let testSmartsmtp: smartsmtp.Smartsmtp;
 
 tap.test('should create a valid instance of Smartsmtp', async () => {
-  testSmartsmtp = new smartsmtp.Smartsmtp({
+  testSmartsmtp = await smartsmtp.Smartsmtp.createSmartsmtpWithRelay({
     smtpServer: testQenv.getEnvVarOnDemand('SMTP_SERVER'),
     smtpUser: testQenv.getEnvVarOnDemand('SMTP_USER'),
     smtpPassword: testQenv.getEnvVarOnDemand('SMTP_PASSWORD'),
@@ -17,7 +17,7 @@ tap.test('should create a valid instance of Smartsmtp', async () => {
   expect(testSmartsmtp).to.be.instanceOf(smartsmtp.Smartsmtp);
 });
 
-tap.test('should send a message', async () => {
+tap.test('should send a message with empty body', async () => {
   const result = await testSmartsmtp.sendSmartMail(
     new smartmail.Smartmail({
       body: '',
@@ -29,4 +29,17 @@ tap.test('should send a message', async () => {
   console.log(result);
 });
 
+tap.test('should create a direct smartsmtp transport', async () => {
+  const smartsmtpInstance = await smartsmtp.Smartsmtp.createSmartsmtpSendmail();
+  const result = await smartsmtpInstance.sendSmartMail(
+    new smartmail.Smartmail({
+      body: 'hi there',
+      from: 'phil@lossless.com',
+      subject: 'this is a sendmail test message',
+    }),
+    'phil@kunz.io'
+  );
+  console.log(result);
+})
+
 tap.start();

ts/index.ts

@@ -1,44 +1 @@
-import * as plugins from './smartsmtp.plugins';
-
-export interface ISmartSmtpOptions {
-  smtpServer: string;
-  smtpUser: string;
-  smtpPassword: string;
-}
-
-/**
- * Use it to send mails via smtp
- */
-export class Smartsmtp {
-  public nodemailerTransport: plugins.nodemailer.Transporter;
-  constructor(optionsArg: ISmartSmtpOptions) {
-    this.nodemailerTransport = plugins.nodemailer.createTransport({
-      host: optionsArg.smtpServer,
-      port: 465,
-      secure: true, // upgrade later with STARTTLS
-      auth: {
-        user: optionsArg.smtpUser,
-        pass: optionsArg.smtpPassword,
-      },
-    });
-  }
-
-  /**
-   * sends a SmartMail
-   */
-  public async sendSmartMail(
-    smartmailArg: plugins.smartmail.Smartmail<any>,
-    toArg: string,
-    dataArg = {}
-  ) {
-    const message = {
-      from: smartmailArg.options.from,
-      to: toArg,
-      subject: smartmailArg.getSubject(dataArg),
-      text: smartmailArg.getBody(dataArg),
-      html: smartmailArg.getBody(dataArg),
-    };
-    const response = await this.nodemailerTransport.sendMail(message);
-    return response;
-  }
-}
+export * from './smartsmtp.classes.smartsmtp';

ts/smartsmtp.classes.smartsmtp.ts

@@ -0,0 +1,69 @@
+import * as plugins from './smartsmtp.plugins';
+
+export interface ISmartSmtpOptions {
+  smtpServer: string;
+  smtpUser: string;
+  smtpPassword: string;
+}
+
+/**
+ * Use it to send mails via smtp
+ */
+export class Smartsmtp {
+  public static async createSmartsmtpWithRelay(optionsArg: ISmartSmtpOptions) {
+    const nodemailerTransport = plugins.nodemailer.createTransport({
+      host: optionsArg.smtpServer,
+      port: 465,
+      secure: true, // upgrade later with STARTTLS
+      auth: {
+        user: optionsArg.smtpUser,
+        pass: optionsArg.smtpPassword,
+      },
+    });
+    return new Smartsmtp(nodemailerTransport);
+  }
+
+  public static async createSmartsmtpSendmail() {
+    const nodemailerTransport = plugins.nodemailer.createTransport({
+      sendmail: true,
+      newline: 'unix'
+    });
+    return new Smartsmtp(nodemailerTransport);
+  }
+
+  public nodemailerTransport: plugins.nodemailer.Transporter;
+  constructor(transporterArg: plugins.nodemailer.Transporter) {
+    this.nodemailerTransport = transporterArg;
+  }
+
+  /**
+   * sends a SmartMail
+   */
+  public async sendSmartMail(
+    smartmailArg: plugins.smartmail.Smartmail<any>,
+    toArg: string,
+    dataArg = {}
+  ) {
+    const message: plugins.nodemailer.SendMailOptions = {
+      from: smartmailArg.options.from,
+      to: toArg,
+      subject: smartmailArg.getSubject(dataArg),
+      text: smartmailArg.getBody(dataArg),
+      html: smartmailArg.getBody(dataArg),
+      attachments: [],
+    };
+
+    // lets add attachments from smartmailArg
+    for (const attachment of smartmailArg.attachments) {
+      message.attachments.push({
+        filename: attachment.parsedPath.base,
+        content: attachment.contentBuffer,
+      });
+    }
+
+    const response = await this.nodemailerTransport.sendMail(message).catch(err => {
+      console.log(err);
+    });
+    return response;
+  }
+}