Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

respect pause and resume #19

Merged
merged 1 commit into from Nov 22, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 15 additions & 15 deletions index.js
Expand Up @@ -2,6 +2,7 @@


var through = require('through') var through = require('through')
, extend = require('xtend') , extend = require('xtend')
, duplex = require('duplex')
, serializer = require('stream-serializer') , serializer = require('stream-serializer')


function MuxDemux (opts, onConnection) { function MuxDemux (opts, onConnection) {
Expand All @@ -17,17 +18,19 @@ function MuxDemux (opts, onConnection) {
} }


var streams = {}, streamCount = 0 var streams = {}, streamCount = 0
var md = through(function (data) { var md = duplex().resume()

md.on('_data', function (data) {
var id = data.shift() var id = data.shift()
var event = data[0] var event = data[0]
var s = streams[id] var s = streams[id]
if(!s) { if(!s) {
if(event == 'close') if(event == 'close')
return return
if(event != 'new') if(event != 'new')
return outer.emit('unknown', id) return outer.emit('unknown', id)
md.emit('connection', createStream(id, data[1].meta, data[1].opts)) md.emit('connection', createStream(id, data[1].meta, data[1].opts))
} }
else if (event === 'pause') else if (event === 'pause')
s.paused = true s.paused = true
else if (event === 'resume') { else if (event === 'resume') {
Expand Down Expand Up @@ -72,9 +75,6 @@ function MuxDemux (opts, onConnection) {
//end the stream once sub-streams have ended. //end the stream once sub-streams have ended.
//(waits for them to close, like on a tcp server) //(waits for them to close, like on a tcp server)


md.pause = function () {}
md.resume = function () {}

function createStream(id, meta, opts) { function createStream(id, meta, opts) {
streamCount ++ streamCount ++
var s = through(function (data) { var s = through(function (data) {
Expand All @@ -83,27 +83,27 @@ function MuxDemux (opts, onConnection) {
err.stream = this err.stream = this
return outer.emit("error", err) return outer.emit("error", err)
} }

md.emit('data', [s.id, 'data', data]) md._data([s.id, 'data', data])
}, function () { }, function () {
md.emit('data', [s.id, 'end']) md._data([s.id, 'end'])
if (this.readable && !opts.allowHalfOpen && !this.ended) { if (this.readable && !opts.allowHalfOpen && !this.ended) {
this.emit("end") this.emit("end")
} }
}) })
s.pause = function () { s.pause = function () {
md.emit('data', [s.id, 'pause']) md._data([s.id, 'pause'])
} }
s.resume = function () { s.resume = function () {
md.emit('data', [s.id, 'resume']) md._data([s.id, 'resume'])
} }
s.error = function (message) { s.error = function (message) {
md.emit('data', [s.id, 'error', message]) md._data([s.id, 'error', message])
} }
s.once('close', function () { s.once('close', function () {
delete streams[id] delete streams[id]
streamCount -- streamCount --
md.emit('data', [s.id, 'close']) md._data([s.id, 'close'])
if(streamCount === 0) if(streamCount === 0)
md.emit('zero') md.emit('zero')
}) })
Expand All @@ -123,7 +123,7 @@ function MuxDemux (opts, onConnection) {


outer.close = function (cb) { outer.close = function (cb) {
md.once('zero', function () { md.once('zero', function () {
md.emit('end') md._end()
if(cb) cb() if(cb) cb()
}) })
return this return this
Expand Down Expand Up @@ -155,7 +155,7 @@ function MuxDemux (opts, onConnection) {
opts.readable = opts.writable = true opts.readable = opts.writable = true
var s = createStream(createID(), meta, opts) var s = createStream(createID(), meta, opts)
var _opts = {writable: opts.readable, readable: opts.writable} var _opts = {writable: opts.readable, readable: opts.writable}
md.emit('data', [s.id, 'new', {meta: meta, opts: _opts}]) md._data([s.id, 'new', {meta: meta, opts: _opts}])
return s return s
} }
outer.createWriteStream = function (meta) { outer.createWriteStream = function (meta) {
Expand Down
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -10,7 +10,8 @@
"dependencies": { "dependencies": {
"xtend": "~1.0.3", "xtend": "~1.0.3",
"stream-serializer": "~0.0.3", "stream-serializer": "~0.0.3",
"through": "~1.1.0" "through": "~1.1.0",
"duplex": "~1.0.0"
}, },
"scripts": { "scripts": {
"test": "tap test/*.js" "test": "tap test/*.js"
Expand Down
21 changes: 21 additions & 0 deletions test/pause.js
@@ -0,0 +1,21 @@
var MuxDemux = require("..")
var assert = require("assert")

var mdm1 = MuxDemux()
var mdm2 = MuxDemux()
var called = false

mdm2.on("connection", function (stream) {
assert.equal(stream.meta, "foo")
called = true
})

mdm1.pause()

mdm1.createStream("foo")

mdm1.pipe(mdm2).pipe(mdm1)

mdm1.resume()

assert.equal(called, true)