@babblevoice/babble-drachtio-callmanager 1.1.0 → 1.1.3

package/lib/call.js

@@ -930,13 +930,14 @@ class call {
         alegremotesdp = sdpgen.create( this.parent._req.msg.body )
       }
 
-      this.parent.selectedcodec = this.selectedcodec = this.sdp.remote.intersection(
+      this.selectedcodec = this.sdp.remote.intersection(
         alegremotesdp.intersection( this.options.preferedcodecs ), true )
 
-      if( "" == this.selectedcodec ) {
+      if( this.selectedcodec ) {
+        this.parent.selectedcodec = this.selectedcodec
+      } else {
         /* Ok - transcode */
         this.selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
-        this.parent.selectedcodec = this.options.preferedcodecs
         if( "" == this.selectedcodec || "" == this.parent.selectedcodec ) {
           return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
         }
@@ -1875,17 +1876,15 @@ class call {
   */
   static _createchannelremotedef( address, port, codec ) {
     return {
-      "remote": {
-        "address": address,
-        "port": port,
-        "codec": codec
-        /*
-        dtls:{
-          fingerprint: "",
-          setup: ""
-        }
-        */
+      "address": address,
+      "port": port,
+      "codec": codec
+      /*
+      dtls:{
+        fingerprint: "",
+        setup: ""
       }
+      */
     }
   }
 
@@ -1978,12 +1977,10 @@ class call {
 
     this._sethangupcause( src, reason )
 
-    let audiochannel = this.channels.audio
-    this.channels.audio = false
     /* flag destroyed so when we receive our close event we know what to do */
     this.destroyed = true
-    if( audiochannel ) {
-      audiochannel.close()
+    if( this.channels.audio ) {
+      this.channels.audio.close()
       this._timers.cleanup = setTimeout( () => {
         console.error( "Timeout waiting for channel close, cleaning up anyway", this.uuid )
         this._cleanup() 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/babble-drachtio-callmanager",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@babblevoice/babble-drachtio-auth": "^1.0.0",
+    "@babblevoice/babble-drachtio-auth": "^1.0.1",
     "chai": "^4.3.4",
     "drachtio-srf": "^4.4.47",
     "mocha": "^9.2.2",

package/test/interface/sdp.js

@@ -2,6 +2,7 @@
 
 const expect = require( "chai" ).expect
 const sdp = require( "../../lib/sdp.js" )
+const call = require( "../../lib/call.js" )
 
 describe( "sdp", function() {
 
@@ -293,4 +294,40 @@ a=ssrc:2706351154 label:83ac3abd-cc86-427a-9cb7-ebac0c73964a`.replace(/(\r\n|\n|
     expect( oursdp.sdp.media[ 0 ].candidates[ 0 ].type ).to.equal( "host" )
     expect( oursdp.sdp.media[ 0 ].candidates[ 0 ].generation ).to.equal( 0 )
   } )
+
+  it( `sdp pcma real life sdp avon`, async function() {
+  const testsdp = `v=0
+o=MTLSBC 1657399906 1657399907 IN IP4 213.166.4.136
+s=SIP Call
+c=IN IP4 213.166.4.136
+t=0 0
+a=sendrecv
+m=audio 48380 RTP/AVP 8
+a=rtpmap:8 PCMA/8000`
+
+    let oursdp = sdp.create( testsdp )
+    let selectedcodec = oursdp.intersection( "g722 ilbc pcmu pcma", true )
+    expect( selectedcodec ).to.equal( "pcma" )
+
+  } )
+
+  it( `sdp pcma real life sdp getautdio avon`, async function() {
+    const testsdp = `v=0
+o=MTLSBC 1657399906 1657399907 IN IP4 213.166.4.136
+s=SIP Call
+c=IN IP4 213.166.4.136
+t=0 0
+a=sendrecv
+m=audio 48380 RTP/AVP 8
+a=rtpmap:8 PCMA/8000`
+
+    let oursdp = sdp.create( testsdp )
+    let remoteaudio = oursdp.getaudio()
+
+    let def = call._createchannelremotedef( remoteaudio.address, remoteaudio.port, remoteaudio.audio.payloads[ 0 ] )
+
+    expect( def.address ).to.equal( "213.166.4.136" )
+    expect( def.port ).to.equal( 48380 )
+    expect( def.codec ).to.equal( 8 )
+  } )
 } )