use helper functions and treat all external values as arrays when formatting addresses

Author: austinfrey

compose.js

@@ -103,11 +103,10 @@ module.exports = function (ary, wrap) {
     parse: parse,
     stringify: function (scope) {
       var _ary = []
-      var proto = head(ary)
-      var trans = tail(ary)
       var v = proto.stringify(scope)
       if(!v) return
       else {
+        // if true, more than one hostname needs to be updated
         if (v.split(';').length > 1) {
           var addresses = v.split(';')
           addresses.forEach(a => {

plugins/net.js

@@ -120,14 +120,19 @@ module.exports = ({ scope = 'device', host, port, external, allowHalfOpen, pause
         return null
       }
 
-      // Remove IPv6 scopeid suffix, if any, e.g. `%wlan0`
-      return Array.isArray(resultHost)
-      // if an array of external hostnames is supplied,
-      // return all of them in an ';' separated address string
-      ? resultHost.map((h) => {
-        return toAddress(h.replace(/(\%\w+)$/, ''), port)
-      }).join(';')
-      : toAddress(resultHost.replace(/(\%\w+)$/, ''), port)
+      return formatNetAddress(resultHost)
+
+      function formatNetAddress (resultHost) {
+        // convert to an array for easier formatting
+        if (isString(resultHost)) {
+          resultHost = [resultHost]
+        }
+        
+        return resultHost.map((h) => {
+          // Remove IPv6 scopeid suffix, if any, e.g. `%wlan0`
+          return toAddress(h.replace(/(\%\w+)$/, ''), port)
+        }).join(';')
+      }
     }
   }
 }

plugins/ws.js

@@ -137,21 +137,22 @@ module.exports = function (opts = {}) {
         return null
       }
 
-      return Array.isArray(resultHost)
-      ? resultHost.map((h) => {
-        return URL.format({
-          protocol: secure ? 'wss' : 'ws',
-          slashes: true,
-          hostname: h,
-          port: (secure ? port == 443 : port == 80) ? undefined : port
-        })
-      }).join(';')
-      : URL.format({
-        protocol: secure ? 'wss' : 'ws',
-        slashes: true,
-        hostname: resultHost,
-        port: (secure ? port == 443 : port == 80) ? undefined : port
-      })
+      return formatWsAddress(resultHost)
+
+      function formatWsAddress(resultHost) {
+        if (typeof resultHost === 'string') {
+          resultHost = [resultHost]
+        }
+
+        return resultHost.map((h) => {
+          return URL.format({
+            protocol: secure ? 'wss' : 'ws',
+            slashes: true,
+            hostname: h,
+            port: (secure ? port == 443 : port == 80) ? undefined : port
+          })
+        }).join(';')
+      }
     },
     parse: function (str) {
       var addr = URL.parse(str)