nodemailer-smtp-pool - npm Package Compare versions

Comparing version 2.3.2 to 2.4.0

lib/pool-resource.js

 'use strict';
 
 var SMTPConnection = require('smtp-connection');
-var clone = require('clone');
+var assign = require('./assign');
 var EventEmitter = require('events').EventEmitter;
@@ -45,4 +45,4 @@ var util = require('util');
         if (socketOptions && socketOptions.connection) {
-            this.logger.info('Using proxied socket from %s:%s', socketOptions.connection.remoteAddress, socketOptions.connection.remotePort);
-            options = clone(options);
+            this.logger.info('Using proxied socket from %s:%s to %s:%s', socketOptions.connection.remoteAddress, socketOptions.connection.remotePort, options.host || '', options.port || '');
+            options = assign(false, options);
             Object.keys(socketOptions).forEach(function (key) {
@@ -49,0 +49,0 @@ options[key] = socketOptions[key];

lib/smtp-pool.js

@@ -6,3 +6,3 @@ 'use strict';
 var wellknown = require('nodemailer-wellknown');
-var clone = require('clone');
+var assign = require('./assign');
 var PoolResource = require('./pool-resource');
@@ -27,5 +27,4 @@ var EventEmitter = require('events').EventEmitter;
 
-    var hostData;
-
-    if (options && typeof options === 'string') {
+    options = options || {};
+    if (typeof options === 'string') {
         options = {
@@ -36,25 +35,20 @@ url: options
 
-    if (options && typeof options.getSocket === 'function') {
+    var urlData;
+    var service = options.service;
+
+    if (typeof options.getSocket === 'function') {
         this.getSocket = options.getSocket;
     }
 
-    this.options = options && clone(options) || {};
-
-    if (this.options.service && (hostData = wellknown(this.options.service))) {
-        Object.keys(hostData).forEach(function (key) {
-            if (!(key in this.options)) {
-                this.options[key] = hostData[key];
-            }
-        }.bind(this));
+    if (options.url) {
+        urlData = shared.parseConnectionUrl(options.url);
+        service = service || urlData.service;
     }
 
-    // parse a configuration URL into configuration options
-    if (this.options.url) {
-        hostData = shared.parseConnectionUrl(this.options.url);
-        Object.keys(hostData).forEach(function (key) {
-            if (!(key in this.options)) {
-                this.options[key] = hostData[key];
-            }
-        }.bind(this));
-    }
+    this.options = assign(
+        false, // create new object
+        options, // regular options
+        urlData, // url options
+        service && wellknown(service) // wellknown options
+    );
 
@@ -408,4 +402,4 @@ this.options.maxConnections = this.options.maxConnections || 5;
         if (socketOptions && socketOptions.connection) {
-            this.logger.info('Using proxied socket from %s:%s', socketOptions.connection.remoteAddress, socketOptions.connection.remotePort);
-            options = clone(options);
+            this.logger.info('Using proxied socket from %s:%s to %s:%s', socketOptions.connection.remoteAddress, socketOptions.connection.remotePort, options.host || '', options.port || '');
+            options = assign(false, options);
             Object.keys(socketOptions).forEach(function (key) {
@@ -412,0 +406,0 @@ options[key] = socketOptions[key];

package.json

 {
   "name": "nodemailer-smtp-pool",
-  "version": "2.3.2",
+  "version": "2.4.0",
   "description": "SMTP transport for Nodemailer",
@@ -24,6 +24,5 @@ "main": "lib/smtp-pool.js",
   "dependencies": {
-    "clone": "1.0.2",
     "nodemailer-shared": "1.0.4",
     "nodemailer-wellknown": "0.1.7",
-    "smtp-connection": "2.2.6"
+    "smtp-connection": "2.3.0"
   },
@@ -30,0 +29,0 @@ "devDependencies": {

No alert changes

Improved metrics

Total package byte prevSize

29834

increased by2.77%

Dependency count

3

decreased by-25%

Number of package files

9

increased by12.5%

Lines of code

636

increased by3.58%

Dependency changes

• + Addedsmtp-connection@2.3.0(transitive)

• - Removedclone@1.0.2

• - Removedclone@1.0.2(transitive)

• - Removedsmtp-connection@2.2.6(transitive)

• Updatedsmtp-connection@2.3.0