Use peer_error_then_end from server

coverage/lcov-report/index.html

@@ -90,7 +90,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Dec 10 2016 16:51:19 GMT+0000 (GMT)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Dec 20 2016 23:26:11 GMT+0000 (GMT)
 </div>
 </div>
 <script src="prettify.js"></script>

coverage/lcov-report/mqlobber/index.html

@@ -77,7 +77,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Dec 10 2016 16:51:19 GMT+0000 (GMT)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Dec 20 2016 23:26:11 GMT+0000 (GMT)
 </div>
 </div>
 <script src="../prettify.js"></script>

coverage/lcov-report/mqlobber/index.js.html

@@ -61,7 +61,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Dec 10 2016 16:51:19 GMT+0000 (GMT)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Dec 20 2016 23:26:11 GMT+0000 (GMT)
 </div>
 </div>
 <script src="../prettify.js"></script>

coverage/lcov-report/mqlobber/lib/client.js.html

@@ -1048,7 +1048,7 @@ <h1>
 <span class="cline-any cline-yes">1×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">59×</span>
+<span class="cline-any cline-yes">73×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1×</span>
@@ -1133,7 +1133,7 @@ <h1>
 <span class="cline-any cline-yes">1×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">440384×</span>
+<span class="cline-any cline-yes">440398×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2377,7 +2377,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Dec 10 2016 16:51:19 GMT+0000 (GMT)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Dec 20 2016 23:26:11 GMT+0000 (GMT)
 </div>
 </div>
 <script src="../../prettify.js"></script>

coverage/lcov-report/mqlobber/lib/index.html

@@ -90,7 +90,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Dec 10 2016 16:51:19 GMT+0000 (GMT)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Dec 20 2016 23:26:11 GMT+0000 (GMT)
 </div>
 </div>
 <script src="../../prettify.js"></script>

coverage/lcov-report/mqlobber/lib/server.js.html

@@ -1246,7 +1246,7 @@ <h1>
 &nbsp;
             duplex.on('error', function ()
             {
-                this.end();
+                this.peer_error_then_end();
             });
 &nbsp;
             duplex.on('error', on_error || cb);
@@ -1612,7 +1612,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Dec 10 2016 16:51:19 GMT+0000 (GMT)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Dec 20 2016 23:26:11 GMT+0000 (GMT)
 </div>
 </div>
 <script src="../../prettify.js"></script>

coverage/lcov.info

@@ -41,7 +41,7 @@ FN:756,(anonymous_27)
 FNF:27
 FNH:27
 FNDA:1890,MQlobberClient
-FNDA:59,error
+FNDA:73,error
 FNDA:6028,warning
 FNDA:58298,(anonymous_4)
 FNDA:504678,(anonymous_5)
@@ -51,7 +51,7 @@ FNDA:2,end
 FNDA:1890,(anonymous_9)
 FNDA:440397,(anonymous_10)
 FNDA:498700,(anonymous_11)
-FNDA:440384,dend
+FNDA:440398,dend
 FNDA:134236,done
 FNDA:3600,(anonymous_14)
 FNDA:3602,done
@@ -77,7 +77,7 @@ DA:222,1890
 DA:223,1890
 DA:225,1890
 DA:227,1
-DA:230,59
+DA:230,73
 DA:233,1
 DA:236,6028
 DA:238,9
@@ -112,7 +112,7 @@ DA:303,1884
 DA:306,496816
 DA:309,56422
 DA:312,1
-DA:315,440384
+DA:315,440398
 DA:320,440394
 DA:321,440394
 DA:323,440394

lib/server.js

@@ -159,7 +159,7 @@ function MQlobberServer(fsq, stream, options)
 
             duplex.on('error', function ()
             {
-                this.end();
+                this.peer_error_then_end();
             });
 
             duplex.on('error', on_error || cb);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mqlobber",
   "description": "Streaming message queue with pub-sub, work queues, wildcards and back-pressure. Just Node and a filesystem required.",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "homepage": "https://github.com/davedoesdev/mqlobber",
   "author": {
     "name": "David Halls",
@@ -34,7 +34,7 @@
     "back-pressure"
   ],
   "dependencies": {
-    "bpmux": "~3.0.0",
+    "bpmux": "~3.1.0",
     "qlobber": "~0.7.0"
   },
   "devDependencies": {

test/in-mem.js

@@ -47,7 +47,7 @@ function LeftDuplex()
     this.on('finish', function ()
     {
         this.right.push(null);
-    }.bind(this));
+    });
 }
 
 util.inherits(LeftDuplex, Duplex);

test/runner.js

@@ -1578,7 +1578,7 @@ describe(type, function ()
     with_mqs(1, 'should be able to do server callback after multiplexing',
     function (mqs, cb)
     {
-        var msg1, msg2, msg3;
+        var msg1, msg2, msg3, msg4;
 
         mqs[0].server.on('warning', function (err)
         {
@@ -1612,13 +1612,19 @@ describe(type, function ()
             done(new Error('dummy2'));
         });
 
+        mqs[0].client.on('error', function (err)
+        {
+            msg4 = err.message;
+        });
+
         mqs[0].client.on('warning', function (err)
         {
             expect(err.message).to.equal('dummy');
 
             expect(msg1).to.equal('dummy2');
             expect(msg2).to.equal('dummy2');
             expect(msg3).to.equal('dummy2');
+            expect(msg4).to.equal('peer error');
 
             if (cb)
             {
@@ -1680,7 +1686,8 @@ describe(type, function ()
 
             data.on('error', function (err)
             {
-                expect(err.message).to.equal('client error');
+                expect(err.message).to.be.oneOf(['ended before handshaken',
+                                                 'client error']);
                 msgs.push('data error');
             });
 
@@ -1689,6 +1696,12 @@ describe(type, function ()
             data.pipe(multiplex());
         });
 
+        mqs[0].client.on('error', function (err)
+        {
+            expect(err.message).to.equal('peer error');
+            msgs.push('client error');
+        });
+
         mqs[0].client.on('warning', function (err)
         {
             expect(err.message).to.equal('dummy');
@@ -1713,7 +1726,8 @@ describe(type, function ()
                 expect(msgs).to.eql(['client warning',
                                      'fsq warning',
                                      'server warning',
-                                     'data error']);
+                                     'data error',
+                                     'client error']);
 
                 // depending how soon the error gets to the server,
                 // the data may already have been sent
@@ -2476,6 +2490,11 @@ describe(type, function ()
             }
         });
 
+        mqs[0].client.on('error', function (err)
+        {
+            expect(err.message).to.equal('peer error');
+        });
+
         mqs[0].client.on('warning', function (err)
         {
             expect(err.message).to.equal('dummy');
@@ -2581,6 +2600,11 @@ describe(type, function ()
             cb();
         });
 
+        mqs[0].client.on('error', function (err)
+        {
+            expect(err.message).to.equal('peer error');
+        });
+
         mqs[0].client.subscribe('foo', function (s, info, done)
         {
             expect(info.single).to.equal(false);
@@ -2947,6 +2971,11 @@ describe(type, function ()
     {
         var client_warning;
 
+        mqs[0].client.on('error', function (err)
+        {
+            expect(err.message).to.equal('peer error');
+        });
+
         mqs[0].client.on('warning', function (err)
         {
             client_warning = err.message;