fix: correct handling of multiplex options

and switch to dignifiedquire/multiplex

.travis.yml

@@ -1,7 +1,16 @@
 sudo: false
 language: node_js
-node_js:
-  - "4.0"
+
+matrix:
+  include:
+  - node_js: 4
+    env: CXX=g++-4.8
+  - node_js: 6
+    env:
+      - SAUCE=true
+      - CXX=g++-4.8
+  - node_js: stable
+    env: CXX=g++-4.8
 
 # Make sure we have new NPM.
 before_install:
@@ -10,10 +19,20 @@ before_install:
 script:
   - npm run lint
   - npm test
+  - npm run coverage
 
-addons:
-  firefox: 'latest'
 
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+
+after_success:
+  - npm run coverage-publish
+
+addons:
+  firefox: 'latest'
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8

package.json

@@ -38,7 +38,7 @@
     "pull-pair": "^1.1.0"
   },
   "dependencies": {
-    "multiplex": "diasdavid/multiplex",
+    "multiplex": "dignifiedquire/multiplex",
     "pull-catch": "^1.0.0",
     "pull-stream": "^3.5.0",
     "pull-stream-to-stream": "^1.3.3",
@@ -53,4 +53,4 @@
     "Victor Bjelkholm <[email protected]>",
     "greenkeeperio-bot <[email protected]>"
   ]
-}
+}

src/index.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const multiplex = require('multiplex')
+const Multiplex = require('multiplex')
 const toStream = require('pull-stream-to-stream')
 
 const MULTIPLEX_CODEC = require('./multiplex-codec')
@@ -16,10 +16,13 @@ function create (rawConn, isListener) {
   // but .destroy will trigger a 'close' event.
   stream.on('end', () => stream.destroy())
 
-  const mpx = multiplex()
+  const mpx = new Multiplex({
+    halfOpen: true,
+    initiator: !isListener
+  })
   pump(stream, mpx, stream)
 
-  return new Muxer(rawConn, mpx, isListener)
+  return new Muxer(rawConn, mpx)
 }
 
 exports = module.exports = create

src/muxer.js

@@ -9,15 +9,11 @@ const pullCatch = require('pull-catch')
 const MULTIPLEX_CODEC = require('./multiplex-codec')
 
 module.exports = class MultiplexMuxer extends EventEmitter {
-  constructor (conn, multiplex, isListener) {
+  constructor (conn, multiplex) {
     super()
-
-    this._id = (isListener ? 0 : -1)
-
     this.multiplex = multiplex
     this.conn = conn
     this.multicodec = MULTIPLEX_CODEC
-    this.isListener = isListener
 
     multiplex.on('close', () => this.emit('close'))
     multiplex.on('error', (err) => this.emit('error', err))
@@ -34,9 +30,7 @@ module.exports = class MultiplexMuxer extends EventEmitter {
   // method added to enable pure stream muxer feeling
   newStream (callback) {
     callback = callback || noop
-    this._id = this._id + 2
-
-    const stream = this.multiplex.createStream(this._id)
+    let stream = this.multiplex.createStream()
 
     const conn = new Connection(
       catchError(toPull.duplex(stream)),