@babblevoice/babble-drachtio-callmanager 2.3.22 → 2.3.24

package/lib/call.js

@@ -334,6 +334,8 @@ class call {
     * @property { boolean } [ rfc2833 ] if set to true enable 2833
     * @property { string } [ display ] how the user should be displayed
     * @property { Array } [ headers ]
+    * @property { string } [ contactparams] 
+    * @property { number | true } [ autoanswer ] autoanswer true or delay
     * @property { number } [ uactimeout ] timeout in mS
     * @property { boolean } [ late ] - do we use late negotiation
     * @property { boolean } [ noAck ] do not use - converts our options into Drachtio options
@@ -1650,7 +1652,7 @@ class call {
 
   /**
    * If we have been placed on hold (and it has been neotiated) then configure audio to match.
-   * @param { "inactive"|"sendonly" } direction
+   * @param { "inactive"|"recvonly" } direction - from the other end
    * @returns { Promise } resolves on timeout or when unmix happens
    * @private
    */
@@ -1662,7 +1664,7 @@ class call {
     const ourpromises = []
 
     const d = { "send": false, "recv": false }
-    if( "sendonly" == direction ) d.send = true
+    if( "recvonly" == direction ) d.send = true
 
     if( this.channels.audio ) {
       this.channels.audio.unmix()
@@ -1859,6 +1861,53 @@ class call {
     return { media, ip }
   }
 
+  /**
+   * We receive a modify to a dialgue (re-invite) and it looks like a hold
+   * @param { string } direction 
+   * @param { object } res 
+   * @returns { boolean }
+   */
+  #handlehold( direction, res ) {
+
+    if(  "inactive" !== direction && "sendonly" !== direction ) return false
+
+    if( "sendonly" === direction ) this._hold( "recvonly" )
+    else this._hold( direction )
+
+    res.send( 200, {
+      "headers": {
+        "Subject" : "Call on hold",
+        "User-Agent": "project",
+        "Allow": "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY",
+        "Supported": "replaces"
+      },
+      "body": this.sdp.local.toString()
+    } )
+
+    return true
+  }
+
+  /**
+   * We erceive a request to unhold.
+   * @param { string } direction 
+   * @param { object } res 
+   * @returns { boolean }
+   */
+  #handleoffhold( direction, res ) {
+    if( "sendrecv" !== direction ) return false
+
+    this._unhold()
+    res.send( 200, {
+      "headers": {
+        "Subject" : "Call off hold",
+        "User-Agent": "project"
+      },
+      "body": this.sdp.local.toString()
+    } )
+
+    return true
+  }
+
   /**
     Add events for the drachtio dialog object that this object requires.
     @private
@@ -1927,36 +1976,18 @@ class call {
       sendonly when placing the call on hold. It didn't change the connection IP (although it did set the rtcp connection ip to 0.0.0.0!). */
       let d = sdp.media.direction
       if( "0.0.0.0" === sdp.ip ) d = "inactive"
-      if( ( "inactive" === d || "sendonly" === d ) && !this.state.held ) {
-        this._hold( d )
-        res.send( 200, {
-          "headers": {
-            "Subject" : "Call on hold",
-            "User-Agent": "project",
-            "Allow": "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY",
-            "Supported": "replaces"
-          },
-          "body": this.sdp.local.toString()
-        } )
-      } else if( "inactive" !== sdp.media.direction && "sendonly" !== sdp.media.direction && "0.0.0.0" !== sdp.ip && this.state.held ) {
-        this._unhold()
-        res.send( 200, {
-          "headers": {
-            "Subject" : "Call off hold",
-            "User-Agent": "project"
-          },
-          "body": this.sdp.local.toString()
-        } )
-      } else {
-        /* Unknown - but respond to keep the call going */
-        res.send( 200, {
-          "headers": {
-            "Subject" : "Ok",
-            "User-Agent": "project"
-          },
-          "body": this.sdp.local.toString()
-        } )
-      }
+      if( this.#handlehold( d, res ) ) return
+      if( this.#handleoffhold( d, res ) ) return
+
+      /* Unknown - but respond to keep the call going */
+      res.send( 200, {
+        "headers": {
+          "Subject" : "Ok",
+          "User-Agent": "project"
+        },
+        "body": this.sdp.local.toString()
+      } )
+
     } )
 
 
@@ -2829,19 +2860,19 @@ class call {
 
   /**
    * 
-   * @param { object } options 
-   * @param { object } u 
+   * @param { string } contactstr
    */
-  #configautoanswerfornewuac( options, u ) {
+  #configautoanswerfornewuac( contactstr ) {
 
-    if( !options.contactparams ) options.contactparams = ""
+    const parts = parseuri( contactstr )
 
-    if( true === options.autoanswer ) {
-      this.options.headers[ "Call-Info" ] = `<sip:${u.user}@${u.realm}>;answer-after=0`
-      options.contactparams += ";intercom=true"
-    } else if ( "number" == typeof options.autoanswer ) {
-      this.options.headers[ "Call-Info" ] = `<sip:${u.user}@${u.realm}>;answer-after=${options.autoanswer}`
-      options.contactparams += ";intercom=true"
+    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.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.contactparams += ";intercom=true"
     }
   }
 
@@ -2855,6 +2886,7 @@ class call {
         this.propagate.headers[ header ] = options.headers[ header ]
       }
     }
+    if ( options.autoanswer ) this.propagate.autoanswer = options.autoanswer
   } 
 
   /**
@@ -2867,6 +2899,9 @@ class call {
           this.options.headers[ header ] = this.parent.propagate.headers[ header ]
         }
       }
+      if( "autoanswer" in this.parent.propagate ) {
+        this.options.autoanswer = this.parent.propagate.autoanswer
+      }
     }
   }
 
@@ -2891,7 +2926,7 @@ class call {
   @param { string } [ options.auth.password ] - If SIP auth required password
   @param { object } [ options.headers ] - Object containing extra sip headers required.
   @param { object } [ options.uactimeout ] - override the deault timeout
-  @param { boolean | number } [ options.autoanswer ] - if true add call-info to auto answer, if number delay to add
+  @param { true | number } [ options.autoanswer ] - if true add call-info to auto answer, if number delay to add
   @param { boolean } [ options.late ] - late negotiation
   @param { boolean } [ options.privacy ] - sets the privacy
   @param { entity } [ options.entity ] - used to store this call against and look up a contact string if not supplied.
@@ -2940,9 +2975,7 @@ class call {
 
     if( options.privacy ) this.privacy = true
 
-    const u = newcall.#configcalleridfornewuac( options )
-    newcall.#configautoanswerfornewuac( options, u )
-
+    newcall.#configcalleridfornewuac( options )
 
     // Polycom
     // Alert-Info: <https://www.babblevoice.com/polycom/LoudRing.wav>
@@ -2956,12 +2989,17 @@ class call {
     newcall.options.headers = tmpheaders
     newcall.import()
     
+    newcall.#configautoanswerfornewuac( options.contact )
+
+    newcall.options.headers[ "Allow-Events" ] = "talk, hold, presence, as-feature-event, dialog, call-info, sla, include-session-description, message-summary, refer"
+    newcall.options.headers[ "Allow" ] = "INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFY, PUBLISH, SUBSCRIBE"
+    
     newcall.#confignetwork( options )
     await newcall.#openchannelsfornewuac()
 
     let newdialog
     try {
-      newdialog = await callmanager.options.srf.createUAC( options.contact + options.contactparams, newcall.options, {
+      newdialog = await callmanager.options.srf.createUAC( options.contact + newcall.options.contactparams, newcall.options, {
         cbRequest: ( err, req ) => {
 
           if( !req ) {

package/package.json

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

package/test/interface/call.js

@@ -858,7 +858,6 @@ describe( "call object", function() {
       "late": true
     }
 
-    const earlycallbackcalled = false
     const c = await call.newuac( options )
 
     /* mock */
@@ -1015,7 +1014,7 @@ describe( "call object", function() {
     const c = await call.newuac( options )
 
     let eventfired = false
-    c.on( "call.pick", ( callobject ) => {
+    c.on( "call.pick", ( /*callobject*/ ) => {
       eventfired = true
     } )