mail-time 1.2.4 → 1.3.0

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020, dr.dimitru (Dmitry A.; Veliov Group, LLC)
+Copyright (c) 2022, dr.dimitru (Dmitry A.; Veliov Group, LLC)
 All rights reserved.
 
 Redistribution and use in source and binary forms, 

package/README.md

@@ -1,12 +1,10 @@
-# MailTime
-
-<a href="https://www.patreon.com/bePatron?u=20396046">
-  <img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" width="160">
+[![support](https://img.shields.io/badge/support-GitHub-white)](https://github.com/sponsors/veliovgroup)
+[![support](https://img.shields.io/badge/support-PayPal-white)](https://paypal.me/veliovgroup)
+<a href="https://ostr.io/info/built-by-developers-for-developers">
+  <img src="https://ostr.io/apple-touch-icon-60x60.png" height="20">
 </a>
 
-<a href="https://ostr.io">
-  <img src="https://ostr.io/apple-touch-icon-60x60.png" height="38">
-</a>
+# MailTime
 
 Micro-service package for mail queue, with *Server* and *Client* API.
 Build on top of [`nodemailer`](https://github.com/nodemailer/nodemailer) package.
@@ -16,23 +14,29 @@ Every `MailTime` instance can be configured to be a *Server* or *Client*.
 Main difference of *Server* from *Client* - *Server* handles queue and actually sends email.
 While *Client* is only put emails into the queue.
 
+"Mail-Time" is a micro-service package for mail queue, with *Server* and *Client* APIs. Build on top of the [`nodemailer`](https://github.com/nodemailer/nodemailer) package.
+
+Every `MailTime` instance can get configured as *Server* or *Client*.
+
+The main difference between *Server* and *Client* modes is that the *Server* handles the queue and __sends__ email. While the *Client* only __adds__ emails into the queue.
+
 ## ToC
 
-- [How it works?](https://github.com/VeliovGroup/Mail-Time#how-it-works)
-  - [With single SMTP](https://github.com/VeliovGroup/Mail-Time#single-point-of-failure)
-  - [With multiple SMTP](https://github.com/VeliovGroup/Mail-Time#multiple-smtp-providers)
-  - [As Micro-Service](https://github.com/VeliovGroup/Mail-Time#cluster-issue)
-- [Features](https://github.com/VeliovGroup/Mail-Time#features)
-- [Installation](https://github.com/VeliovGroup/Mail-Time#installation)
-- [Meteor.js Installation](https://github.com/VeliovGroup/Mail-Time#installation--import-via-npm): as [NPM Package](https://www.npmjs.com/package/mail-time)
-- [Meteor.js Installation](https://github.com/VeliovGroup/Mail-Time#installation--import-via-atmosphere): as [Atmosphere package](https://atmospherejs.com/ostrio/mailer)
-- [Usage example](https://github.com/VeliovGroup/Mail-Time#basic-usage)
-- [API](https://github.com/VeliovGroup/Mail-Time#api)
-  - [*Constructor*](https://github.com/VeliovGroup/Mail-Time#new-mailtimeopts-constructor)
-  - [`.send()`](https://github.com/VeliovGroup/Mail-Time#sendmailopts--callback)
-  - [Default Template](https://github.com/VeliovGroup/Mail-Time#static-mailtimetemplate)
-- [Custom Templates](https://github.com/VeliovGroup/Mail-Time#template-example)
-- [~92% tests coverage](https://github.com/VeliovGroup/Mail-Time#testing)
+- [How it works?](https://github.com/veliovgroup/Mail-Time#how-it-works)
+  - [With single SMTP](https://github.com/veliovgroup/Mail-Time#single-point-of-failure)
+  - [With multiple SMTP](https://github.com/veliovgroup/Mail-Time#multiple-smtp-providers)
+  - [As Micro-Service](https://github.com/veliovgroup/Mail-Time#cluster-issue)
+- [Features](https://github.com/veliovgroup/Mail-Time#features)
+- [Installation](https://github.com/veliovgroup/Mail-Time#installation)
+- [Meteor.js Installation](https://github.com/veliovgroup/Mail-Time#installation--import-via-npm): as [NPM Package](https://www.npmjs.com/package/mail-time)
+- [Meteor.js Installation](https://github.com/veliovgroup/Mail-Time#installation--import-via-atmosphere): as [Atmosphere package](https://atmospherejs.com/ostrio/mailer)
+- [Usage example](https://github.com/veliovgroup/Mail-Time#basic-usage)
+- [API](https://github.com/veliovgroup/Mail-Time#api)
+  - [*Constructor*](https://github.com/veliovgroup/Mail-Time#new-mailtimeopts-constructor)
+  - [`.send()`](https://github.com/veliovgroup/Mail-Time#sendmailopts--callback)
+  - [Default Template](https://github.com/veliovgroup/Mail-Time#static-mailtimetemplate)
+- [Custom Templates](https://github.com/veliovgroup/Mail-Time#template-example)
+- [~92% tests coverage](https://github.com/veliovgroup/Mail-Time#testing)
 
 ## Main features:
 
@@ -41,11 +45,13 @@ While *Client* is only put emails into the queue.
 - 🏢 Synchronize email queue across multiple servers;
 - 💪 Bulletproof design, built-in retries.
 
-## How does it work?:
+## How does it work?
+
+Redundant solution for email transmission.
 
 ### Single point of failure
 
-Issue - classic solution with the single point of failure:
+Issue - classic solution with a single point of failure:
 
 ```ascii
 |----------------|         |------|         |------------------|
@@ -93,11 +99,11 @@ Backup scheme with multiple SMTP providers
 
 ### Cluster issue
 
-Let's say you have an app which is growing fast. At some point, you've decided to create a "Cluster" of servers to balance the load and add durability layer.
+It is common to create a "Cluster" of servers to balance the load and add a durability layer for horizontal scaling of quickly growing applications.
 
-Also, your application has scheduled emails, for example, once a day with recent news. While you have had single server emails was sent by some daily interval. So, after you made a "Cluster" of servers - each server has its own timer and going to send a daily email to our user. In such case - users will receive 3 emails, sounds not okay.
+Most modern application has scheduled or recurring emails. For example, once a day — with recent news and updates. It won't be an issue with a single server setup — the server would send emails at a daily interval via timer or CRON. While in "Cluster" implementation — each server will attempt to send the same email. In such cases, users will receive multiple emails with the same content. We built MailTime to address this and other similar issues.
 
-Here is how we solve this issue:
+Here is how this issue is solved by using MailTime:
 
 ```ascii
 |===================THE=CLUSTER===================| |=QUEUE=| |===Mail=Time===|
@@ -117,17 +123,17 @@ Here is how we solve this issue:
 
 ## Features
 
-- Queue - Managed via MongoDB, and will survive server reboots and failures
+- Queue - Managed via MongoDB, will survive server reboots and failures
 - Support for multiple server setups - "Cluster", Phusion Passenger instances, Load Balanced solutions, etc.
-- Emails concatenation by addressee email - Reduce amount of sent email to single user with concatenation, and avoid mistakenly doubled emails
-- When concatenation is enabled - Same emails wouldn't be sent twice, if for any reason, due to bad logic or application failure emails is sent twice or more times - here is solution to solve this annoying behavior
-- Balancing for multiple nodemailer's transports, two modes - `backup` and `balancing`. Most useful feature - allows to reduce the cost of SMTP services and add durability. So, if any of used transports are failing to send an email it will switch to next one
+- Emails concatenation by addressee email - Reduce amount of sent emails to a single user with concatenation, and avoid mistakenly doubled emails
+- When concatenation is enabled - Same emails won't be sent twice, if for any reason, due to bad logic or application failure emails are sent twice or more times - this is solution to solve this annoying behavior
+- Balancing for multiple nodemailer's transports, two modes - `backup` and `balancing`. This is the most useful feature — allowing to reduce the cost of SMTP services and add extra layer of durability. If one transport failing to send an email `mail-time` will switch to the next one
 - Sending retries for network and other failures
-- Template support with Mustache-like placeholders
+- Templating support with [Mustache](https://mustache.github.io/)-like placeholders
 
 ## Installation
 
-If you're working on Server functionality - first you will need `nodemailer`, although this package is meant to be used with `nodemailer`, it's not added as the dependency, as it not needed by Client, and you're free to choose `nodemailer`'s version to fit your needs:
+To implement Server functionality — as a first step install `nodemailer`, although this package meant to be used with `nodemailer`, it's not added as the dependency, as `nodemailer` not needed by Client, and you're free to choose `nodemailer`'s version to fit your project needs:
 
 ```shell
 npm install --save nodemailer
@@ -151,14 +157,14 @@ Require package:
 const MailTime = require('mail-time');
 ```
 
-Create nodemailer's transports (see [nodemailer docs](https://github.com/nodemailer/nodemailer/tree/v2#setting-up)):
+Create nodemailer's transports (see [`nodemailer` docs](https://github.com/nodemailer/nodemailer/tree/v2#setting-up)):
 
 ```js
 const transports = [];
 const nodemailer = require('nodemailer');
 
 // Use DIRECT transport
-// To enable sending email from localhost
+// and enable sending email from localhost
 // install "nodemailer-direct-transport" NPM package:
 const directTransport = require('nodemailer-direct-transport');
 const directTransportOpts = {
@@ -204,8 +210,7 @@ transports.push(nodemailer.createTransport({
 }));
 ```
 
-Create `mail-time` *Server*, it is able to send and add emails to the queue.
-We will need connect to MongoDB first:
+As the next step initiate `mail-time` in the *Server* mode, it will be able to __send__ and __add__ emails to the queue. Connecting to a MongoDB before initiating `new MailTime` instance:
 
 ```js
 const MongoClient = require('mongodb').MongoClient;
@@ -226,7 +231,7 @@ MongoClient.connect(process.env.MONGO_URL, (error, client) => {
     from(transport) {
       // To pass spam-filters `from` field should be correctly set
       // for each transport, check `transport` object for more options
-      return '"Awesome App" <' + transport.options.from + '>';
+      return `"Awesome App" <${transport.options.from}>`;
     },
     concatEmails: true, // Concatenate emails to the same addressee
     concatDelimiter: '<h1>{{{subject}}}</h1>', // Start each concatenated email with it's own subject
@@ -235,7 +240,7 @@ MongoClient.connect(process.env.MONGO_URL, (error, client) => {
 });
 ```
 
-Create the *Client* to add emails to queue from other application units, like UI unit:
+Only __one__ `MailTime` *Server* instance required to send email. In the other parts of an app (like UI units or in sub-apps) use `mail-time` in the *Client* mode to __add__ emails to queue:
 
 ```js
 const MongoClient = require('mongodb').MongoClient;
@@ -254,44 +259,114 @@ MongoClient.connect(process.env.MONGO_URL, (error, client) => {
 });
 ```
 
-Send email:
+Send email example:
+
+```js
+mailQueue.sendMail({
+  to: 'user@gmail.com',
+  subject: 'You\'ve got an email!',
+  text: 'Plain text message',
+  html: '<h1>HTML</h1><p>Styled message</p>'
+});
+```
+
+### Two `MailTime` instances usage example
+
+Create two `MailTime` instances with different settings.
 
 ```js
+// USE FOR NON-URGENT EMAILS WHICH IS OKAY TO CONCATENATE
+const mailQueue = new MailTime({
+  db: db,
+  interval: 35,
+  strategy: 'backup',
+  failsToNext: 1,
+  concatEmails: true,
+  concatThrottling: 16,
+  zombieTime: 120000
+});
+
+// USE FOR TRANSACTIONAL EMAILS AND ALERTS
+const mailInstantQueue = new MailTime({
+  db: db,
+  prefix: 'instant',
+  interval: 2,
+  strategy: 'backup',
+  failsToNext: 1,
+  concatEmails: false,
+  zombieTime: 20000
+});
+
 mailQueue.sendMail({
   to: 'user@gmail.com',
   subject: 'You\'ve got an email!',
   text: 'Plain text message',
   html: '<h1>HTML</h1><p>Styled message</p>'
 });
+
+mailInstantQueue.sendMail({
+  to: 'user@gmail.com',
+  subject: 'Sign in request',
+  text: 'Your OTP login code: xxxx:',
+  html: '<h1>Code:</h1><code>XXXX</code>'
+});
+```
+
+### Passing variables to the template
+
+All options passed to the `.sendMail()` method is available inside `text`, `html`, and global templates
+
+```js
+const templates = {
+  global: '<html xmlns="http://www.w3.org/1999/xhtml"><head><title>{{subject}}</title></head><body>{{html}}<footer>Message sent to @{{username}} user ({{to}})</footer></body></html>',
+  signInCode: {
+    text: 'Hello @{{username}}! Here\'s your login code: {{code}}'
+    html: `<h1>Sign-in request</h1><p>Hello @{{username}}! Copy your login code below <pre><code>{{code}}</code></pre>`
+  }
+}
+
+const mailQueue = new MailTime({
+  db: db,
+  template: templates.global
+});
+
+mailQueue.sendMail({
+  to: 'user@gmail.com',
+  subject: 'Sign-in request',
+  username: 'johndoe',
+  code: 'XXXXX-YY'
+  text: templates.signInCode.text,
+  html: templates.signInCode.html
+});
 ```
 
 ## Meteor.js usage:
 
-### Meteor.js Installation:
+Mail-Time package can be installed and used within [Meteor.js](https://docs.meteor.com/) via [NPM](https://www.npmjs.com/package/mail-time) or [Atmosphere](https://atmospherejs.com/ostrio/mailer)
 
-#### Installation & Import (*via NPM*):
+### Installation & Import (*via NPM*):
 
-Install NPM *MailTime* package:
+Install [NPM `mail-time` package](https://www.npmjs.com/package/mail-time):
 
 ```shell
 meteor npm install --save mail-time
 ```
 
-ES6 Import:
+Meteor.js: ES6 Import NPM package:
 
 ```js
 import MailTime from 'mail-time';
 ```
 
-#### Installation & Import (*via Atmosphere*):
+### Installation & Import (*via Atmosphere*):
 
-Install Atmosphere *ostrio:mailer* package:
+Install [Atmosphere `ostrio:mailer` package](https://atmospherejs.com/ostrio/mailer):
 
 ```shell
 meteor add ostrio:mailer
 ```
 
-ES6 Import:
+Meteor.js: ES6 Import atmosphere package:
 
 ```js
 import MailTime from 'meteor/ostrio:mailer';
@@ -299,6 +374,8 @@ import MailTime from 'meteor/ostrio:mailer';
 
 ### Usage:
 
+`mail-time` package usage examples in Meteor.js
+
 ```js
 import { MongoInternals } from 'meteor/mongo';
 
@@ -338,6 +415,8 @@ const mailQueue = new MailTime({
 
 ## API
 
+All available constructor options and `.sendMail()` method API overview
+
 ### `new MailTime(opts)` constructor
 
 - `opts` {*Object*} - Configuration object
@@ -350,14 +429,15 @@ const mailQueue = new MailTime({
 - `opts.prefix` {*String*} - [Optional] Use unique prefixes to create multiple `MailTime` instances on same MongoDB
 - `opts.maxTries` {*Number*} - [Optional] How many times resend failed emails, default - `60`
 - `opts.interval` {*Number*} - [Optional] Interval in *seconds* between send re-tries, default - `60`
-- `opts.zombieTime` {*Number*} - [Optional] Time in *milliseconds*, after this period - pending email will be interpreted as "*zombie*". This parameter allows to rescue pending email from "*zombie* mode" in case when: server was rebooted, exception during runtime was thrown, or caused by bad logic, default - `32786`. This option is used by package itself and passed directly to [`JoSk` package](https://github.com/VeliovGroup/josk#api)
+- `opts.zombieTime` {*Number*} - [Optional] Time in *milliseconds*, after this period - pending email will be interpreted as "*zombie*". This parameter allows to rescue pending email from "*zombie* mode" in case when: server was rebooted, exception during runtime was thrown, or caused by bad logic, default - `32786`. This option is used by package itself and passed directly to [`JoSk` package](https://github.com/veliovgroup/josk#api)
+- `opts.keepHistory` {*Boolean*} - [Optional] By default sent emails not stored in the database. Set `{ keepHistory: true }` to keep queue task as it is in the database, default - `false`
 - `opts.concatEmails` {*Boolean*} - [Optional] Concatenate email by `to` field, default - `false`
 - `opts.concatSubject` {*String*} - [Optional] Email subject used in concatenated email, default - `Multiple notifications`
 - `opts.concatDelimiter` {*String*} - [Optional] HTML or plain string delimiter used between concatenated email, default - `<hr>`
 - `opts.concatThrottling` {*Number*} - [Optional] Time in *seconds* while emails are waiting to be concatenated, default - `60`
 - `opts.revolvingInterval` {*Number*} - [Optional] Interval in *milliseconds* in between queue checks, default - `256`. Recommended value — between `opts.minRevolvingDelay` and `opts.maxRevolvingDelay`
-- `opts.minRevolvingDelay` {*Number*} - [Optional] Minimum revolving delay — the minimum delay between tasks executions in *milliseconds*, default - `64`. This option is passed directly to [`JoSk` package](https://github.com/VeliovGroup/josk#api)
-- `opts.maxRevolvingDelay` {*Number*} - [Optional] Maximum revolving delay — the maximum delay between tasks executions in *milliseconds*, default - `256`. This option is passed directly to [`JoSk` package](https://github.com/VeliovGroup/josk#api)
+- `opts.minRevolvingDelay` {*Number*} - [Optional] Minimum revolving delay — the minimum delay between tasks executions in *milliseconds*, default - `64`. This option is passed directly to [`JoSk` package](https://github.com/veliovgroup/josk#api)
+- `opts.maxRevolvingDelay` {*Number*} - [Optional] Maximum revolving delay — the maximum delay between tasks executions in *milliseconds*, default - `256`. This option is passed directly to [`JoSk` package](https://github.com/veliovgroup/josk#api)
 - `opts.template` {*String*} - [Optional] Mustache-like template, default - `{{{html}}}`, all options passed to `sendMail` is available in Template, like `to`, `subject`, `text`, `html` or any other custom option. Use `{{opt}}` for string placeholders and `{{{opt}}}` for html placeholders
 
 ### `sendMail(opts [, callback])`
@@ -372,7 +452,7 @@ const mailQueue = new MailTime({
 
 ### `static MailTime.Template`
 
-Simple and bulletproof HTML template, see its [source](https://github.com/VeliovGroup/Mail-Time/blob/master/template.html). Usage:
+Simple and bulletproof HTML template, see [its source](https://github.com/veliovgroup/Mail-Time/blob/master/template.html). Usage example:
 
 ```js
 const MailTime  = require('mail-time');
@@ -393,6 +473,8 @@ mailQueue.sendMail({
 
 ### Template Example
 
+Pass custom template via `template` property to `.sendMail()` method
+
 ```js
 mailQueue.sendMail({
   to: 'user@gmail.com',
@@ -440,5 +522,10 @@ DEBUG="true" EMAIL_DOMAIN="example.com" MONGO_URL="mongodb://127.0.0.1:27017/met
 
 ## Support this project:
 
-- [Become a patron](https://www.patreon.com/bePatron?u=20396046) — support my open source contributions with monthly donation
+- Star on [GitHub](https://github.com/veliovgroup/mail-time)
+- Star on [NPM](https://www.npmjs.com/package/mail-time)
+- Star on [Atmosphere](https://atmospherejs.com/ostrio/mailer)
+- [Sponsor maintainer via GitHub](https://github.com/sponsors/dr-dimitru) — support open source with one-time contribution or on a regular basis
+- [Sponsor veliovgroup via GitHub](https://github.com/sponsors/veliovgroup) — support company behind this package
+- [Support via PayPal](https://paypal.me/veliovgroup) — support our open source contributions
 - Use [ostr.io](https://ostr.io) — [Monitoring](https://snmp-monitoring.com), [Analytics](https://ostr.io/info/web-analytics), [WebSec](https://domain-protection.info), [Web-CRON](https://web-cron.info) and [Pre-rendering](https://prerendering.com) for a website

package/index.js

@@ -1,5 +1,5 @@
-const JoSk   = require('josk');
-const NoOp   = () =>  {};
+const JoSk = require('josk');
+const noop = () =>  {};
 const merge  = require('deepmerge');
 const _debug = (isDebug, ...args) => {
   if (isDebug) {
@@ -17,12 +17,6 @@ const mongoErrorHandler = (error) => {
   }
 };
 
-const defaultWriteConcern = {
-  w: 1,
-  j: true,
-  wtimeout: 10240
-};
-
 let equals;
 equals = (a, b) => {
   let i;
@@ -116,6 +110,7 @@ module.exports = class MailTime {
     this.interval   = ((opts.interval && !isNaN(opts.interval)) ? parseInt(opts.interval) : 60) * 1000;
     this.template   = (typeof opts.template === 'string') ? opts.template : '{{{html}}}';
     this.zombieTime = opts.zombieTime || 32786;
+    this.keepHistory = opts.keepHistory || false;
 
     this.revolvingInterval = opts.revolvingInterval || 1536;
     this.minRevolvingDelay = opts.minRevolvingDelay || 512;
@@ -147,9 +142,9 @@ module.exports = class MailTime {
       return false;
     })();
 
-    this.concatEmails     = (opts.concatEmails !== true) ? false : true;
-    this.concatSubject    = (opts.concatSubject && typeof opts.concatSubject === 'string') ? opts.concatSubject : 'Multiple notifications';
-    this.concatDelimiter  = (opts.concatDelimiter && typeof opts.concatDelimiter === 'string') ? opts.concatDelimiter : '<hr>';
+    this.concatEmails = (opts.concatEmails !== true) ? false : true;
+    this.concatSubject = (opts.concatSubject && typeof opts.concatSubject === 'string') ? opts.concatSubject : 'Multiple notifications';
+    this.concatDelimiter = (opts.concatDelimiter && typeof opts.concatDelimiter === 'string') ? opts.concatDelimiter : '<hr>';
     this.concatThrottling = ((opts.concatThrottling && !isNaN(opts.concatThrottling)) ? parseInt(opts.concatThrottling) : 60) * 1000;
 
     if (this.concatThrottling < 2048) {
@@ -168,7 +163,7 @@ module.exports = class MailTime {
     }
 
     this.collection = opts.db.collection('__mailTimeQueue__' + this.prefix);
-    this.collection.createIndex({ to: 1, isSent: 1 }, (indexError) => {
+    this.collection.createIndex({ to: 1, isSent: 1, sendAt: 1 }, (indexError) => {
       if (indexError) {
         _logError('[createIndex]', indexError);
       }
@@ -197,7 +192,7 @@ module.exports = class MailTime {
     // mailOptions.Other nodeMailer `sendMail` options...
 
     if (this.type === 'server') {
-      this.scheduler = new JoSk({
+      const scheduler = new JoSk({
         db: opts.db,
         debug: this.debug,
         prefix: `mailTimeQueue${this.prefix}`,
@@ -207,7 +202,7 @@ module.exports = class MailTime {
         maxRevolvingDelay: this.maxRevolvingDelay
       });
 
-      this.scheduler.setInterval(this.___send.bind(this), this.revolvingInterval, `mailTimeQueue${this.prefix}`);
+      scheduler.setInterval(this.___send.bind(this), this.revolvingInterval, `mailTimeQueue${this.prefix}`);
     }
   }
 
@@ -277,32 +272,21 @@ module.exports = class MailTime {
     return _mailOpts;
   }
 
-  /*
-   @memberOf MailTime
-   @name ___send
-   @param ready {Function} - See JoSk NPM package
-   @returns {void}
+  /**
+   * @memberOf MailTime
+   * @name ___send
+   * @param ready {Function} - See JoSk NPM package
+   * @returns {void}
    */
   ___send(ready) {
-    let finished = 0;
     const cursor = this.collection.find({
-      $or: [{
-        isSent: false,
-        sendAt: {
-          $lte: new Date()
-        },
-        tries: {
-          $lt: this.maxTries
-        }
-      }, {
-        isSent: true,
-        sendAt: {
-          $lt: new Date(Date.now() - (this.zombieTime * 2))
-        },
-        tries: {
-          $lt: this.maxTries
-        }
-      }]
+      isSent: false,
+      sendAt: {
+        $lte: new Date()
+      },
+      tries: {
+        $lt: this.maxTries
+      }
     }, {
       projection: {
         _id: 1,
@@ -314,116 +298,96 @@ module.exports = class MailTime {
       }
     });
 
-    cursor.count((countError, count) => {
-      if (countError) {
-        ready();
-        _logError('[___send] [count] [countError]', countError);
-        return;
-      }
-
-      if (count) {
-        cursor.forEach((task) => {
-          this.collection.updateOne({
-            _id: task._id
-          }, {
-            $set: {
-              isSent: true,
-              sendAt: new Date(Date.now() + (this.zombieTime * 2))
-            },
-            $inc: {
-              tries: 1
-            }
-          }, defaultWriteConcern, (updateError) => {
-            if (count === ++finished) {
-              ready();
+    cursor.forEach((task) => {
+      this.collection.updateOne({
+        _id: task._id
+      }, {
+        $set: {
+          isSent: true
+        },
+        $inc: {
+          tries: 1
+        }
+      }, (updateError) => {
+        if (updateError) {
+          this.___handleError(task, updateError, {});
+        } else {
+          let transport;
+          let transportIndex;
+          if (this.strategy === 'balancer') {
+            this.transport = this.transport + 1;
+            if (this.transport >= this.transports.length) {
+              this.transport = 0;
             }
+            transportIndex = this.transport;
+            transport = this.transports[this.transport];
+          } else {
+            transportIndex = task.transport;
+            transport = this.transports[task.transport];
+          }
 
-            if (updateError) {
-              this.___handleError(task, updateError, {});
-            } else {
-              let transport;
-              let transportIndex;
-              if (this.strategy === 'balancer') {
-                this.transport = this.transport + 1;
-                if (this.transport >= this.transports.length) {
-                  this.transport = 0;
-                }
-                transportIndex = this.transport;
-                transport = this.transports[this.transport];
-              } else {
-                transportIndex = task.transport;
-                transport = this.transports[task.transport];
+          try {
+            const _mailOpts = this.___compileMailOpts(transport, task);
+
+            _debug(this.debug, '[sendMail] [sending] To:', _mailOpts.to);
+            transport.sendMail(_mailOpts, (error, info) => {
+              if (error) {
+                this.___handleError(task, error, info);
+                return;
+              }
+
+              if (info.accepted && !info.accepted.length) {
+                this.___handleError(task, 'Message not accepted or Greeting never received', info);
+                return;
               }
 
-              try {
-                const _mailOpts = this.___compileMailOpts(transport, task);
-
-                _debug(this.debug, '[sendMail] [sending] To:', _mailOpts.to);
-                transport.sendMail(_mailOpts, (error, info) => {
-                  if (error) {
-                    this.___handleError(task, error, info);
-                    return;
-                  }
-
-                  if (info.accepted && !info.accepted.length) {
-                    this.___handleError(task, 'Message not accepted or Greeting never received', info);
-                    return;
-                  }
-
-                  this.collection.deleteOne({
-                    _id: task._id
-                  }, defaultWriteConcern, () => {
-                    _debug(this.debug, `email successfully sent, attempts: #${task.tries}, transport #${transportIndex} to: `, _mailOpts.to);
-
-                    const _id = task._id.toHexString();
-                    if (this.callbacks[_id] && this.callbacks[_id].length) {
-                      this.callbacks[_id].forEach((cb, i) => {
-                        cb(void 0, info, task.mailOptions[i]);
-                      });
-                    }
-                    delete this.callbacks[_id];
-                  });
-
-                  return;
+              _debug(this.debug, `email successfully sent, attempts: #${task.tries}, transport #${transportIndex} to: `, _mailOpts.to);
+              if (this.keepHistory) {
+                this.___triggerCallbacks(void 0, task, info);
+              } else {
+                this.collection.deleteOne({ _id: task._id }, () => {
+                  this.___triggerCallbacks(void 0, task, info);
                 });
-              } catch (e) {
-                _logError('Exception during runtime:', e);
-                this.___handleError(task, e, {});
               }
-            }
-          });
-        }, (forEachError) => {
-          if (forEachError) {
-            _logError('[___send] [forEach] [forEachError]', forEachError);
+
+              return;
+            });
+          } catch (e) {
+            _logError('Exception during runtime:', e);
+            this.___handleError(task, e, {});
           }
-        });
-      } else {
-        ready();
+        }
+      });
+    }, (forEachError) => {
+      ready();
+      cursor.close();
+      if (forEachError) {
+        _logError('[___send] [forEach] [forEachError]', forEachError);
       }
     });
   }
 
-  /*
-   @memberOf MailTime
-   @name send
-   @description alias of `sendMail`
-   @returns {void}
+  /**
+   * @memberOf MailTime
+   * @name send
+   * @description alias of `sendMail`
+   * @returns {void}
    */
   send(opts, callback) {
     this.sendMail(opts, callback);
   }
 
-  /*
-   @memberOf MailTime
-   @name sendMail
-   @param opts          {Object}   - Letter options with next properties:
-   @param opts.sendAt   {Date}     - When email should be sent
-   @param opts.template {String}   - Template string
-   @param opts[key]     {mix}      - Other MailOptions according to NodeMailer lib documentation
-   @param callback      {Function} - [OPTIONAL] Callback function
-   @returns {void}
+  /**
+   * @memberOf MailTime
+   * @name sendMail
+   * @param opts          {Object}   - Letter options with next properties:
+   * @param opts.sendAt   {Date}     - When email should be sent
+   * @param opts.template {String}   - Template string
+   * @param opts[key]     {mix}      - Other MailOptions according to NodeMailer lib documentation
+   * @param callback      {Function} - [OPTIONAL] Callback function
+   * @returns {void}
    */
-  sendMail(opts = {}, callback = NoOp) {
+  sendMail(opts = {}, callback = noop) {
     _debug(this.debug, '[sendMail] [attempt] To:', opts.to);
     if (!opts.html && !opts.text) {
       throw new Error('`html` nor `text` field is presented, at least one of those fields is required');
@@ -441,8 +405,8 @@ module.exports = class MailTime {
       opts.concatSubject = false;
     }
 
-    let _sendAt          = opts.sendAt;
-    const _template      = opts.template;
+    let _sendAt = opts.sendAt;
+    const _template = opts.template;
     const _concatSubject = opts.concatSubject;
     delete opts.sendAt;
     delete opts.template;
@@ -455,7 +419,10 @@ module.exports = class MailTime {
     if (this.concatEmails) {
       this.collection.findOne({
         to: opts.to,
-        isSent: false
+        isSent: false,
+        sendAt: {
+          $lte: new Date(+_sendAt + this.concatThrottling)
+        }
       }, {
         projection: {
           _id: 1,
@@ -518,13 +485,13 @@ module.exports = class MailTime {
     return;
   }
 
-  /*
-   @memberOf MailTime
-   @name ___handleError
-   @param task  {Object} - Email task record form Mongo
-   @param error {mix}    - Error String/Object/Error
-   @param info  {Object} - Info object returned from nodemailer
-   @returns {void}
+  /**
+   * @memberOf MailTime
+   * @name ___handleError
+   * @param task  {Object} - Email task record form Mongo
+   * @param error {mix}    - Error String/Object/Error
+   * @param info  {Object} - Info object returned from nodemailer
+   * @returns {void}
    */
   ___handleError(task, error, info) {
     if (!task) {
@@ -534,16 +501,9 @@ module.exports = class MailTime {
     if (task.tries >= this.maxTries) {
       this.collection.deleteOne({
         _id: task._id
-      }, () => {
-        _debug(this.debug, `Giving up trying send email after ${task.tries} attempts to: `, task.mailOptions[0].to, error);
-
-        const _id = task._id.toHexString();
-        if (this.callbacks[_id] && this.callbacks[_id].length) {
-          this.callbacks[_id].forEach((cb, i) => {
-            cb(error, info, task.mailOptions[i]);
-          });
-        }
-        delete this.callbacks[_id];
+      }, (deleteError) => {
+        _debug(this.debug, `Giving up trying send email after ${task.tries} attempts to: `, task.mailOptions[0].to, error, deleteError);
+        this.___triggerCallbacks(error, task, info);
       });
     } else {
       let transportIndex = task.transport;
@@ -569,16 +529,16 @@ module.exports = class MailTime {
     }
   }
 
-  /*
-   @memberOf MailTime
-   @name ___addToQueue
-   @param opts               {Object}   - Letter options with next properties:
-   @param opts.sendAt        {Date}     - When email should be sent
-   @param opts.template      {String}   - Email template
-   @param opts.mailOptions   {Object}   - MailOptions according to NodeMailer lib
-   @param opts.concatSubject {String}   - Email subject used when sending multiple concatenated emails
-   @param callback           {Function} - [OPTIONAL] Callback function
-   @returns {void}
+  /**
+   * @memberOf MailTime
+   * @name ___addToQueue
+   * @param opts               {Object}   - Letter options with next properties:
+   * @param opts.sendAt        {Date}     - When email should be sent
+   * @param opts.template      {String}   - Email template
+   * @param opts.mailOptions   {Object}   - MailOptions according to NodeMailer lib
+   * @param opts.concatSubject {String}   - Email subject used when sending multiple concatenated emails
+   * @param callback           {Function} - [OPTIONAL] Callback function
+   * @returns {void}
    */
   ___addToQueue(opts, callback) {
     _debug(this.debug, '[sendMail] [adding to queue] To:', opts.mailOptions.to);
@@ -612,16 +572,16 @@ module.exports = class MailTime {
     });
   }
 
-  /*
-   @memberOf MailTime
-   @name ___render
-   @param string       {String} - Template with Spacebars/Blaze/Mustache-like placeholders
-   @param replacements {Object} - Blaze/Mustache-like helpers Object
-   @returns {String}
+  /**
+   * @memberOf MailTime
+   * @name ___render
+   * @param string       {String} - Template with Spacebars/Blaze/Mustache-like placeholders
+   * @param replacements {Object} - Blaze/Mustache-like helpers Object
+   * @returns {String}
    */
   ___render(_string, replacements) {
     let i;
-    let string      = _string;
+    let string = _string;
     const matchHTML = string.match(/\{{3}\s?([a-zA-Z0-9\-\_]+)\s?\}{3}/g);
     if (matchHTML) {
       for (i = 0; i < matchHTML.length; i++) {
@@ -641,4 +601,22 @@ module.exports = class MailTime {
     }
     return string;
   }
+
+  /**
+   * @memberOf MailTime
+   * @name ___triggerCallbacks
+   * @param error  {mix}    - Error thrown during sending email
+   * @param task   {Object} - Task record from mongodb
+   * @param info   {Object} - Info object returned from NodeMailer's `sendMail` method
+   * @returns {void 0}
+   */
+  ___triggerCallbacks(error, task, info) {
+    const _id = task._id.toHexString();
+    if (this.callbacks[_id] && this.callbacks[_id].length) {
+      this.callbacks[_id].forEach((cb, i) => {
+        cb(error, info, task.mailOptions[i]);
+      });
+    }
+    delete this.callbacks[_id];
+  }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mail-time",
-  "version": "1.2.4",
-  "description": "Bulletproof email queue on top of NodeMailer with support of multiple clusters and servers setup",
+  "version": "1.3.0",
+  "description": "Bulletproof email queue on top of NodeMailer for a single and multi-server setups",
   "main": "index.js",
   "scripts": {
     "test": "mocha ./test/npm.js"
@@ -36,12 +36,12 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/VeliovGroup/Mail-Time.git"
+    "url": "git://github.com/veliovgroup/Mail-Time.git"
   },
   "bugs": {
-    "url": "https://github.com/VeliovGroup/Mail-Time/issues"
+    "url": "https://github.com/veliovgroup/Mail-Time/issues"
   },
-  "homepage": "https://github.com/VeliovGroup/Mail-Time",
+  "homepage": "https://github.com/veliovgroup/Mail-Time",
   "author": "dr.dimitru (https://veliovgroup.com)",
   "license": "BSD-3-Clause",
   "engines": {
@@ -49,15 +49,15 @@
   },
   "dependencies": {
     "deepmerge": "^4.2.2",
-    "josk": "^2.2.5"
+    "josk": "^3.0.0"
   },
   "devDependencies": {
-    "bson": "^4.0.4",
-    "bson-ext": "^2.0.3",
-    "chai": "^4.2.0",
-    "mocha": "^7.1.2",
-    "mongodb": "^3.5.7",
-    "nodemailer": "^6.4.6",
-    "nodemailer-direct-transport": "^3.3.2"
+    "bson": "^4.6.4",
+    "bson-ext": "^4.0.2",
+    "chai": "^4.3.6",
+    "mocha": "^10.0.0",
+    "mongodb": "^4.6.0",
+    "nodemailer": "^6.7.5",
+    "nodemailer-direct-transport": "^3.0.7"
   }
 }

package/CHANGELOG.md

@@ -1 +0,0 @@
-For full changelog see [releases](https://github.com/VeliovGroup/Mail-Time/releases) in GitHub

package/HISTORY.md

@@ -1 +0,0 @@
-For full history see [releases](https://github.com/VeliovGroup/Mail-Time/releases) in GitHub