@babblevoice/babble-drachtio-callmanager 2.3.27 → 2.3.28

package/README.md

@@ -37,7 +37,8 @@ const r = new Registrar( {
   "staletime": 180, /* number of seconds we consider a client stale if we don't hear a response from an OPTIONS or REGISTER ping */
   "expires": 3600, /* default expires */
   "minexpires": 3600, /* Force the client with 423 to extend expires to this amount - conflicts with regping */
-  "userlookup": passwordLookup
+  "userlookup": passwordLookup,
+  "forcerport": true /* when sending invite - request rport */
 } )
 
 

package/lib/call.js

@@ -2686,6 +2686,9 @@ class call {
    * @param { object } [ channeldef ]
    */
   async #openrelatedchannel( channeldef ) {
+
+    if( this.channels.audio ) return
+
     const relatedcall = this.other
     /* TODO: this is a hack. projectrtp has become too complicated with both a listen and connect 
     mechanism. This is causing problems in code like this. There is no interface to 
@@ -2858,44 +2861,6 @@ class call {
     return { user, realm }
   }
 
-  /**
-   * Some phones require a NOTIFY to complete the auto-answer process - send it here
-   * @param { object } res
-   */
-  #notifytalk( res ) {
-
-    if( 180 != res.status && 183 != res.status ) return
-    if( !this.options.autoanswer ) return
-
-    console.log("res", res)
-    const opts = {
-      "method": "NOTIFY",
-      "headers": {
-        "Event": "talk",
-        "Subscription-State": "terminated;reason=noresource",
-        "Allow-Events": "talk, hold, conference, presence, as-feature-event, dialog, line-seize, call-info, sla, include-session-description, presence.winfo, message-summary, refer",
-        "Content-Length": "0",
-        "Call-ID": res.getParsedHeader( "call-id" ),
-        "To": res.get( "to" ),
-        "From": res.get( "from" ),
-      }
-    }
-
-    console.log(opts)
-
-    callmanager.options.srf.request( this.options.contact + this.options.contactparams, opts, ( err, req ) => {
-      if( err ) {
-        console.error( err )
-        return
-      }
-
-      // req is the SIP request that went out over the wire
-      req.on( "response", (/*res*/) => {
-        //console.log(`received ${res.status} response to our OPTIONS request`)
-      } )
-    } )
-  }
-
   /**
    * 
    * @param { string } contactstr
@@ -2907,9 +2872,11 @@ class call {
     if( !this.options.contactparams ) this.options.contactparams = ""
     if( true === this.options.autoanswer ) {
       this.options.headers[ "Call-Info" ] = `<sip:${parts.host}>;answer-after=0`
+      this.options.headers[ "Alert-Info" ] = "auto-answer"
       this.options.contactparams += ";intercom=true"
     } else if ( "number" == typeof this.options.autoanswer ) {
       this.options.headers[ "Call-Info" ] = `<sip:${parts.host}>;answer-after=${this.options.autoanswer}`
+      this.options.headers[ "Alert-Info" ] = "auto-answer"
       this.options.contactparams += ";intercom=true"
     }
   }
@@ -3083,8 +3050,6 @@ class call {
             await newcall._onearly()
           }
 
-          newcall.#notifytalk( res )
-
           if( newcall.canceled ) {
             newcall.hangup()
           }

package/lib/sdp.js

@@ -691,10 +691,30 @@ class sdp {
 
     if( "ilbc" in o && 8000 == o.ilbc.rate ) {
       this.#dynamicpts.setdynamicpt( "ilbc", "ilbc", o.ilbc.payload )
+
+      const m = this.sdp.media.find( mo => "audio" === mo.type )
+      if( m ) {
+        // @ts-ignore
+        const ilbcindex = m.payloads.indexOf( prtpcodecpts.ilbc )
+        if( -1 !== ilbcindex ) {
+          // @ts-ignore
+          m.payloads.splice( ilbcindex, 1, o.ilbc.payload )
+        }
+      }
     }
 
     if( "rfc2833" in o && 8000 == o.rfc2833.rate ) {
       this.#dynamicpts.setdynamicpt( "2833", "telephone-event", o.rfc2833.payload )
+
+      const m = this.sdp.media.find( mo => "audio" === mo.type )
+      if( m ) {
+        // @ts-ignore
+        const televindex = m.payloads.indexOf( prtpcodecpts[ "2833" ] )
+        if( -1 !== televindex ) {
+          // @ts-ignore
+          m.payloads.splice( televindex, 1, o.rfc2833.payload )
+        }
+      }
     }
 
     return this

package/package.json

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

package/test/interface/sdp.js

@@ -814,7 +814,7 @@ o=- \\d+ 0 IN IP4 127.0.0.1
 s=project
 c=IN IP4 127.0.0.1
 t=0 0
-m=audio 0 RTP/AVP 97 101
+m=audio 0 RTP/AVP 110 127
 a=rtpmap:110 ilbc/8000
 a=rtpmap:127 telephone-event/8000
 a=fmtp:110 mode=20
@@ -898,4 +898,33 @@ a=rtpmap:127 telephone-event/8000
     expect( media.direction ).to.be.undefined
   } )
 
+  it( "receive sdp send sdp ilbc", async () => {
+    const polysdp = `v=0
+o=- 1699618792 1699618792 IN IP4 82.19.206.102
+s=Polycom IP Phone
+c=IN IP4 82.19.206.102
+t=0 0
+a=sendrecv
+m=audio 63450 RTP/AVP 110 127
+a=rtpmap:110 iLBC/8000
+a=fmtp:110 mode=20
+a=rtpmap:127 telephone-event/8000
+`.replace( /\r\n/g, "\n" ).replace( /\n/g, "\r\n" )
+
+    const sdpobj = sdp.create( polysdp )
+
+    sdpobj.select( sdpobj.intersection( "g722 pcma pcmu ilbc", true ) )
+
+    const respsdp = sdp.create()
+      .addcodecs( sdpobj.selected.name )
+      .setconnectionaddress( "1.1.1.1" )
+      .setaudioport( 10000 )
+      .setdynamepayloadtypes( sdpobj )
+
+    const outsdpstring = respsdp.toString()
+
+    expect( outsdpstring ).include( outsdpstring, "m=audio 10000 RTP/AVP 110" )
+    expect( outsdpstring ).include( outsdpstring, "a=rtpmap:110 ilbc/8000" )
+
+  } )
 } )