Implement sync() methods

Makefile

@@ -1,5 +1,5 @@
 lint:
-	eslint *.js
+	node_modules/.bin/eslint *.js
 
 test:
 	$(MAKE) lint && node --trace-deprecation --throw-deprecation test.js

android.js

@@ -8,27 +8,39 @@ const args = {
   v6: ["-6", "r"],
 };
 
-const get = family => {
-  return execa.stdout("ip", args[family]).then(stdout => {
-    let result;
-
-    (stdout || "").trim().split("\n").some(line => {
-      const results = /default via (.+?) dev (.+?)( |$)/.exec(line) || [];
-      const gateway = results[1];
-      const iface = results[2];
-      if (gateway && net.isIP(gateway)) {
-        result = {gateway: gateway, interface: (iface ? iface : null)};
-        return true;
-      }
-    });
-
-    if (!result) {
-      throw new Error("Unable to determine default gateway");
+const parse = stdout => {
+  let result;
+
+  (stdout || "").trim().split("\n").some(line => {
+    const results = /default via (.+?) dev (.+?)( |$)/.exec(line) || [];
+    const gateway = results[1];
+    const iface = results[2];
+    if (gateway && net.isIP(gateway)) {
+      result = {gateway: gateway, interface: (iface ? iface : null)};
+      return true;
     }
+  });
+
+  if (!result) {
+    throw new Error("Unable to determine default gateway");
+  }
+
+  return result;
+};
 
-    return result;
+const promise = family => {
+  return execa.stdout("ip", args[family]).then(stdout => {
+    return parse(stdout);
   });
 };
 
-module.exports.v4 = () => get("v4");
-module.exports.v6 = () => get("v6");
+const sync = family => {
+  const result = execa.sync("ip", args[family]);
+  return parse(result.stdout);
+};
+
+module.exports.v4 = () => promise("v4");
+module.exports.v6 = () => promise("v6");
+
+module.exports.v4.sync = () => sync("v4");
+module.exports.v6.sync = () => sync("v6");

darwin.js

@@ -9,28 +9,40 @@ const args = {
   v6: ["-rn", "-f", "inet6"],
 };
 
-const get = family => {
-  return execa.stdout("netstat", args[family]).then(stdout => {
-    let result;
-
-    (stdout || "").trim().split("\n").some(line => {
-      const results = line.split(/ +/) || [];
-      const target = results[0];
-      const gateway = results[1];
-      const iface = results[family === "v4" ? 5 : 3];
-      if (dests.indexOf(target) !== -1 && gateway && net.isIP(gateway)) {
-        result = {gateway: gateway, interface: (iface ? iface : null)};
-        return true;
-      }
-    });
-
-    if (!result) {
-      throw new Error("Unable to determine default gateway");
+const parse = (stdout, family) => {
+  let result;
+
+  (stdout || "").trim().split("\n").some(line => {
+    const results = line.split(/ +/) || [];
+    const target = results[0];
+    const gateway = results[1];
+    const iface = results[family === "v4" ? 5 : 3];
+    if (dests.indexOf(target) !== -1 && gateway && net.isIP(gateway)) {
+      result = {gateway: gateway, interface: (iface ? iface : null)};
+      return true;
     }
+  });
+
+  if (!result) {
+    throw new Error("Unable to determine default gateway");
+  }
+
+  return result;
+};
 
-    return result;
+const promise = family => {
+  return execa.stdout("netstat", args[family]).then(stdout => {
+    return parse(stdout, family);
   });
 };
 
-module.exports.v4 = () => get("v4");
-module.exports.v6 = () => get("v6");
+const sync = family => {
+  const result = execa.sync("netstat", args[family]);
+  return parse(result.stdout, family);
+};
+
+module.exports.v4 = () => promise("v4");
+module.exports.v6 = () => promise("v6");
+
+module.exports.v4.sync = () => sync("v4");
+module.exports.v6.sync = () => sync("v6");

freebsd.js

@@ -9,28 +9,40 @@ const args = {
   v6: ["-rn", "-f", "inet6"],
 };
 
-const get = family => {
-  return execa.stdout("netstat", args[family]).then(stdout => {
-    let result;
-
-    (stdout || "").trim().split("\n").some(line => {
-      const results = line.split(/ +/) || [];
-      const target = results[0];
-      const gateway = results[1];
-      const iface = results[3];
-      if (dests.indexOf(target) !== -1 && gateway && net.isIP(gateway)) {
-        result = {gateway: gateway, interface: (iface ? iface : null)};
-        return true;
-      }
-    });
-
-    if (!result) {
-      throw new Error("Unable to determine default gateway");
+const parse = stdout => {
+  let result;
+
+  (stdout || "").trim().split("\n").some(line => {
+    const results = line.split(/ +/) || [];
+    const target = results[0];
+    const gateway = results[1];
+    const iface = results[3];
+    if (dests.indexOf(target) !== -1 && gateway && net.isIP(gateway)) {
+      result = {gateway: gateway, interface: (iface ? iface : null)};
+      return true;
     }
+  });
+
+  if (!result) {
+    throw new Error("Unable to determine default gateway");
+  }
+
+  return result;
+};
 
-    return result;
+const promise = family => {
+  return execa.stdout("netstat", args[family]).then(stdout => {
+    return parse(stdout);
   });
 };
 
-module.exports.v4 = () => get("v4");
-module.exports.v6 = () => get("v6");
+const sync = family => {
+  const result = execa.sync("netstat", args[family]);
+  return parse(result.stdout);
+};
+
+module.exports.v4 = () => promise("v4");
+module.exports.v6 = () => promise("v6");
+
+module.exports.v4.sync = () => sync("v4");
+module.exports.v6.sync = () => sync("v6");

index.js

@@ -11,9 +11,16 @@ if ([
   "sunos",
   "win32"
 ].indexOf(platform) !== -1) {
-  module.exports.v4 = () => require(`./${platform}`).v4();
-  module.exports.v6 = () => require(`./${platform}`).v6();
+  const families = require(`./${platform}`);
+
+  module.exports.v4 = () => families.v4();
+  module.exports.v6 = () => families.v6();
+  module.exports.v4.sync = () => families.v4.sync();
+  module.exports.v6.sync = () => families.v6.sync();
 } else {
-  module.exports.v4 = () => { throw new Error(`Unsupported Platform: ${platform}`); };
-  module.exports.v6 = () => { throw new Error(`Unsupported Platform: ${platform}`); };
+  const noop = () => { throw new Error(`Unsupported Platform: ${platform}`); };
+  module.exports.v4 = noop;
+  module.exports.v6 = noop;
+  module.exports.v4.sync = noop;
+  module.exports.v6.sync = noop;
 }

linux.js

@@ -9,38 +9,50 @@ const args = {
   v6: ["-6", "r"],
 };
 
-const get = family => {
-  return execa.stdout("ip", args[family]).then(stdout => {
-    let result;
-
-    (stdout || "").trim().split("\n").some(line => {
-      const results = /default( via .+?)?( dev .+?)( |$)/.exec(line) || [];
-      const gateway = (results[1] || "").substring(5);
-      const iface = (results[2] || "").substring(5);
-      if (gateway && net.isIP(gateway)) { // default via 1.2.3.4 dev en0
-        result = {gateway: gateway, interface: (iface ? iface : null)};
-        return true;
-      } else if (iface && !gateway) { // default via dev en0
-        const interfaces = os.networkInterfaces();
-        const addresses = interfaces[iface];
-        if (!addresses || !addresses.length) return;
-
-        addresses.some(function(addr) {
-          if (addr.family.substring(2) === family && net.isIP(addr.address)) {
-            result = {gateway: addr.address, interface: (iface ? iface : null)};
-            return true;
-          }
-        });
-      }
-    });
-
-    if (!result) {
-      throw new Error("Unable to determine default gateway");
+const parse = (stdout, family) => {
+  let result;
+
+  (stdout || "").trim().split("\n").some(line => {
+    const results = /default( via .+?)?( dev .+?)( |$)/.exec(line) || [];
+    const gateway = (results[1] || "").substring(5);
+    const iface = (results[2] || "").substring(5);
+    if (gateway && net.isIP(gateway)) { // default via 1.2.3.4 dev en0
+      result = {gateway: gateway, interface: (iface ? iface : null)};
+      return true;
+    } else if (iface && !gateway) { // default via dev en0
+      const interfaces = os.networkInterfaces();
+      const addresses = interfaces[iface];
+      if (!addresses || !addresses.length) return;
+
+      addresses.some(function(addr) {
+        if (addr.family.substring(2) === family && net.isIP(addr.address)) {
+          result = {gateway: addr.address, interface: (iface ? iface : null)};
+          return true;
+        }
+      });
     }
+  });
+
+  if (!result) {
+    throw new Error("Unable to determine default gateway");
+  }
+
+  return result;
+};
 
-    return result;
+const promise = family => {
+  return execa.stdout("ip", args[family]).then(stdout => {
+    return parse(stdout, family);
   });
 };
 
-module.exports.v4 = () => get("v4");
-module.exports.v6 = () => get("v6");
+const sync = family => {
+  const result = execa.sync("ip", args[family]);
+  return parse(result.stdout, family);
+};
+
+module.exports.v4 = () => promise("v4");
+module.exports.v6 = () => promise("v6");
+
+module.exports.v4.sync = () => sync("v4");
+module.exports.v6.sync = () => sync("v6");

openbsd.js

@@ -9,28 +9,40 @@ const args = {
   v6: ["-rn", "-f", "inet6"],
 };
 
-const get = family => {
-  return execa.stdout("netstat", args[family]).then(stdout => {
-    let result;
-
-    (stdout || "").trim().split("\n").some(line => {
-      const results = line.split(/ +/) || [];
-      const target = results[0];
-      const gateway = results[1];
-      const iface = results[7];
-      if (dests.indexOf(target) !== -1 && gateway && net.isIP(gateway)) {
-        result = {gateway: gateway, interface: (iface ? iface : null)};
-        return true;
-      }
-    });
-
-    if (!result) {
-      throw new Error("Unable to determine default gateway");
+const parse = stdout => {
+  let result;
+
+  (stdout || "").trim().split("\n").some(line => {
+    const results = line.split(/ +/) || [];
+    const target = results[0];
+    const gateway = results[1];
+    const iface = results[7];
+    if (dests.indexOf(target) !== -1 && gateway && net.isIP(gateway)) {
+      result = {gateway: gateway, interface: (iface ? iface : null)};
+      return true;
     }
+  });
+
+  if (!result) {
+    throw new Error("Unable to determine default gateway");
+  }
+
+  return result;
+};
 
-    return result;
+const promise = family => {
+  return execa.stdout("netstat", args[family]).then(stdout => {
+    return parse(stdout);
   });
 };
 
-module.exports.v4 = () => get("v4");
-module.exports.v6 = () => get("v6");
+const sync = family => {
+  const result = execa.sync("netstat", args[family]);
+  return parse(result.stdout);
+};
+
+module.exports.v4 = () => promise("v4");
+module.exports.v6 = () => promise("v6");
+
+module.exports.v4.sync = () => sync("v4");
+module.exports.v6.sync = () => sync("v6");

package.json

@@ -41,5 +41,8 @@
     "gateway",
     "routing",
     "route"
-  ]
+  ],
+  "devDependencies": {
+    "eslint": "^4.7.2"
+  }
 }