Merge pull request #90 from lgeiger/libzmq-4.2.0

Upgrade libzmq 4.2.0

Author: rgbkrk

binding.cc

@@ -26,7 +26,9 @@
 #include <node_version.h>
 #include <node_buffer.h>
 #include <zmq.h>
+#if (ZMQ_VERSION < 40200)
 #include <zmq_utils.h>
+#endif
 #include <assert.h>
 #include <stddef.h>
 #include <stdio.h>

binding.gyp

@@ -14,6 +14,7 @@
           'libraries': [
             '<(PRODUCT_DIR)/../../windows/lib/libzmq',
             'ws2_32.lib',
+            'iphlpapi'
           ],
         }],
         ['OS=="mac" or OS=="solaris"', {

codecov.yml

@@ -1,5 +1,4 @@
-comment:
-    layout: header
+comment: false
 coverage:
     status:
         patch:

scripts/build_libzmq.sh

@@ -1,24 +1,21 @@
 #!/bin/sh
 set -e
 
-test -d zmq || mkdir zmq
+if [ "$1" != "" ]; then
+  ZMQ=$1
+else
+  echo "No ZMQ version given"
+  exit 1
+fi
 
-ZMQ=4.1.6
-ZMQ_REPO=zeromq/zeromq4-1
-
-realpath() {
-    [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
-}
-export MAIN_DIR="$(dirname $(realpath $0))/../"
-export ZMQ_PREFIX=$MAIN_DIR/zmq
+export ZMQ_PREFIX="$(dirname $0)/../zmq"
 export ZMQ_SRC_DIR=zeromq-$ZMQ
 cd $ZMQ_PREFIX
 
 export CFLAGS=-fPIC
 export CXXFLAGS=-fPIC
 export PKG_CONFIG_PATH=$ZMQ_PREFIX/lib/pkgconfig
 
-test -f zeromq-$ZMQ.tar.gz || ZMQ=$ZMQ ZMQ_REPO=$ZMQ_REPO node $MAIN_DIR/scripts/download-zmq.js
 test -d $ZMQ_SRC_DIR || tar xzf zeromq-$ZMQ.tar.gz
 cd $ZMQ_SRC_DIR
 

scripts/download-zmq.js

@@ -2,24 +2,25 @@ var https = require('https');
 var fs = require('fs');
 var url = require('url');
 
-function writeToFile(filename, response) {
+function writeToFile(filename, response, callback) {
   response.pipe(fs.createWriteStream(filename));
+  response.on('end', callback)
 }
 
-function download(fileUrl, filename) {
+function download(fileUrl, filename, callback) {
   https.get(fileUrl, function(response) {
     if (response.statusCode > 300 && response.statusCode < 400 && response.headers.location) {
       if (url.parse(response.headers.location).hostname) {
         https.get(response.headers.location, function(res) {
-          writeToFile(filename, res);
+          writeToFile(filename, res, callback);
         });
       } else {
         https.get(url.resolve(url.parse(fileUrl).hostname, response.headers.location), function(res) {
-          writeToFile(filename, res);
+          writeToFile(filename, res, callback);
         });
       }
     } else {
-      writeToFile(filename, response);
+      writeToFile(filename, response, callback);
     }
   });
 }

scripts/download.js

@@ -3,26 +3,49 @@ var spawn = require('child_process').spawn;
 var path = require('path');
 var fs = require('fs');
 
-if (process.platform === 'win32') {
-  console.log('Downloading libzmq for Windows')
+var ZMQ = '4.2.0';
+
+function buildZMQ(scriptPath) {
+  console.log('Building libzmq for ' + process.platform)
+
+  var child = spawn(scriptPath, [ZMQ]);
+
+  child.stdout.pipe(process.stdout);
+  child.stderr.pipe(process.stderr);
+  child.on('error', (err) => {
+    console.error('Failed to start child process.');
+  });
+}
 
-  var TAR_URL = 'https://github.com/nteract/libzmq-win/releases/download/v1.0.0/libzmq-' + process.arch + '.lib';
+if (process.platform === 'win32') {
+  var LIB_URL = 'https://github.com/nteract/libzmq-win/releases/download/v2.0.0/libzmq-' + ZMQ + '-' + process.arch + '.lib';
   var DIR_NAME = path.join(__dirname, '..', 'windows', 'lib');
   var FILE_NAME = path.join(DIR_NAME, 'libzmq.lib');
 
   if (!fs.existsSync(DIR_NAME)) {
     fs.mkdirSync(DIR_NAME);
   }
 
-  download(TAR_URL, FILE_NAME);
+  if (!fs.existsSync(FILE_NAME)) {
+    console.log('Downloading libzmq for Windows');
+    download(LIB_URL, FILE_NAME, function() {
+      console.log('Download finished');
+    });
+  }
+
 } else {
-  console.log('Building libzmq for ' + process.platform)
+  var SCRIPT_PATH = path.join(__dirname, 'build_libzmq.sh');
+  var TAR_URL = 'https://github.com/zeromq/libzmq/releases/download/v' + ZMQ + '/zeromq-' + ZMQ + '.tar.gz';
+  var DIR = path.join(__dirname, '..', 'zmq');
+  var FILE_NAME = path.join(DIR, 'zeromq-' + ZMQ + '.tar.gz');
 
-  var child = spawn('./scripts/build_libzmq.sh');
+  if (!fs.existsSync(DIR)) {
+    fs.mkdirSync(DIR);
+  }
 
-  child.stdout.pipe(process.stdout);
-  child.stderr.pipe(process.stderr);
-  child.on('error', (err) => {
-    console.error('Failed to start child process.');
-  });
+  if (fs.existsSync(FILE_NAME)) {
+    buildZMQ(SCRIPT_PATH);
+  } else {
+    download(TAR_URL, FILE_NAME, function() { buildZMQ(SCRIPT_PATH); });
+  }
 }

scripts/preinstall.js

@@ -21,10 +21,11 @@ describe('socket.router', function(){
     var errMsgs = require('os').platform() === 'win32' ? ['Unknown error'] : [];
     errMsgs.push('No route to host');
     errMsgs.push('Resource temporarily unavailable');
+    errMsgs.push('Host unreachable');
 
     function assertRouteError(err) {
       if (errMsgs.indexOf(err.message) === -1) {
-        throw new Error('Bad error');
+        throw new Error(err.message);
       }
     }