refactor to remove helper functions in ws/net stringify method

Author: austinfrey

plugins/net.js

@@ -120,19 +120,15 @@ module.exports = ({ scope = 'device', host, port, external, allowHalfOpen, pause
         return null
       }
 
-      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(';')
+      // 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

@@ -130,29 +130,25 @@ module.exports = function (opts = {}) {
 
       const port = opts.server ? opts.server.address().port : opts.port
       const externalHost = targetScope === 'public' && opts.external
-      const resultHost = externalHost || opts.host || scopes.host(targetScope)
+      let resultHost = externalHost || opts.host || scopes.host(targetScope)
 
       if (resultHost == null) {
         // The device has no network interface for a given `targetScope`.
         return null
       }
 
-      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(';')
+      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)