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

adding mux-demux error option to detect errors from disconnect #26

Merged
merged 5 commits into from
Jul 21, 2013
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@ Db.prototype.createRpcStream = function () {
var client = self.client = rpc(null, true);
var stream = mdm.createStream('rpc');
client.pipe(stream).on('error',function(error){
//this error is emitted to each other active stream as well.
//we do not expose this stream so we have to bind error to not crash with error support from mdm
//we do not expose this stream so we have to bind error.
}).pipe(client);

setTimeout(function () {
Expand Down
10 changes: 8 additions & 2 deletions lib/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,14 @@ return function (db, opts) {
if (opts.deauth) opts.deauth.apply(null, args);
else cb();
});

mdm.on('connection', function (con) {

con.on('error',function(error){
// emit disconnect on active incomplete streams?
//if(con.meta !== 'rpc') con.emit('disconnect',error)
});

if(con.meta == 'rpc') return con.pipe(server).pipe(con);

try {
Expand All @@ -84,7 +90,7 @@ return function (db, opts) {
mdm.emit('error', err);
}
});

return mdm;
};

Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"level-test": "~1.4.0",
"level-sublevel": "~4.5.0",
"level-live-stream": "~1.4.4",
"bops": "~0.0.6"
"bops": "~0.0.6",
"through": "~2.3.4"
},
"testling": {
"files": "test/*.js",
Expand Down
40 changes: 40 additions & 0 deletions test/disconnect.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
var getLocalDb = require('./util').getLocalDb;
var through = require('through');
var multilevel = require('..');
var test = require('tape');

test('disconnect', function (t) {
t.plan(4);

var db = getLocalDb();
var server = multilevel.server(db);
var client = multilevel.client();
var outstream = through();

setTimeout(function () {
var rpc = client.createRpcStream();
server.pipe(outstream).pipe(client.createRpcStream()).pipe(server).on('error',function(){
console.log('SERVER ERROR')
});
}, 10);

client.batch([
{type:"put",key:"a",value:"1"},
{type:"put",key:"b",value:"2"},
{type:"put",key:"c",value:"3"}
], function (err) {
t.error(err);
var errored = false;
client.createReadStream().once('data',function(data){
t.equals(data.value, "1");
outstream.end();
}).on('error',function(error){
errored = true;
t.ok(error.message.indexOf('disconnect') > -1,'should have disconnect error');
}).once('close',function(){
console.log('close fired.')
t.equals(errored,true,'must have error event before end');
});
});

});