emailengine-app 1.14.3 → 1.14.7

package/README.md

@@ -35,6 +35,14 @@ Later, when you want to upgrade, just run the installation command from step 2.
 
 > **Tip** For human readable logs you can use _pino-pretty_ (`npm install -g pino-pretty`) by piping EmailEngine output to it: `emailengine | pino-pretty`
 
+## Version and license
+
+Run the following command to see the version and license information both for EmailEngine and for the included modules.
+
+```
+$ emailengine license
+```
+
 ## Demo
 
 [![Using EmailEngine](https://img.youtube.com/vi/shHZHowVnYw/0.jpg)](https://www.youtube.com/watch?v=shHZHowVnYw)
@@ -73,77 +81,9 @@ There is no official [Redis](https://redis.io/) release for Windows but you can
 -   [Blog posts](https://docs.emailengine.app/tag/email-engine/)
 -   For Postman you can import OpenAPI specification [here](https://api.emailengine.app/swagger.json).
 
-## Config mapping
-
-#### General settings
-
-| Configuration option | CLI argument                         | ENV value                     | Default                      |
-| -------------------- | ------------------------------------ | ----------------------------- | ---------------------------- |
-| IMAP Worker count    | `--workers.imap=4`                   | `EENGINE_WORKERS=4`           | `4`                          |
-| Redis connection URL | `--dbs.redis="url"`                  | `EENGINE_REDIS="url"`         | `"redis://127.0.0.1:6379/8"` |
-| Prepared settings    | `--settings='{"JSON"}'`              | `EENGINE_SETTINGS='{"JSON"}'` | not set                      |
-| Encryption secret    | `--service.secret="****"`            | `EENGINE_SECRET="****"`       | not set                      |
-| Local addresses      | `--service.localAddresses="ip1,ip2"` | `EENGINE_ADDRESSES="ip1,ip2"` | default interface            |
-| Max command duration | `--service.commandTimeout=10s`       | `EENGINE_TIMEOUT=10s`         | `10s`                        |
-| Log level            | `--log.level="level"`                | `EENGINE_LOG_LEVEL=level`     | `"trace"`                    |
-| Log raw data         | `--log.raw=false`                    | `EENGINE_LOG_RAW=false`       | `false`                      |
-| Webhook Worker count | `--workers.webhooks=1`               | `EENGINE_WORKERS_WEBHOOKS=1`  | `1`                          |
-
-#### API server settings
-
-| Configuration option | CLI argument             | ENV value                  | Default       |
-| -------------------- | ------------------------ | -------------------------- | ------------- |
-| Host to bind to      | `--api.host="1.2.3.4"`   | `EENGINE_HOST="1.2.3.4"`   | `"127.0.0.1"` |
-| Port to bind to      | `--api.port=port`        | `EENGINE_PORT=port`        | `3000`        |
-| Max attachment size  | `--api.maxSize=5M`       | `EENGINE_MAX_SIZE=5M`      | `5M`          |
-| API Basic Auth       | `--api.auth="user:pass"` | `EENGINE_AUTH="user:pass"` | not set       |
-
-#### SMTP server settings
-
-> SMTP server is disabled by default
-
-When authenticating via SMTP use the account Id as the username and SMTP password as the password to send emails using the selected account.
-
-| Configuration option | CLI argument            | ENV value                     | Default       |
-| -------------------- | ----------------------- | ----------------------------- | ------------- |
-| SMTP enabled         | `--smtp.enabled=true`   | `EENGINE_SMTP_ENABLED=true`   | `false`       |
-| SMTP password        | `--smtp.secret=pass`    | `EENGINE_SMTP_SECRET=pass`    | `""`          |
-| Host to bind to      | `--smtp.host="1.2.3.4"` | `EENGINE_SMTP_HOST="1.2.3.4"` | `"127.0.0.1"` |
-| Port to bind to      | `--smtp.port=port`      | `EENGINE_SMTP_PORT=port`      | `2525`        |
-| Behind HAProxy       | `--smtp.proxy=true`     | `EENGINE_SMTP_PROXY=true`     | `false`       |
-
-When sending emails via SMTP you can use the following headers
-
--   **X-EE-Send-At: timestamp** to schedule sending to a future time. This matches `sendAt` property of the [POST /submit](https://api.emailengine.app/#operation/postV1AccountAccountSubmit) API endpoint.
-
-#### Bull Arena settings
-
-[Arena](https://github.com/bee-queue/arena) is a web based UI for Bull.js (the queue system EmailEngine internally uses)
-
-> Arena server is disabled by default
-
-| Configuration option | CLI argument             | ENV value                      | Default       |
-| -------------------- | ------------------------ | ------------------------------ | ------------- |
-| Arena enabled        | `--arena.enabled=true`   | `EENGINE_ARENA_ENABLED=true`   | `false`       |
-| Host to bind to      | `--arena.host="1.2.3.4"` | `EENGINE_ARENA_HOST="1.2.3.4"` | `"127.0.0.1"` |
-| Port to bind to      | `--arena.port=port`      | `EENGINE_ARENA_PORT=port`      | `3001`        |
-
-#### Queue settings
-
-By default a queue worker process processes a single job at a time. If your queues are processed too slowly you can increase the concurrency counters. Downside is that events aren't processed in correct order anymore, so increase these values only when you do not care about ordering too much.
+## Configuring EmailEngine
 
-If you also increase worker count value then job processors count equals worker count \* concurrency count.
-
-| Configuration option       | CLI argument        | ENV value             | Default |
-| -------------------------- | ------------------- | --------------------- | ------- |
-| Webhooks concurrency count | `--queues.notify=1` | `EENGINE_NOTIFY_QC=1` | `1`     |
-| Submit concurrency count   | `--queues.submit=1` | `EENGINE_SUBMIT_QC=1` | `1`     |
-
----
-
-> **NB!** environment variables override CLI arguments. CLI arguments override configuration file values.
-
-If available then EmailEngine uses dotenv file from current working directory to populate environment variables.
+See the documentation for configuring EmailEngine [here](https://emailengine.app/configuration).
 
 #### Redis connection
 
@@ -153,63 +93,15 @@ $ emailengine --dbs.redis="redis://127.0.0.1:6379/8"
 
 #### Prepared settings
 
-If you do not want to update application settings via API calls then you can provide the initial settings via a command line option (`--settings`) or environment variable (`EENGINE_SETTINGS`). The value must be a valid JSON string that could be used against the `/settings` API endpoint. The behavior is identical to calling the same thing via API, so whatever settings are given are stored in the DB.
-
-```
-$ emailengine --settings='{"webhooks": "https://webhook.site/14e88aea-3391-48b2-a4e6-7b617280155d","webhookEvents":["messageNew"]}'
-```
-
-When using Docker Compose where environment variables are defined in YAML format, you can use the following environment variable for prepared settings:
-
-```yaml
-EENGINE_SETTINGS: >
-    {
-        "webhooks": "https://webhook.site/f6a00604-7407-4f40-9a8e-ab68a31a3503",
-        "webhookEvents": [
-            "messageNew", "messageDeleted"
-        ]
-    }
-```
-
-If settings object fails validation then the application does not start.
+Read [here](https://emailengine.app/prepared-settings)
 
 #### Encryption secret
 
-By default account passwords are stored as cleartext in Redis. You can set an encryption secret that will be used to encrypt these passwords.
-
-See the documentation for encryption [here](https://docs.emailengine.app/enabling-secret-encryption/).
-
-> EmailEngine is also able to use [Vault](https://www.vaultproject.io/) to store the encryption secret. See Vault usage docs [here](https://docs.emailengine.app/enabling-secret-encryption/#using-vault)
+Read [here](https://docs.emailengine.app/enabling-secret-encryption/)
 
 #### Local addresses
 
-If your server has multiple IP addresses/interfaces available then you can provide a comma separated list of these IP addresses for EmailEngine to bound to when making outbound connections.
-
-This is mostly useful if you are making a large amount of connections and might get rate limited by destination server based on your IP address. Using multiple local addresses allows to distribute separate connections between separate IP addresses. An address is selected randomly from the list whenever making a new IMAP connection.
-
-```
-$ emailengine --service.localAddresses="192.168.1.176,192.168.1.177,192.168.1.178"
-```
-
-If those interfaces aren't actually available then TCP connections will fail, so check the logs.
-
-**Local addresses and SMTP**
-
-By default when EmailEngine is sending an email to SMTP it uses local hostname in the SMTP greeting. This hostname is resolved by `os.hostname()`. Sometimes hostname is using invalid format (eg. `Servername_local` as undersore is not actually allowed) and depending on the SMTP MSA server it might reject such connection.
-
-To overcome you can set the local hostname to use by appending the hostname to the IP address, separated by pipe symbol
-
-```
-$ emailengine --service.localAddresses="ip1|hostname1,ip2|hostname2,ip3|hostname3"
-```
-
-For example when using AWS you can use the private interface IP but set a public hostname.
-
-```
-$ emailengine --service.localAddresses="172.31.1.2|ec2-18-194-1-2.eu-central-1.compute.amazonaws.com"
-```
-
-So in general the hostname shoud be whatever the public interface IP (this is what the SMTP MSA server sees) resolves to.
+Read [here](https://emailengine.app/local-addresses)
 
 #### Authentication
 
@@ -470,35 +362,11 @@ By default EmailEngine allows connections only from localhost. To change this ei
 
 ### SystemD
 
-See example [systemd unit file](systemd/emailengine.service) ro run EmailEngine as a service and example [Nginx config file](systemd/nginx-proxy.conf) to serve EmailEngine requests behind Nginx reverse proxy.
+Read about running EmailEngine as a SystemD service [here](https://emailengine.app/system-d-service)
 
 ### Docker
 
-#### Docker Hub
-
-Pull EmailEngine from Docker Hub
-
-```
-$ docker pull andris9/emailengine
-```
-
-Run the app and provide connection URL to Redis (this example assumes that Redis is running in host machine):
-
-```
-$ docker run -p 3000:3000 --env EENGINE_REDIS="redis://host.docker.internal:6379/7" andris9/emailengine
-```
-
-Next open http://127.0.0.1:3000 in your browser.
-
-#### Docker compose
-
-Clone this repo and in the root folder run the following to start both EmailEngine and Redis containers.
-
-```
-$ docker-compose up
-```
-
-Next open http://127.0.0.1:3000 in your browser.
+See the documentation for using EmailEngine with Docker [here](https://emailengine.app/docker).
 
 ## Resolving issues with Redis
 
@@ -519,38 +387,7 @@ There is a Prometheus output available at `/metrics` URL path of the app.
 
 ## Log analysis
 
-EmailEngine logs all it's output to stdin in [Pino](https://github.com/pinojs/pino) format. Pino in general is meant to be machine readable so for humans it seems quite messy to understand what is actually going on. Luckily there are multiple tools to make it more easily processable.
-
-### pino-pretty
-
-As the name says [pino-pretty](https://github.com/pinojs/pino-pretty) makes the logs prettier and thus easier to read.
-
-```
-$ npm install -g pino-pretty
-$ emailengine | pino-pretty
-```
-
-### pino-gelf
-
-It is possible to stream all logs directly to Graylog using [pino-gelf](https://github.com/pinojs/pino-gelf).
-
-```
-$ npm install -g pino-pretty
-$ emailengine | pino-gelf log -h graylog.server.com
-```
-
-### IMAP transactions
-
-Sometimes it is important to understand what kind of traffic is exactly exchanged between the client and the server. By default EmailEngine does show IMAP logs but these are logical not actual logs. It means that these log lines are post processed (passwords and long strings are removed) and might appear out of order in some cases.
-
-For debugging it might be important to see the actual logs so EmailEngine allows to enable raw logging using either the `EENGINE_LOG_RAW=true` environment variable or `--log.raw=true` argument. This way EmailEngine includes all data read from and written to socket in base64 format. This is quite unreadable for humans but you can use [eerawlog](https://github.com/postalsys/eerawlog) tool to make it readable.
-
-```
-$ npm install eerawlog -g
-$ EENGINE_LOG_RAW=true emailengine | eerawlog
-```
-
-![](https://cldup.com/0z5i7LU-_A.png)
+Read about logging options [here](https://emailengine.app/logging)
 
 ## Security and Data compliance
 

package/bin/emailengine.js

@@ -2,12 +2,53 @@
 /* eslint global-require: 0 */
 'use strict';
 
+const packageData = require('../package.json');
+const fs = require('fs');
+const pathlib = require('path');
+
 if (process.argv[2] === 'encrypt') {
     // encrypt account passwords
     require('../encrypt');
 } else if (process.argv[2] === 'scan') {
     // Scan Redis keys
     require('../scan');
+} else if (['version', '-v', '--version'].includes(process.argv[2])) {
+    // Show version
+    console.log(`EmailEngine v${packageData.version} (${packageData.license})`);
+} else if (['license', '--license'].includes(process.argv[2])) {
+    // Display license information
+    fs.readFile(pathlib.join(__dirname, '..', 'LICENSE.txt'), (err, license) => {
+        if (err) {
+            console.error('Failed to load license information');
+            console.error(err);
+            return process.exit(1);
+        }
+
+        console.error('EmailEngine License');
+        console.error('===================');
+        console.log(`EmailEngine v${packageData.version}`);
+        console.error(`(c) 2020-2021 Postal Systems`);
+        console.error(`${packageData.license}, full text follows`);
+        console.error('');
+
+        console.error(license.toString().trim());
+
+        console.error('');
+
+        fs.readFile(pathlib.join(__dirname, '..', 'licenses.txt'), (err, data) => {
+            if (err) {
+                console.error('Failed to load license information');
+                console.error(err);
+                return process.exit(1);
+            }
+
+            console.error('Included Modules');
+            console.error('================');
+
+            console.error(data.toString().trim());
+            process.exit();
+        });
+    });
 } else {
     // run normally
     require('../server');

package/entitlements.mac.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.network.client</key>
+    <true/>
+    <key>com.apple.security.network.server</key>
+    <true/>
+  </dict>
+</plist>

package/lib/connection.js

@@ -593,10 +593,10 @@ class Connection {
         await this.notifyQueue.add(event, payload, {
             removeOnComplete: true,
             removeOnFail: true,
-            attempts: 5,
+            attempts: 10,
             backoff: {
                 type: 'exponential',
-                delay: 2000
+                delay: 5000
             }
         });
     }
@@ -1343,15 +1343,17 @@ class Connection {
             smtpConnectionConfig
         );
 
-        smtpSettings.auth = {
-            user: smtpAuth.user
-        };
+        if (smtpAuth) {
+            smtpSettings.auth = {
+                user: smtpAuth.user
+            };
 
-        if (smtpAuth.accessToken) {
-            smtpSettings.auth.type = 'OAuth2';
-            smtpSettings.auth.accessToken = smtpAuth.accessToken;
-        } else {
-            smtpSettings.auth.pass = smtpAuth.pass;
+            if (smtpAuth.accessToken) {
+                smtpSettings.auth.type = 'OAuth2';
+                smtpSettings.auth.accessToken = smtpAuth.accessToken;
+            } else {
+                smtpSettings.auth.pass = smtpAuth.pass;
+            }
         }
 
         for (let level of ['trace', 'debug', 'info', 'warn', 'error', 'fatal']) {
@@ -1557,10 +1559,10 @@ class Connection {
                 {
                     removeOnComplete: true,
                     removeOnFail: true,
-                    attempts: 5,
+                    attempts: 10,
                     backoff: {
                         type: 'exponential',
-                        delay: 2000
+                        delay: 5000
                     },
                     delay: sendAt.getTime() - now.getTime()
                 }
@@ -1572,10 +1574,10 @@ class Connection {
                 {
                     removeOnComplete: true,
                     removeOnFail: true,
-                    attempts: 5,
+                    attempts: 10,
                     backoff: {
                         type: 'exponential',
-                        delay: 2000
+                        delay: 5000
                     }
                 }
             );

package/lib/logger.js

@@ -7,6 +7,8 @@ config.log = config.log || {
     level: 'trace'
 };
 
+config.log.level = config.log.level || 'trace';
+
 let logger = pino();
 logger.level = process.env.EENGINE_LOG_LEVEL || config.log.level;
 

package/lib/lua/z-get-mailbox-id.lua

@@ -7,6 +7,11 @@ local id = tonumber(redis.call("HGET", hashKey, path)) or 0;
 if id == 0 then
     -- ID not yet created
     id = redis.call("HINCRBY", accountKey, 'listRegistry', 1);
+    if id == 1 then
+        -- first entry on the account, make sure we do not mix with old values (if present)
+        redis.call("DEL", hashKey);
+    end;
+
     redis.call("HSET", hashKey, path, id);
     redis.call("HSET", hashKey, "ix:" .. id, path);
 end;

package/license-report-config.json

@@ -0,0 +1,3 @@
+{
+    "fields": ["name", "licenseType", "link", "installedVersion", "author"]
+}

package/licenses.txt

@@ -0,0 +1,37 @@
+name                 license type        link                                                                          installed version  author
+----                 ------------        ----                                                                          -----------------  ------
+@hapi/basic          BSD-3-Clause        git://github.com/hapijs/basic.git                                             6.0.0              n/a
+@hapi/boom           BSD-3-Clause        git://github.com/hapijs/boom.git                                              9.1.4              n/a
+@hapi/hapi           BSD-3-Clause        git://github.com/hapijs/hapi.git                                              20.2.1             n/a
+@hapi/inert          BSD-3-Clause        git+https://github.com/hapijs/inert.git                                       6.0.4              n/a
+@hapi/vision         BSD-3-Clause        git://github.com/hapijs/vision.git                                            6.1.0              n/a
+bull                 MIT                 git://github.com/OptimalBits/bull.git                                         3.29.2             OptimalBits
+bull-arena           MIT                 git+https://github.com/bee-queue/arena.git                                    3.29.3             Mixmax
+dotenv               BSD-2-Clause        git://github.com/motdotla/dotenv.git                                          10.0.0             n/a
+email-reply-parser   MIT                 https://registry.npmjs.org/email-reply-parser/-/email-reply-parser-1.2.6.tgz  1.2.6              Crisp IM SARL
+exponential-backoff  Apache-2.0          git+https://github.com/coveo/exponential-backoff.git                          3.1.0              Sami Sayegh
+express              MIT                 git+https://github.com/expressjs/express.git                                  4.17.1             TJ Holowaychuk
+google-auth-library  Apache-2.0          git+https://github.com/googleapis/google-auth-library-nodejs.git              7.10.0             Google Inc.
+hapi-pino            MIT                 git+https://github.com/pinojs/hapi-pino.git                                   8.5.0              David Mark Clements
+hapi-swagger         MIT                 git://github.com/glennjones/hapi-swagger.git                                  14.2.4             Glenn Jones
+he                   MIT                 git+https://github.com/mathiasbynens/he.git                                   1.2.0              Mathias Bynens
+html-to-text         MIT                 git://github.com/html-to-text/node-html-to-text.git                           8.0.0              Malte Legenhausen
+imapflow             MIT                 git+https://github.com/postalsys/imapflow.git                                 1.0.74             Postal Systems OÜ
+ioredis              MIT                 git://github.com/luin/ioredis.git                                             4.27.11            luin
+joi                  BSD-3-Clause        git://github.com/sideway/joi.git                                              17.4.2             n/a
+jquery               MIT                 git+https://github.com/jquery/jquery.git                                      3.6.0              OpenJS Foundation and other contributors
+libmime              MIT                 git://github.com/andris9/libmime.git                                          5.0.0              Andris Reinman
+linkifyjs            MIT                 git+https://github.com/SoapBox/linkifyjs.git                                  2.1.9              Hypercontext
+mailparser           MIT                 git+https://github.com/nodemailer/mailparser.git                              3.3.3              Andris Reinman
+mailsplit            (MIT OR EUPL-1.1+)  git+https://github.com/andris9/mailsplit.git                                  5.2.0              Andris Reinman
+msgpack5             MIT                 git://github.com/mcollina/msgpack5.git                                        5.3.2              Matteo collina
+node-fetch           MIT                 git+https://github.com/bitinn/node-fetch.git                                  2.6.1              David Frank
+node-vault           MIT                 git://github.com/kr1sp1n/node-vault.git                                       0.9.22             kr1sp1n
+nodemailer           MIT                 git+https://github.com/nodemailer/nodemailer.git                              6.7.0              Andris Reinman
+pino                 MIT                 git+https://github.com/pinojs/pino.git                                        6.13.3             Matteo Collina
+prom-client          Apache-2.0          git+ssh://git@github.com/siimon/prom-client.git                               14.0.0             Simon Nyberg
+punycode             MIT                 git+https://github.com/bestiejs/punycode.js.git                               2.1.1              Mathias Bynens
+smtp-server          MIT                 git://github.com/andris9/smtp-server.git                                      3.9.0              Andris Reinman
+uuid                 MIT                 git+https://github.com/uuidjs/uuid.git                                        8.3.2              n/a
+wild-config          MIT                 git+https://github.com/wildduck-email/wild-config.git                         1.5.1              Andris Reinman
+yargs                MIT                 git+https://github.com/yargs/yargs.git                                        17.2.1             n/a

package/package.json

@@ -1,13 +1,15 @@
 {
     "name": "emailengine-app",
-    "version": "1.14.3",
+    "version": "1.14.7",
     "description": "Email Sync Engine",
     "main": "server.js",
     "scripts": {
         "start": "node server.js",
         "test": "grunt",
         "swagger": "./getswagger.sh",
-        "build-dist": "pkg package.json"
+        "build-dist": "npm run licenses && npm run licenses-text && pkg package.json",
+        "licenses": "license-report --only=prod --output=html --config license-report-config.json > static/licenses.html",
+        "licenses-text": "license-report --only=prod --output=table --config license-report-config.json > licenses.txt"
     },
     "keywords": [
         "IMAP"
@@ -28,7 +30,7 @@
     "dependencies": {
         "@hapi/basic": "6.0.0",
         "@hapi/boom": "9.1.4",
-        "@hapi/hapi": "20.2.0",
+        "@hapi/hapi": "20.2.1",
         "@hapi/inert": "6.0.4",
         "@hapi/vision": "6.1.0",
         "bull": "3.29.2",
@@ -37,38 +39,40 @@
         "email-reply-parser": "1.2.6",
         "exponential-backoff": "3.1.0",
         "express": "4.17.1",
-        "google-auth-library": "7.9.2",
-        "hapi-pino": "8.3.0",
+        "google-auth-library": "7.10.0",
+        "hapi-pino": "8.5.0",
         "hapi-swagger": "14.2.4",
         "he": "1.2.0",
         "html-to-text": "8.0.0",
-        "imapflow": "1.0.71",
-        "ioredis": "4.27.9",
+        "imapflow": "1.0.75",
+        "ioredis": "4.27.11",
         "joi": "17.4.2",
         "jquery": "3.6.0",
         "libmime": "5.0.0",
         "linkifyjs": "2.1.9",
-        "mailparser": "3.3.1",
+        "mailparser": "3.3.3",
         "mailsplit": "5.2.0",
         "msgpack5": "5.3.2",
         "node-fetch": "2.6.1",
         "node-vault": "0.9.22",
-        "nodemailer": "6.6.5",
+        "nodemailer": "6.7.0",
         "pino": "6.13.3",
         "prom-client": "14.0.0",
         "punycode": "2.1.1",
         "smtp-server": "3.9.0",
         "uuid": "8.3.2",
-        "wild-config": "1.5.1"
+        "wild-config": "1.5.1",
+        "yargs": "^17.2.1"
     },
     "devDependencies": {
-        "eslint": "7.32.0",
+        "eslint": "8.0.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "8.3.0",
         "grunt": "1.4.1",
         "grunt-cli": "1.4.3",
         "grunt-eslint": "23.0.0",
-        "pkg": "^5.3.2"
+        "license-report": "4.5.0",
+        "pkg": "5.3.3"
     },
     "pkg": {
         "scripts": [
@@ -79,7 +83,9 @@
             "views/**/*",
             "lib/lua/**/*",
             "node_modules/bull/lib/commands/**/*",
-            "node_modules/swagger-ui-dist/**/*"
+            "node_modules/swagger-ui-dist/**/*",
+            "licenses.txt",
+            "LICENSE.txt"
         ],
         "_targets": [
             "node16-macos-x64"

package/static/index.html

@@ -502,9 +502,9 @@ $ curl -XPOST "<span class="domainName">localhost:3000</span>/v1/account" -H "co
                         <span class="text-muted">Licensed under </span><span class="text-muted app-license"></span>
                     </div>
                 </div>
-                <div class="row no-mit-license d-none">
+                <div class="row">
                     <div class="col-sm-8 text-muted">
-                        Postal Systems subscribers can <a href="https://postalsys.com/plans">upgrade EmailEngine</a> to use MIT license instead.
+                        License information for Open Source software included in EmailEngine can be seen <a href="/licenses.html">here</a>.
                     </div>
                 </div>
             </div>

package/static/licenses.html

@@ -0,0 +1,50 @@
+<html>
+<body>
+<style>
+/*
+based on: https://codepen.io/DavidKern/pen/PwzYvv
+*/
+@import url(https://fonts.googleapis.com/css?family=Lato:300,400,700);
+
+
+body {
+    background: #fff;
+    color: #000;
+    font-family: 'Lato', Arial, sans-serif;
+}
+
+h1 {
+    font-family: "proxima-nova",sans-serif;
+    letter-spacing: -0.01em;
+    font-weight: 700;
+    font-style: normal;
+    font-size: 60px;
+    margin-left: -3px;
+    line-height: 1em;
+    color: #000;
+    text-align: center;
+    margin-bottom: 8px;
+    text-rendering: optimizeLegibility;
+}
+
+table {
+    width: 80%;
+    margin: auto;
+}
+
+table, th, td {
+    border: 1px solid #000;
+    border-collapse: collapse;
+}
+
+th {
+	background-color: #ddd
+}
+
+th, td {
+    padding: 15px;
+}
+</style>
+<table><thead><tr><th class="undefined">author</th><th class="string">installed version</th><th class="string">link</th><th class="string">license type</th><th class="string">name</th></tr></thead><tbody><tr><td class="undefined"></td><td class="string">6.0.0</td><td class="string">git://github.com/hapijs/basic.git</td><td class="string">BSD-3-Clause</td><td class="string">@hapi/basic</td></tr><tr><td class="undefined"></td><td class="string">9.1.4</td><td class="string">git://github.com/hapijs/boom.git</td><td class="string">BSD-3-Clause</td><td class="string">@hapi/boom</td></tr><tr><td class="undefined"></td><td class="string">20.2.1</td><td class="string">git://github.com/hapijs/hapi.git</td><td class="string">BSD-3-Clause</td><td class="string">@hapi/hapi</td></tr><tr><td class="undefined"></td><td class="string">6.0.4</td><td class="string">git+https://github.com/hapijs/inert.git</td><td class="string">BSD-3-Clause</td><td class="string">@hapi/inert</td></tr><tr><td class="undefined"></td><td class="string">6.1.0</td><td class="string">git://github.com/hapijs/vision.git</td><td class="string">BSD-3-Clause</td><td class="string">@hapi/vision</td></tr><tr><td class="string">OptimalBits</td><td class="string">3.29.2</td><td class="string">git://github.com/OptimalBits/bull.git</td><td class="string">MIT</td><td class="string">bull</td></tr><tr><td class="string">Mixmax</td><td class="string">3.29.3</td><td class="string">git+https://github.com/bee-queue/arena.git</td><td class="string">MIT</td><td class="string">bull-arena</td></tr><tr><td class="undefined"></td><td class="string">10.0.0</td><td class="string">git://github.com/motdotla/dotenv.git</td><td class="string">BSD-2-Clause</td><td class="string">dotenv</td></tr><tr><td class="string">Crisp IM SARL</td><td class="string">1.2.6</td><td class="string">https://registry.npmjs.org/email-reply-parser/-/email-reply-parser-1.2.6.tgz</td><td class="string">MIT</td><td class="string">email-reply-parser</td></tr><tr><td class="string">Sami Sayegh</td><td class="string">3.1.0</td><td class="string">git+https://github.com/coveo/exponential-backoff.git</td><td class="string">Apache-2.0</td><td class="string">exponential-backoff</td></tr><tr><td class="string">TJ Holowaychuk</td><td class="string">4.17.1</td><td class="string">git+https://github.com/expressjs/express.git</td><td class="string">MIT</td><td class="string">express</td></tr><tr><td class="string">Google Inc.</td><td class="string">7.10.0</td><td class="string">git+https://github.com/googleapis/google-auth-library-nodejs.git</td><td class="string">Apache-2.0</td><td class="string">google-auth-library</td></tr><tr><td class="string">David Mark Clements</td><td class="string">8.5.0</td><td class="string">git+https://github.com/pinojs/hapi-pino.git</td><td class="string">MIT</td><td class="string">hapi-pino</td></tr><tr><td class="string">Glenn Jones</td><td class="string">14.2.4</td><td class="string">git://github.com/glennjones/hapi-swagger.git</td><td class="string">MIT</td><td class="string">hapi-swagger</td></tr><tr><td class="string">Mathias Bynens</td><td class="string">1.2.0</td><td class="string">git+https://github.com/mathiasbynens/he.git</td><td class="string">MIT</td><td class="string">he</td></tr><tr><td class="string">Malte Legenhausen</td><td class="string">8.0.0</td><td class="string">git://github.com/html-to-text/node-html-to-text.git</td><td class="string">MIT</td><td class="string">html-to-text</td></tr><tr><td class="string">Postal Systems OÜ</td><td class="string">1.0.74</td><td class="string">git+https://github.com/postalsys/imapflow.git</td><td class="string">MIT</td><td class="string">imapflow</td></tr><tr><td class="string">luin</td><td class="string">4.27.11</td><td class="string">git://github.com/luin/ioredis.git</td><td class="string">MIT</td><td class="string">ioredis</td></tr><tr><td class="undefined"></td><td class="string">17.4.2</td><td class="string">git://github.com/sideway/joi.git</td><td class="string">BSD-3-Clause</td><td class="string">joi</td></tr><tr><td class="string">OpenJS Foundation and other contributors</td><td class="string">3.6.0</td><td class="string">git+https://github.com/jquery/jquery.git</td><td class="string">MIT</td><td class="string">jquery</td></tr><tr><td class="string">Andris Reinman</td><td class="string">5.0.0</td><td class="string">git://github.com/andris9/libmime.git</td><td class="string">MIT</td><td class="string">libmime</td></tr><tr><td class="string">Hypercontext</td><td class="string">2.1.9</td><td class="string">git+https://github.com/SoapBox/linkifyjs.git</td><td class="string">MIT</td><td class="string">linkifyjs</td></tr><tr><td class="string">Andris Reinman</td><td class="string">3.3.3</td><td class="string">git+https://github.com/nodemailer/mailparser.git</td><td class="string">MIT</td><td class="string">mailparser</td></tr><tr><td class="string">Andris Reinman</td><td class="string">5.2.0</td><td class="string">git+https://github.com/andris9/mailsplit.git</td><td class="string">(MIT OR EUPL-1.1+)</td><td class="string">mailsplit</td></tr><tr><td class="string">Matteo collina</td><td class="string">5.3.2</td><td class="string">git://github.com/mcollina/msgpack5.git</td><td class="string">MIT</td><td class="string">msgpack5</td></tr><tr><td class="string">David Frank</td><td class="string">2.6.1</td><td class="string">git+https://github.com/bitinn/node-fetch.git</td><td class="string">MIT</td><td class="string">node-fetch</td></tr><tr><td class="string">kr1sp1n</td><td class="string">0.9.22</td><td class="string">git://github.com/kr1sp1n/node-vault.git</td><td class="string">MIT</td><td class="string">node-vault</td></tr><tr><td class="string">Andris Reinman</td><td class="string">6.7.0</td><td class="string">git+https://github.com/nodemailer/nodemailer.git</td><td class="string">MIT</td><td class="string">nodemailer</td></tr><tr><td class="string">Matteo Collina</td><td class="string">6.13.3</td><td class="string">git+https://github.com/pinojs/pino.git</td><td class="string">MIT</td><td class="string">pino</td></tr><tr><td class="string">Simon Nyberg</td><td class="string">14.0.0</td><td class="string">git+ssh://git@github.com/siimon/prom-client.git</td><td class="string">Apache-2.0</td><td class="string">prom-client</td></tr><tr><td class="string">Mathias Bynens</td><td class="string">2.1.1</td><td class="string">git+https://github.com/bestiejs/punycode.js.git</td><td class="string">MIT</td><td class="string">punycode</td></tr><tr><td class="string">Andris Reinman</td><td class="string">3.9.0</td><td class="string">git://github.com/andris9/smtp-server.git</td><td class="string">MIT</td><td class="string">smtp-server</td></tr><tr><td class="undefined"></td><td class="string">8.3.2</td><td class="string">git+https://github.com/uuidjs/uuid.git</td><td class="string">MIT</td><td class="string">uuid</td></tr><tr><td class="string">Andris Reinman</td><td class="string">1.5.1</td><td class="string">git+https://github.com/wildduck-email/wild-config.git</td><td class="string">MIT</td><td class="string">wild-config</td></tr><tr><td class="undefined"></td><td class="string">17.2.1</td><td class="string">git+https://github.com/yargs/yargs.git</td><td class="string">MIT</td><td class="string">yargs</td></tr></tbody></table>
+</body>
+</html>

package/workers/api.js

@@ -187,6 +187,18 @@ const init = async () => {
         host: process.env.EENGINE_HOST || config.api.host
     });
 
+    server.ext('onPreHandler', async (request, h) => {
+        logger.debug({
+            msg: 'request onPreHandler',
+            action: 'onPreHandler',
+            method: request.method,
+            path: request.path,
+            account: request.params && request.params.account
+        });
+
+        return h.continue;
+    });
+
     const swaggerOptions = {
         swaggerUI: true,
         swaggerUIPath: '/swagger/',
@@ -271,6 +283,14 @@ const init = async () => {
         }
     });
 
+    server.route({
+        method: 'GET',
+        path: '/licenses.html',
+        handler: {
+            file: { path: pathlib.join(__dirname, '..', 'static', 'licenses.html'), confine: false }
+        }
+    });
+
     server.route({
         method: 'GET',
         path: '/static/{file*}',
@@ -2278,6 +2298,7 @@ async function getStats(seconds) {
             accounts: await redis.scard('ia:accounts'),
             node: process.versions.node,
             redis: redisVersion,
+            imapflow: ImapFlow.version || 'please upgrade',
             counters
         },
         structuredMetrics

package/workers/imap.js

@@ -162,9 +162,7 @@ class ConnectionHandler {
                     cid: accountObject.connection.cid,
                     msg: 'Account reconnect requested'
                 });
-                await redis.hmset(accountObject.connection.getAccountKey(), {
-                    state: 'connecting'
-                });
+                await redis.hset(accountObject.connection.getAccountKey(), 'state', 'connecting');
                 await accountObject.connection.reconnect(true);
             }
         }

package/workers/submit.js

@@ -91,10 +91,10 @@ async function notify(account, event, data) {
     await notifyQueue.add(event, payload, {
         removeOnComplete: true,
         removeOnFail: true,
-        attempts: 5,
+        attempts: 10,
         backoff: {
             type: 'exponential',
-            delay: 2000
+            delay: 5000
         }
     });
 }