@babblevoice/projectrtp 2.4.16 → 2.5.20

package/test/interface/projectrtpdtmf.js

@@ -23,6 +23,21 @@ function sendpayload( sendtime, pk, dstport, server ) {
   }, sendtime )
 }
 
+/**
+ * Limitation of not parsing ccrc.
+ * @param { Buffer } packet
+ * @return { object }
+ */
+function parsepk( packet ) {
+  return {
+    sn: packet.readUInt16BE( 2 ),
+    ts: packet.readUInt32BE( 4 ),
+    pt: packet.readUInt8( 1 ) & 0x7f,
+    ssrc: packet.readUInt32BE( 8 ),
+    payload: new Uint8Array( packet.slice( 12 ) )
+  }
+}
+
 /* helper functions */
 function sendpk( sn, ts, sendtime, dstport, server, pt = 0, ssrc ) {
 
@@ -253,6 +268,74 @@ describe( "dtmf", function() {
     expect( dtmfpkcount ).to.equal( 3*3 )
   } )
 
+  it( "2 channels mixing and request rtp server to send 2833 to one with dynamic payloadtype", async function() {
+
+    /* create our RTP/UDP endpoint */
+    const clienta = dgram.createSocket( "udp4" )
+    const clientb = dgram.createSocket( "udp4" )
+
+    const rfc2833pt = 44
+
+    let dtmfpkcount = 0
+    clienta.on( "message", function( msg ) {
+      if( rfc2833pt == ( 0x7f & msg [ 1 ] ) ) {
+        dtmfpkcount++
+      } else {
+        expect( msg.length ).to.equal( 172 )
+        expect( 0x7f & msg [ 1 ] ).to.equal( 0 )
+      }
+    } )
+
+    clientb.on( "message", function( msg ) {
+      if( 101 == ( 0x7f & msg [ 1 ] ) ) {
+        expect( true ).to.equal( false ) //here = bad
+        dtmfpkcount++
+      }
+      clientb.send( msg, channelb.local.port, "localhost" )
+    } )
+
+    this.timeout( 3000 )
+    this.slow( 2500 )
+
+    clienta.bind()
+    await new Promise( ( resolve ) => { clienta.on( "listening", () => resolve()  ) } )
+    clientb.bind()
+    await new Promise( ( resolve ) => { clientb.on( "listening", () => resolve()  ) } )
+
+    const ouraport = clienta.address().port
+    const ourbport = clientb.address().port
+
+    let done
+    const finished = new Promise( ( r ) => { done = r } )
+
+    const channela = await projectrtp.openchannel( { "remote": { "address": "localhost", "port": ouraport, "codec": 0, rfc2833pt } }, function( d ) {
+      if( "close" === d.action ) channelb.close()
+    } )
+
+    const channelb = await projectrtp.openchannel( { "remote": { "address": "localhost", "port": ourbport, "codec": 0 } }, function( d ) {
+      if( "close" === d.action ) done()
+    } )
+
+    expect( channela.mix( channelb ) ).to.be.true
+
+    /* send a packet every 20mS x 70 */
+    for( let i = 0;  50 > i; i ++ ) {
+      sendpk( i, i*160, i*20, channela.local.port, clienta )
+    }
+
+    await new Promise( ( resolve ) => { setTimeout( () => resolve(), 400 ) } )
+    channela.dtmf( "*9F" )
+    await new Promise( ( resolve ) => { setTimeout( () => resolve(), 800 ) } )
+    channela.close()
+
+    await finished
+
+    clienta.close()
+    clientb.close()
+
+    expect( dtmfpkcount ).to.equal( 3*3 )
+  } )
+
   it( "3 channels mixing and request rtp server to send 2833 to one", async function() {
 
     /* create our RTP/UDP endpoint */
@@ -262,11 +345,12 @@ describe( "dtmf", function() {
 
     let dtmfpkcount = 0
     clienta.on( "message", function( msg ) {
-      if( 101 == ( 0x7f & msg [ 1 ] ) ) {
+      const pk = parsepk( msg )
+      if( 101 == pk.pt ) {
         dtmfpkcount++
       } else {
         expect( msg.length ).to.equal( 172 )
-        expect( 0x7f & msg [ 1 ] ).to.equal( 0 )
+        expect( pk.pt ).to.equal( 0 )
       }
     } )
 

package/test/interface/projectrtpmix.js

@@ -904,8 +904,7 @@ describe( "channel mix", function() {
     expect( endpointbpkcountzero ).to.be.within( 65, 75 )
     expect( endpointcpkcountzero ).to.be.within( 65, 75 )
     expect( endpointapkcountnotzero ).to.be.within( 4, 12 )
-    expect( endpointbpkcountnotzero ).to.be.within( 4
-      , 12 )
+    expect( endpointbpkcountnotzero ).to.be.within( 4, 12 )
     expect( endpointcpkcountnotzero ).to.be.below( 2 )
 
     await finished

package/test/interface/rtpproxymultinode.js

@@ -6,7 +6,7 @@ const mocknode = require( "../mock/mocknode" )
 
 describe( "rtpproxy multi node", function() {
 
-  it( "2 node simple mix", async function() {
+  it.skip( "2 node simple mix", async function() {
     
     const actual = { "mix": 0, "open": 0, "unmix": 0, "close": 0, "remote": 0 }
     /*
@@ -173,7 +173,7 @@ describe( "rtpproxy multi node", function() {
 
   } )
 
-  it( "2 node 2 channel simple mix rtp server listening on same node", async function() {
+  it.skip( "2 node 2 channel simple mix rtp server listening on same node", async function() {
     
     /*
       We need to check that the nodes are maintained when using the same rtp server.
@@ -316,7 +316,7 @@ describe( "rtpproxy multi node", function() {
 
   } )
 
-  it( "2 node 2 channel connect to same rtp server not broken", async function() {
+  it.skip( "2 node 2 channel connect to same rtp server not broken", async function() {
 
     /*
       We need to check that the nodes are maintained when using the same rtp server.
@@ -403,7 +403,7 @@ describe( "rtpproxy multi node", function() {
     prtp.proxy.clearnodes()
   } )
 
-  it( "2 node 1 channel on one, 2 channels other", async function() {
+  it.skip( "2 node 1 channel on one, 2 channels other", async function() {
 
     this.timeout( 3000 )
     this.slow( 2500 )
@@ -587,7 +587,7 @@ describe( "rtpproxy multi node", function() {
 
   } )
 
-  it( "3 node 1 channel each, close main node", async function() {
+  it.skip( "3 node 1 channel each, close main node", async function() {
 
     this.timeout( 3000 )
     this.slow( 2500 )