Merge pull request #9 from esatterwhite/master

Update for node v6

Author: edwardchoh

lib/common.js

@@ -1,63 +1,73 @@
-// Generated by CoffeeScript 1.6.3
-(function() {
-  var crypto, os, zmq;
+/*jshint laxcomma: true, smarttabs: true, node: true, esnext: true*/
+'use strict';
+const crypto = require('crypto')
+    , os          = require('os')
+    , zmq         = require('zmq')
+    , tcp_exp     = /tcp:\/\/[\d.]+:(\d+)\/?/
+    , vm_exp      = /VMware/
+    , localip_exp = /0\.0\.0\.0/
+    , tcp_proto   = /^tcp\:\/\//;
+    ;
 
-  crypto = require('crypto');
-
-  os = require('os');
+exports.get_random = function(){
+    return crypto.randomBytes(20).toString('hex');
+};
 
-  zmq = require('zmq');
+exports.isNumber = function(n){
+	return !isNaN(parseFloat(n)) && isFinite(n);
+};
 
-  exports.get_random = function() {
-    return crypto.randomBytes(20).toString('hex');
-  };
-
-  exports.list_local_ips = function() {
-    var a, addrs, iface_name, ips, _i, _len, _ref;
-    ips = [];
-    _ref = os.networkInterfaces();
-    for (iface_name in _ref) {
-      addrs = _ref[iface_name];
-      if (/VMware/.test(iface_name)) {
-        continue;
-      }
-      for (_i = 0, _len = addrs.length; _i < _len; _i++) {
-        a = addrs[_i];
-        if (!a.internal && a.family === 'IPv4') {
-          ips.push(a.address);
+exports.list_local_ips = function(){
+    let ips = [];
+    let interfaces = os.networkInterfaces();
+    for(let iface_name in interfaces){
+        if(vm_exp.test(iface_name)){ continue; }
+        let addrs = interfaces[ iface_name ];
+        for(let a in addrs){
+            let iface = addrs[a];
+            if(!iface.internal && iface.family == 'IPv4'){
+                ips.push(iface.address);
+            }
         }
-      }
     }
     return ips;
-  };
-
-  exports.get_local_endpoint = function(sock) {
-    var addr, ip;
+};
+exports.get_local_endpoint = function(sock){
+    let addr, ip;
     addr = sock.getsockopt(zmq.ZMQ_LAST_ENDPOINT);
-    if (addr.indexOf('tcp://') !== 0) {
-      return addr;
+    if(tcp_proto.test( addr )){
+        return addr; 
     }
+
+    // resolve to a locally reachable IP if tcp://
     ip = this.list_local_ips()[0];
-    return addr.replace(/0\.0\.0\.0/, "" + ip);
-  };
-
-  exports.get_port = function(addr) {
-    var m;
-    m = addr.match(/tcp:\/\/[\d.]+:(\d+)\/?/);
-    if (m) {
-      return Number(m[1]);
-    } else {
-      return -1;
-    }
-  };
+    return addr.replace(localip_exp, `${ip}`);
+};
+
+exports.get_port = function(addr){
+    let m = addr.match(tcp_exp);
+    return m ? Number(m[1]) : -1;
+};
+
+exports.bindAndGetAddr = function(sock_type, addr){
+    let sock, endpoint, port;
 
-  exports.bindAndGetAddr = function(sock_type, addr) {
-    var port, sock;
     sock = zmq.socket(sock_type);
     sock.bindSync(addr);
-    addr = sock.getsockopt(zmq.ZMQ_LAST_ENDPOINT);
+    endpoint = sock.getsockopt(zmq.ZMQ_LAST_ENDPOINT);
     port = exports.get_port(addr);
-    return [sock, addr, port];
-  };
+    return [sock, endpoint, port];
+};
+
+exports.lpad = function(value, padding){
+    let zeroes = '0', idx = padding;
+    while( idx ){
+        zeroes += '0';
+        idx--;
+    }
+    return (zeroes + value).slice(padding * - 1);
+};
 
-}).call(this);
+exports.random = function( length = 10 ){
+    return Math.floor(Math.random() * 1024 * 1024);
+};