skipping invalid hosts

vitaly-t · Jul 16, 2018 · 57ac33a · 57ac33a
1 parent 9f94c4d
commit 57ac33a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "connection-string",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Advanced URL Connection String Parser.",
   "main": "src/index.js",
   "typings": "src/index.d.ts",

diff --git a/src/index.js b/src/index.js
@@ -198,34 +198,38 @@
         // Missing default hosts are merged with the existing ones:
         if (Array.isArray(defaults.hosts)) {
             var hosts = Array.isArray(this.hosts) ? this.hosts : [];
-            var obj, found;
-            defaults.hosts.forEach(function (dh) {
-                found = false;
-                for (var i = 0; i < hosts.length; i++) {
-                    var thisHost = fullHostName(hosts[i]), defHost = fullHostName(dh);
-                    if (equalStrings(thisHost, defHost)) {
-                        found = true;
-                        break;
-                    }
-                }
-                if (!found) {
-                    obj = {};
-                    if (isText(dh.name)) {
-                        obj.name = dh.name;
-                        obj.isIPv6 = !!dh.isIPv6;
+            defaults.hosts.filter(function (d) {
+                return d && typeof d === 'object';
+            })
+                .forEach(function (dh) {
+                    var found = false;
+                    for (var i = 0; i < hosts.length; i++) {
+                        var thisHost = fullHostName(hosts[i]), defHost = fullHostName(dh);
+                        if (equalStrings(thisHost, defHost)) {
+                            found = true;
+                            break;
+                        }
                     }
-                    var port = parseInt(dh.port);
-                    if (port > 0 && port < 65536) {
-                        obj.port = port;
+                    if (!found) {
+                        var obj = {};
+                        if (isText(dh.name)) {
+                            obj.name = dh.name;
+                            obj.isIPv6 = !!dh.isIPv6;
+                        }
+                        var port = parseInt(dh.port);
+                        if (port > 0 && port < 65536) {
+                            obj.port = port;
+                        }
+                        if (obj.name || obj.port) {
+                            Object.defineProperty(obj, 'toString', {
+                                value: fullHostName.bind(null, obj)
+                            });
+                            hosts.push(obj);
+                        }
                     }
-                    Object.defineProperty(obj, 'toString', {
-                        value: fullHostName.bind(null, obj)
-                    });
-                    hosts.push(obj);
-                }
-            });
-            if (obj) {
-                this.hosts = hosts; // If anything changed;
+                });
+            if (hosts.length) {
+                this.hosts = hosts;
             }
         }
 

diff --git a/test/mainSpec.js b/test/mainSpec.js
@@ -436,6 +436,12 @@ describe('setDefaults', () => {
         expect(parse('').setDefaults({segments: ['', 123, true, '  ']})).toEqual({});
         expect(parse('').setDefaults({segments: 123})).toEqual({});
     });
+    it('must ignore invalid and empty hosts', () => {
+        expect(parse('').setDefaults({hosts: 1})).toEqual({});
+        expect(parse('').setDefaults({hosts: []})).toEqual({});
+        expect(parse('').setDefaults({hosts: [1, 2, 3]})).toEqual({});
+        expect(parse('').setDefaults({hosts: [{}, {}, {}]})).toEqual({});
+    });
 
 });