@babblevoice/projectrtp 2.3.6 → 2.3.8

package/index.js

@@ -468,6 +468,10 @@ class projectrtp {
       else chan.id = uuidv4()
 
       chan.uuid = uuidv4()
+
+      /* ensure we are identicle to the node version of this object */
+      chan.openchannel = this.openchannel.bind( this )
+      
       return chan
     }
   }

package/lib/node.js

@@ -78,7 +78,8 @@ class rtpnode {
       const con = {
         connectionid: uuidv4(),
         connection,
-        "connectionlength": 0
+        "connectionlength": 0,
+        "mode": "connect"
       }
       this.connections[ con.connectionid ] = con
       this.connection.on( "data", this._onsocketdata.bind( this, con ) )
@@ -97,7 +98,8 @@ class rtpnode {
       const con = {
         connectionid: uuidv4(),
         connection,
-        "connectionlength": 0
+        "connectionlength": 0,
+        "mode": "listen"
       }
       this.connections[ con.connectionid ] = con
       connection.setKeepAlive( true )
@@ -295,7 +297,7 @@ class rtpnode {
         con.connectionlength -= 1
         channels.delete( chan.uuid )
 
-        if( 0 == con.connectionlength ) {
+        if( 0 == con.connectionlength && "listen" == con.mode ) {
           this.connections.delete( con.instance )
           con.connection.destroy()
         }

package/lib/server.js

@@ -612,10 +612,6 @@ class channel {
       if( 0 === this.channels.length && this.connection.sock ) this.connection.sock.destroy()
     }
 
-    if( this.connection && this.connection.sock && !this.channels ) {
-      this.connection.sock.destroy()
-      delete this.connection.sock
-    }
 
     channels.delete( this.id )
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/projectrtp",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "description": "A scalable Node addon RTP server",
   "main": "index.js",
   "directories": {

package/stress/utils.js

@@ -20,9 +20,18 @@ module.exports.logclosechannel = ( message, d, mstimeout ) => {
   channelcount--
   totalcount++
   module.exports.log( message )
-  module.exports.log( ` Expected number of packets: ${Math.round(mstimeout / 20)}, Received: ${d.stats.in["count"]},` +
-  ` Score: ${(d.stats.in["count"] / mstimeout * 20).toFixed(2)}` )
-  module.exports.log( `Channel closed - current count now ${channelcount} total channels this session ${totalcount}` )
+
+  const score = ( d.stats.in["count"] / mstimeout * 20 ).toFixed( 2 )
+  let scoremsg = ` Score: ${ score }`
+
+  // Colour based on score: red, yellow, green
+  if( 0.25 >= score ) scoremsg = "\x1B[31m" + scoremsg
+  else if( 0.7 >= score ) scoremsg = "\x1B[33m" + scoremsg
+  else scoremsg = "\x1B[32m" + scoremsg
+  scoremsg += "\x1B[37m"
+
+  module.exports.log( `Expected number of packets: ${ Math.round( mstimeout / 20 ) }, Received: ${ d.stats.in[ "count" ] },` + scoremsg )
+  module.exports.log( `Channel closed - current count now ${ channelcount } total channels this session ${ totalcount }` )
 }
 
 module.exports.totalchannelcount = () => {

package/test/interface/rtpproxyserver.js

@@ -673,4 +673,21 @@ describe( "rtpproxy server", function() {
     
 
   } )
+  it( "Ensure connection stays open with 0 channel in listen mode", async () => {
+
+    const ourport = getnextport()
+    prtp.server.clearnodes()
+    const p = await prtp.proxy.listen( undefined, "127.0.0.1", ourport )
+    const ournode = await prtp.node.connect( ourport, "127.0.0.1" )
+
+
+    const chnl = await prtp.openchannel()
+    await new Promise( ( resolve ) => { setTimeout( () => resolve(), 100 ) } )
+    await chnl.close()
+    const chnl2 = await prtp.openchannel()
+    await chnl2.close()
+    await new Promise( ( resolve ) => { setTimeout( () => resolve(), 100 ) } )
+    ournode.destroy()
+    p.destroy()
+  } )
 } )