Merge pull request #4 from minrk/tweetnacl

use tweetnacl for bundled nacl instead of libsodium

Author: rgbkrk

.travis.yml

@@ -17,8 +17,9 @@ os:
 osx_image: xcode7.2
 
 env:
- - ZMQ="4.1.3" SODIUM="1.0.5" NODE_VERSION="5"
- - ZMQ="4.1.3" SODIUM="1.0.5" NODE_VERSION="4"
+ # libzmq-4.1.5 prerelease for tweetnacl build fixes
+ - ZMQ="b539733cee0f47f9bf1a70dc7cb7ff20410d3380" NODE_VERSION="5"
+ - ZMQ="b539733cee0f47f9bf1a70dc7cb7ff20410d3380" NODE_VERSION="4"
 
 before_install:
  - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
@@ -27,34 +28,23 @@ before_install:
  - nvm use $NODE_VERSION
  - node --version
  - npm --version
- - export CXX=g++-4.8
- - export CC=gcc-4.8
- - mkdir ldlocal
- - export LDHACK=`pwd`/ldlocal
- - export LDFLAGS=-L$LDHACK/lib
- - export CFLAGS=-I$LDHACK/include
- - export LD_RUN_PATH=$LDHACK/lib
- - export LD_LIBRARY_PATH=$LDHACK/lib
- - export PKG_CONFIG_PATH=$LDHACK/lib/pkgconfig
+ - test "$(uname)" = "Darwin"  || export CXX=g++-4.8 CC=gcc-4.8
+ - gcc --version
+ - mkdir zmq
+ - export ZMQ_PREFIX=`pwd`/zmq
+ - export CFLAGS=-fPIC
+ - export CXXFLAGS=-fPIC
+ - export PKG_CONFIG_PATH=$ZMQ_PREFIX/lib/pkgconfig
  - echo $PKG_CONFIG_PATH
- - wget http://download.zeromq.org/zeromq-$ZMQ.tar.gz
+ - wget https://github.com/zeromq/zeromq4-1/archive/$ZMQ.tar.gz -O zeromq-$ZMQ.tar.gz
  - tar xzvf zeromq-$ZMQ.tar.gz
- - '[ -z "$SODIUM" ] || wget https://download.libsodium.org/libsodium/releases/libsodium-$SODIUM.tar.gz'
- - '[ -z "$SODIUM" ] || tar xzvf libsodium-$SODIUM.tar.gz'
- - '[ -z "$SODIUM" ] || cd libsodium-$SODIUM'
- - '[ -z "$SODIUM" ] || ./autogen.sh'
- - '[ -z "$SODIUM" ] || ./configure --prefix=$LDHACK'
- - '[ -z "$SODIUM" ] || make'
- - '[ -z "$SODIUM" ] || make install'
- - '[ -z "$SODIUM" ] || cd ..'
- - '[ -z "$SODIUM" ] || export LIBS=-lsodium && export sodium_CFLAGS=$CFLAGS && export sodium_LIBS=$LDFLAGS'
- - cd zeromq-$ZMQ
+ - cd zeromq4-1-$ZMQ
  - ./autogen.sh
- - if [[ -z "$SODIUM" ]]; then ./configure --prefix=$LDHACK; else ./configure --prefix=$LDHACK --with-libsodium=$LDHACK; fi
- - make
+ - ./configure --prefix=$ZMQ_PREFIX --with-tweetnacl --with-relaxed --enable-static --disable-shared
+ - V=1 make -j
  - make install
  - cd ..
 
-install: env LD_LIBRARY_PATH=$LDHACK/lib LD_RUN_PATH=$LDHACK/lib PKG_CONFIG_PATH=$LDHACK/lib/pkgconfig LDFLAGS=-L$LDHACK/lib CFLAGS=-I$LDHACK/lib/include npm install
+install: env PKG_CONFIG_PATH=$ZMQ_PREFIX/lib/pkgconfig npm install
 
 script: travis_retry npm test

binding.gyp

@@ -47,7 +47,6 @@
             '/usr/local/include',
           ],
           'libraries': [
-            '<!@(pkg-config libzmq --libs)',
             '-L/opt/local/lib',
             '-L/usr/local/lib',
           ]
@@ -56,19 +55,12 @@
           'include_dirs': [
             '<!@(pkg-config libzmq --cflags-only-I | sed s/-I//g)',
             '/usr/local/include',
-          ],
-          'libraries': [
-            '<!@(pkg-config libzmq --libs)',
-            '-L/usr/local/lib',
           ]
         }],
         ['OS=="linux"', {
           'cflags': [
             '<!(pkg-config libzmq --cflags 2>/dev/null || echo "")',
           ],
-          'libraries': [
-            '<!(pkg-config libzmq --libs 2>/dev/null || echo "")',
-          ],
         }],
       ]
     }

test/util.js

@@ -0,0 +1,27 @@
+// cleanup utils for sockets
+var sockets = [];
+
+exports.cleanup = function (done) {
+  while (sockets.length) {
+    sockets.pop().close();
+  }
+  // give underlying sockets some time to close
+  // this shouldn't be necessary on *ix, but it seems to be
+  setTimeout(function () {
+    done();
+  }, 500);
+};
+
+exports.push_sockets = function () {
+  sockets.push.apply(sockets, arguments);
+};
+
+exports.done_countdown = function (done, counter) {
+  // add a done-countdown, so multiple async events can be awaited before triggering done
+  return function () {
+    counter -= 1;
+    if (counter === 0) {
+      done();
+    }
+  }
+};

test/zmq_proxy.push-pull.js

@@ -7,8 +7,11 @@ var addr = 'tcp://127.0.0.1'
   , backendAddr = addr+':5502'
   , captureAddr = addr+':5503';
 
-describe('proxy.push-pull', function() {
+var testutil = require('./util');
 
+describe('proxy.push-pull', function() {
+  afterEach(testutil.cleanup);
+  
   it('should proxy push-pull connected to pull-push',function (done) {
 
     var frontend = zmq.socket('pull');
@@ -22,14 +25,9 @@ describe('proxy.push-pull', function() {
 
     push.connect(frontendAddr);
     pull.connect(backendAddr);
+    testutil.push_sockets(frontend, backend, push, pull);
 
     pull.on('message',function (msg) {
-
-      frontend.close();
-      backend.close();
-      push.close();
-      pull.close();
-
       msg.should.be.an.instanceof(Buffer);
       msg.toString().should.equal('foo');
       done();
@@ -53,36 +51,30 @@ describe('proxy.push-pull', function() {
 
     var pull = zmq.socket('pull');
     var push = zmq.socket('push');
-
+    testutil.push_sockets(frontend, backend, push, pull, capture, capSub);
+    
     frontend.bindSync(frontendAddr);
     backend.bindSync(backendAddr);
     capture.bindSync(captureAddr);
 
     pull.connect(frontendAddr);
     push.connect(backendAddr);
     capSub.connect(captureAddr);
+    
+    var countdown = testutil.done_countdown(done, 2);
 
     pull.on('message',function (msg) {
       msg.should.be.an.instanceof(Buffer);
       msg.toString().should.equal('foo');
       console.log(msg.toString());
+      countdown();
     });
 
     capSub.subscribe('');
     capSub.on('message',function (msg) {
-      capture.close();
-      capSub.close();
-
-      setTimeout(function() {
-        frontend.close();
-        backend.close();
-        push.close();
-        pull.close();
-
-        msg.should.be.an.instanceof(Buffer);
-        msg.toString().should.equal('foo');
-        done();
-      },100.0);
+      msg.should.be.an.instanceof(Buffer);
+      msg.toString().should.equal('foo');
+      countdown();
     });
 
     setTimeout(function() {

test/zmq_proxy.router-dealer.js

@@ -7,7 +7,10 @@ var addr = 'tcp://127.0.0.1'
   , backendAddr = addr+':5505'
   , captureAddr = addr+':5506';
 
+var testutil = require('./util');
+
 describe('proxy.router-dealer', function() {
+  afterEach(testutil.cleanup);
 
   it('should proxy req-rep connected over router-dealer', function (done){
 
@@ -22,14 +25,11 @@ describe('proxy.router-dealer', function() {
 
     req.connect(frontendAddr);
     rep.connect(backendAddr);
+    testutil.push_sockets(frontend, backend, req, rep);
 
     req.on('message',function(msg){
       msg.should.be.an.instanceof(Buffer);
       msg.toString().should.equal('foo bar');
-      frontend.close();
-      backend.close();
-      req.close();
-      rep.close();
       done();
     });
 
@@ -64,26 +64,23 @@ describe('proxy.router-dealer', function() {
     rep.connect(backendAddr);
     capSub.connect(captureAddr);
     capSub.subscribe('');
+    testutil.push_sockets(frontend, backend, req, rep, capture, capSub);
+    var countdown = testutil.done_countdown(done, 2);
 
     req.on('message',function (msg) {
-      req.close();
-      rep.close();
       console.log(msg.toString());
+      countdown();
     });
 
     rep.on('message', function (msg) {
       rep.send(msg+' bar');
     });
 
     capSub.on('message',function (msg) {
-      backend.close();
-      frontend.close();
-      capture.close();
-      capSub.close();
       setTimeout(function() {
         msg.should.be.an.instanceof(Buffer);
         msg.toString().should.equal('foo bar');
-        done();
+        countdown();
       },100.0)
     });
 

test/zmq_proxy.xpub-xsub.js

@@ -8,9 +8,11 @@ var addr = 'tcp://127.0.0.1'
   , captureAddr = addr+':5509';
 
 var version = semver.gte(zmq.version, '3.1.0');
+var testutil = require('./util');
 
 describe('proxy.xpub-xsub', function() {
-
+  afterEach(testutil.cleanup);
+  
   it('should proxy pub-sub connected to xpub-xsub', function (done) {
     if (!version) {
       done();
@@ -22,18 +24,13 @@ describe('proxy.xpub-xsub', function() {
 
     var sub = zmq.socket('sub');
     var pub = zmq.socket('pub');
+    testutil.push_sockets(frontend, backend, sub, pub);
 
     sub.subscribe('');
     sub.on('message',function (msg) {
-
-      frontend.close();
-      backend.close();
-      sub.close();
-      pub.close();
-
       msg.should.be.an.instanceof(Buffer);
       msg.toString().should.equal('foo');
-
+      console.log(msg.toString());
       done();
     });
 
@@ -45,7 +42,11 @@ describe('proxy.xpub-xsub', function() {
 
         setTimeout(function() {
           pub.send('foo');
-        }, 200.0);
+        }, 500);
+
+        setTimeout(function () {
+          throw Error("Timeout");
+        }, 10000);
 
         zmq.proxy(frontend,backend);
 
@@ -67,33 +68,24 @@ describe('proxy.xpub-xsub', function() {
 
     var sub = zmq.socket('sub');
     var pub = zmq.socket('pub');
+    testutil.push_sockets(frontend, backend, sub, pub, capture, capSub);
+
+    var countdown = testutil.done_countdown(done, 2);
 
     sub.subscribe('');
     sub.on('message', function (msg) {
-
-      sub.close();
-      pub.close();
-      backend.close();
-      frontend.close();
-
       msg.should.be.an.instanceof(Buffer);
       msg.toString().should.equal('foo');
 
       console.log(msg.toString());
-
+      countdown();
     });
 
     capSub.subscribe('');
     capSub.on('message',function (msg) {
-
-      capture.close();
-      capSub.close();
-
-      setTimeout(function(){
-        msg.should.be.an.instanceof(Buffer);
-        msg.toString().should.equal('foo');
-        done();
-      },100.0);
+      msg.should.be.an.instanceof(Buffer);
+      msg.toString().should.equal('foo');
+      countdown();
     });
 
     capture.bind(captureAddr,function() {
@@ -106,7 +98,11 @@ describe('proxy.xpub-xsub', function() {
 
           setTimeout(function () {
             pub.send('foo');
-          }, 200.0);
+          }, 500);
+
+          setTimeout(function () {
+            throw Error("Timeout");
+          }, 10000);
 
           zmq.proxy(frontend,backend,capture);
         });
@@ -131,6 +127,7 @@ describe('proxy.xpub-xsub', function() {
 
     sub.connect(frontendAddr);
     pub.connect(backendAddr);
+    testutil.push_sockets(frontend, backend, sub, pub);
 
     try{
 
@@ -141,15 +138,9 @@ describe('proxy.xpub-xsub', function() {
       e.message.should.equal('wrong socket order to proxy');
 
     } finally{
-      frontend.close();
-      backend.close();
-      pub.close();
-      sub.close();
-
-      //allow time for TCP sockets to close
-      setTimeout(function(){
-        done();
-      },200)
+
+      done();
+
     }
   })
 });