@babblevoice/babble-drachtio-callmanager 1.6.16 → 1.6.18

package/lib/call.js

@@ -1010,7 +1010,9 @@ class call {
       channeldef = call._createchannelremotedef( target.address, target.port, target.audio.payloads[ 0 ] ) 
     }
    
-    this.channels.audio = await projectrtp.openchannel( channeldef, this._handlechannelevents.bind( this ) )
+    const other = this.other
+    if( other && other.channels.audio ) this.channels.audio = await other.channels.audio.openchannel( channeldef, this._handlechannelevents.bind( this ) )
+    else this.channels.audio = await projectrtp.openchannel( channeldef, this._handlechannelevents.bind( this ) )
 
     this.sdp.local = sdpgen.create()
               .addcodecs( this.selectedcodec )
@@ -1022,7 +1024,7 @@ class call {
     }
 
     if( this._iswebrtc ) {
-      let ch = this.channels.audio
+      const ch = this.channels.audio
       this.sdp.local.addssrc( ch.local.ssrc )
                     .secure( ch.local.dtls.fingerprint, channeldef.remote.dtls.mode )
                     .addicecandidates( ch.local.address, ch.local.port, ch.local.icepwd )
@@ -2548,7 +2550,8 @@ class call {
     if( newcall.options.late ) {
       newcall.options.noAck = true /* this is a MUST for late negotiation */
     } else {
-      newcall.channels.audio = await projectrtp.openchannel( newcall._handlechannelevents.bind( newcall ) )
+      if( options.parent && options.parent.channels.audio ) newcall.channels.audio = await options.parent.channels.audio.openchannel( newcall._handlechannelevents.bind( newcall ) )
+      else newcall.channels.audio = await projectrtp.openchannel( newcall._handlechannelevents.bind( newcall ) )
 
       newcall.sdp.local = sdpgen.create().addcodecs( newcall.options.preferedcodecs )
       newcall.sdp.local.setaudioport( newcall.channels.audio.local.port )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/babble-drachtio-callmanager",
-  "version": "1.6.16",
+  "version": "1.6.18",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {

package/test/interface/call.js

@@ -1020,7 +1020,7 @@ describe( "call object", function() {
 
   it( `Create a call and mock rtpengine and ensure we receive events`, async function() {
     new srf.srfscenario( {} )
-    let rtpserver = callmanager.projectrtp.proxy.listen()
+    let rtpserver = await callmanager.projectrtp.proxy.listen()
 
     let connection = net.createConnection( 9002, "127.0.0.1" )
       .on( "error", ( e ) => {
@@ -1041,13 +1041,13 @@ describe( "call object", function() {
           setTimeout( () => connection.write( projectrtpmessage.createmessage( {"local":{"port":10008,"dtls":{"fingerprint":"Some fingerprint","enabled":false},"address":"192.168.0.141"},"id": msg.id, "uuid":"6d8ba7bb-44b9-4989-9aaf-5d938b496c49","action":"open","status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d5c94"}} ) ), 2 )
         } else if( "close" == msg.channel ) {
           connection.write( projectrtpmessage.createmessage( {"id": msgid,"uuid":"6d8ba7bb-44b9-4989-9aaf-5d938b496c49","action":"record","file":"/tmp/voicemail/recording/03039cdb-1949-407d-91d6-15ba6894955c.wav","event":"finished.channelclosed","filesize":160684,"emailed":true,"transcription":"test recording for voicemail","status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d5c94"}} ) )
-          connection.write( projectrtpmessage.createmessage( {"id": msgid,"uuid":"6d8ba7bb-44b9-4989-9aaf-5d938b496c49","action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}}} ) )
+          connection.write( projectrtpmessage.createmessage( {"id": msgid,"uuid":"6d8ba7bb-44b9-4989-9aaf-5d938b496c49","action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}},"status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d5c94"}} ) )
         }
       } )
     } )
 
     /* ensure we are connected */
-    await new Promise( ( r ) => setTimeout( () => r(), 100 ) )
+    await new Promise( ( resolve ) => setTimeout( () => resolve(), 100 ) )
 
     /* this flow mimicks the flow associated with a voicemail being left */
     let c = await call.newuac( {
@@ -1062,7 +1062,6 @@ describe( "call object", function() {
     expect( ev.event ).to.equal( "end" )
     expect( ev.reason ).to.equal( "completed" )
 
-
     setTimeout( () => connection.write( projectrtpmessage.createmessage( {"id": msgid,"uuid":"6d8ba7bb-44b9-4989-9aaf-5d938b496c49","action":"play","event":"start","reason":"new","status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d5c94"}} ) ) )
     setTimeout( () => connection.write( projectrtpmessage.createmessage( {"id": msgid,"uuid":"6d8ba7bb-44b9-4989-9aaf-5d938b496c49","action":"play","event":"end","reason":"completed","status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d5c94"}} ) ) )
     c.channels.audio.play( { "files": [ { "wav": "/voicemail/boing.wav", "alt": "" } ] } )
@@ -1071,7 +1070,6 @@ describe( "call object", function() {
     expect( ev.event ).to.equal( "end" )
     expect( ev.reason ).to.equal( "completed" )
 
-
     setTimeout( () => connection.write( projectrtpmessage.createmessage( {"id": msgid,"uuid":"6d8ba7bb-44b9-4989-9aaf-5d938b496c49","action":"record","file":"/tmp/voicemail/recording/03039cdb-1949-407d-91d6-15ba6894955c.wav","event":"recording","status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d5c94"}} ) ), 5 )
     
     c.channels.audio.record( {
@@ -1099,7 +1097,7 @@ describe( "call object", function() {
     expect( ev.filesize ).to.equal( 160684 )
 
     connection.destroy()
-    rtpserver.destroy()
+    await rtpserver.destroy()
   } )
 
   it( `set get moh`, async function() {

package/test/interface/callmanager.js

@@ -64,7 +64,7 @@ describe( "callmanager", function() {
       "srf": { "use": ( method, asynccb ) => {} }
     }
 
-    let rtpserver = callmanager.projectrtp.proxy.listen()
+    let rtpserver = await callmanager.projectrtp.proxy.listen()
     let c = await callmanager.callmanager( options )
 
     let closing = false

package/test/interface/early.js

@@ -38,7 +38,7 @@ describe( "call early", function() {
 
     /* Setup the mock RTP server */ 
     let srfscenario = new srf.srfscenario()
-    let rtpserver = callmanager.projectrtp.proxy.listen()
+    let rtpserver = await callmanager.projectrtp.proxy.listen()
 
     let connection = net.createConnection( 9002, "127.0.0.1" )
       .on( "error", ( e ) => {
@@ -87,7 +87,8 @@ describe( "call early", function() {
             }
             opencount++
           } else if ( "close" === msg.channel ) {
-            connection.write( projectrtpmessage.createmessage( {"id": msg.id,"uuid":msg.uuid,"action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}}} ) )
+            connection.write( projectrtpmessage.createmessage( {"id": msg.id,"uuid":msg.uuid,"action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}}, "status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}
+          } ) )
           } else if ( "mix" === msg.channel ) {
             mixing = true
           }
@@ -175,7 +176,7 @@ a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
 
     /* Setup the mock RTP server */ 
     let srfscenario = new srf.srfscenario( { savpf: true } )
-    let rtpserver = callmanager.projectrtp.proxy.listen()
+    let rtpserver = await callmanager.projectrtp.proxy.listen()
 
     let connection = net.createConnection( 9002, "127.0.0.1" )
       .on( "error", ( e ) => {
@@ -224,7 +225,7 @@ a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
             }
             opencount++
           } else if ( "close" === msg.channel ) {
-            connection.write( projectrtpmessage.createmessage( {"id": msg.id,"uuid":msg.uuid,"action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}}} ) )
+            connection.write( projectrtpmessage.createmessage( {"id": msg.id,"uuid":msg.uuid,"action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}}, "status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}}))
           } else if ( "mix" === msg.channel ) {
             mixing = true
           }
@@ -328,7 +329,7 @@ a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
 
     /* Setup the mock RTP server */ 
     let srfscenario = new srf.srfscenario( { savpf: true } )
-    let rtpserver = callmanager.projectrtp.proxy.listen()
+    let rtpserver = await callmanager.projectrtp.proxy.listen()
 
     let connection = net.createConnection( 9002, "127.0.0.1" )
       .on( "error", ( e ) => {
@@ -377,7 +378,7 @@ a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
             }
             opencount++
           } else if ( "close" === msg.channel ) {
-            connection.write( projectrtpmessage.createmessage( {"id": msg.id,"uuid":msg.uuid,"action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}}} ) )
+            connection.write( projectrtpmessage.createmessage( {"id": msg.id,"uuid":msg.uuid,"action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}}, "status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}} ) )
           } else if ( "mix" === msg.channel ) {
             mixing = true
           }