@babblevoice/babble-drachtio-callmanager 3.7.1 → 3.7.3

package/index.js

@@ -8,7 +8,7 @@ const default_options = {
   "preferedcodecs": "g722 ilbc pcmu pcma",
   //"transcode": true, - this never made it into the software - TODO
   "uactimeout": 30000, /* timeout when calling a client */
-  "seexpire": 120000, /* session expires timeout mS */
+  "seexpire": 1800*1000, /* session expires timeout mS recomended in RFC 4028 - 30 minutes */
   "rfc2833": true,  /* Enable RFC 2833 - DTMF */
   "late": false,  /* Late negotiation */
   "registrar": false, /* our registrar object or falsey */

package/lib/call.js

@@ -14,6 +14,7 @@ const net = require( "net" )
 const parseurire = /^(sips?):(?:([^\s>:@]+)(?::([^\s@>]+))?@)?([\w\-.]+)(?::(\d+))?((?:;[^\s=?>;]+(?:=[^\s?;]+)?)*)(?:\?(([^\s&=>]+=[^\s&=>]+)(&[^\s&=>]+=[^\s&=>]+)*))?$/
 const parseuriparamsre = /([^;=]+)(=([^;=]+))?/g
 const parseuriheadersre = /[^&=]+=[^&=]+/g
+const sessionexpirevaluere = /^(\d+)(?:;refresher=(uac|uas))?$/
 
 function parseuri( s ) {
   if( "object" === typeof s )
@@ -153,6 +154,9 @@ let callmanager = {
 class call {
 
   #noack = false
+  #seexpire = callmanager.options.seexpire
+  #refresher = "uac"
+  #expirelasttouch = +new Date()
 
   /**
   * Construct our call object with all defaults, including a default UUID.
@@ -543,6 +547,10 @@ class call {
     return "uas"==this.type?"inbound":"outbound"
   }
 
+  /**
+   * 
+   * @param { object } startingpoint 
+   */
   #overridecallerid( startingpoint ) {
 
     if( this.options.callerid ) {
@@ -552,6 +560,10 @@ class call {
     }
   }
 
+  /**
+   * 
+   * @param { object } startingpoint 
+   */
   #overridecalledid( startingpoint ) {
     startingpoint.privacy = this.options.privacy
 
@@ -653,6 +665,10 @@ class call {
     this.#fromremoteheaders( startingpoint )
   }
 
+  /**
+   * 
+   * @returns { object }
+   */
   #callerid() {
     const startingpoint = {
       "name": "",
@@ -699,6 +715,10 @@ class call {
     return this.#callerid()
   }
 
+  /**
+   * 
+   * @returns { object }
+   */
   #calledid() {
     const startingpoint = {
       "name": "",
@@ -710,24 +730,7 @@ class call {
     }
 
     if( "uas" == this.type ) this.#calledidforuas( startingpoint )
-    else {
-      if( !this.options.partycalled ) this.#calledidforuac( startingpoint )
-
-      const other = this.other
-
-      if( other ) {
-        if( "uas" == other.type ) {
-          if( this.options.partycalled ) {
-            other.#calleridforuas( startingpoint )
-          } else {
-            other.#calledidforuas( startingpoint )
-          }
-        } else {
-          other.#calledidforuac( startingpoint )
-        }
-        other.#overridecalledid( startingpoint )
-      }
-    }
+    else if( !this.options.partycalled ) this.#calledidforuac( startingpoint )
 
     this.#overridecalledid( startingpoint )
 
@@ -735,11 +738,11 @@ class call {
   }
 
   /**
- * Returns the called object. i.e.
- * If we are inbound then this is the destination
- * If we are outbound then this is the entity we are calling
- * @returns { remoteid }
- */
+   * Returns the called object. i.e.
+   * If we are inbound then this is the destination
+   * If we are outbound then this is the entity we are calling
+   * @returns { remoteid }
+   */
   get calledid() {
     return this.#calledid()
   }
@@ -1306,7 +1309,7 @@ class call {
   async _onearlybridge() {
     if( this.destroyed ) return
 
-    this._addevents( this._dialog )
+    this.#addevents( this._dialog )
 
     this.sdp.remote = sdpgen.create( this._dialog.remote.sdp )
 
@@ -1392,7 +1395,7 @@ class call {
 
     this._dialog = await this._dialog.ack( this.sdp.local.toString() )
     this.established = true
-    this._addevents( this._dialog )
+    this.#addevents( this._dialog )
 
     await this.#answerparent()
 
@@ -1794,19 +1797,23 @@ class call {
         return
       }
 
+      const headers = {
+        "User-Agent": "project",
+        "Supported": "replaces, timer",
+        "Require": "timer",
+        "Session-Expires": `${this.#seexpire/1000};refresher=${this.#refresher}`
+      }
+
       const dialog = await callmanager.options.srf.createUAS( this._req, this._res, {
         localSdp: this.sdp.local.toString(),
-        headers: {
-          "User-Agent": "project",
-          "Supported": "replaces"
-        }
+        headers
       } )
 
       this.#setdialog( dialog )
       this.sip.tags.local = dialog.sip.localTag
       callstore.set( this )
 
-      this._addevents( this._dialog )
+      this.#addevents( this._dialog )
       this._em.emit( "call.answered", this )
       callmanager.options.em.emit( "call.answered", this )
 
@@ -2407,51 +2414,77 @@ class call {
   }
 
   /**
-    Add events for the drachtio dialog object that this object requires.
-    @private
+   * Allow a good margin of error - but hangup if we have disappeared
+   */
+  #hasseexpiredexpired() {
+
+    const now = +new Date()
+    if( ( now - this.#expirelasttouch ) > ( this.#seexpire * 2 ) ) {
+      this.hangup( hangupcodes.USER_GONE )
+      return true
+    }
+    return false
+  }
+
+  /**
+   * 
+   */
+  #checkthischannelforwebrtcdirection() {
+    if( this._iswebrtc && this.channels && this.channels.audio ) {
+      /* we are sending invite so we MUST offer be actpass */
+      this.channels.secure.audio.offer = true
+      this.sdp.local
+        .secure( this.channels.audio.local.dtls.fingerprint, this.#getsrtpsetup( this.channels.secure.audio ) )
+    }
+  }
+
+  /**
+   * Add events for the drachtio dialog object that this object requires.
+   * @param { object } dialog 
   */
-  _addevents( dialog ) {
+  #addevents( dialog ) {
 
     /* Drachtio doesn't appear to have finished SE support, i.e. it sends
     a regular INVITE when we set the Supported: timer and Session-Expires headers
     but it doesn't appear to indicate to us when it does fail. It most cases our
     RTP stall timer will kick in first, but if a call is placed on hold followed
-    by AWOL... */
+    by AWOL... My new startegy is we perform teh reinvite - if we are the refresher
+    which should refresh any timer in Drachtio - and we check for revites and timeouts. */
     this._timers.seinterval = setInterval( async () => {
 
       try {
-        if( this.destroyed ) {
-          /* this should be done - but we are still running */
+        if( this.destroyed || this.#hasseexpiredexpired() ) {
           clearInterval( this._timers.seinterval )
           return
         }
 
+        if( this.#refresher !== this.type ) return
         if( "function" != typeof dialog.request ) return
 
-        if( this._iswebrtc && this.channels && this.channels.audio ) {
-          /* we are sending invite so we MUST offer be actpass */
-          this.channels.secure.audio.offer = true
-          this.sdp.local
-            .secure( this.channels.audio.local.dtls.fingerprint, this.#getsrtpsetup( this.channels.secure.audio ) )
-        }
+        this.#checkthischannelforwebrtcdirection()
 
         const opts = {
-          "method": "INVITE",
-          "body": this.sdp.local.toString()
+          method: "INVITE",
+          body: this.sdp.local.toString(),
+          headers: this.options.headers
         }
   
         const res = await dialog.request( opts )
-          .catch( ( e ) => {
-            console.trace( e )
-            this.hangup( hangupcodes.USER_GONE )
-          } )
-  
-        if( !this.destroyed && 200 != res.msg.status ) {
+
+        if( this.destroyed ) return
+        if( 200 != res.msg.status ) {
           this.hangup( hangupcodes.USER_GONE )
+          return
         }
-      } catch( e ) { /* empty */ }
 
-    }, callmanager.options.seexpire )
+        this.#expirelasttouch = +new Date()
+
+      } catch( e ) {
+        console.trace( e )
+      }
+
+    }, this.#seexpire * 0.45 )
+    this.#expirelasttouch = +new Date()
 
     dialog.on( "destroy", ( /* req */ ) => {
       if( this._state._hangup ) return
@@ -2484,6 +2517,7 @@ class call {
 
     dialog.on( "modify", ( req, res ) => {
       //  The application must respond, using the res parameter provided.
+      this.#expirelasttouch = +new Date()
       if( "INVITE" !== req.msg.method ) return
 
       this.channels.secure.audio.reinvite = true
@@ -2515,6 +2549,7 @@ class call {
 
     dialog.on( "refer", async ( req, res ) => {
       try {
+        this.#expirelasttouch = +new Date()
         /*
           We only support the xfer of 2 legged calls. The xfered call will pick up
           the auth from the transferee. For example, inbound anonymous call, gets handled
@@ -3694,7 +3729,7 @@ class call {
    * @property { boolean } [ clicktocall ] - if set to true, will set autoanswer to true and swap the source and desination on caller ID, set to true for both caller and called
    * @property { boolean } [ partycalled ] - reverses the direction of the call from the invite, from the point of view of the called in a 3pcc context
    * @property { boolean } [ partycaller ] - reverses the direction of the call from the invite, from the point of view of the caller in a 3pcc context
-  * @property { boolean } [ late ] - late negotiation
+   * @property { boolean } [ late ] - late negotiation
    * @property { boolean } [ privacy ] - sets the privacy
    * @property { entity } [ entity ] - used to store this call against and look up a contact string if not supplied.
    * @property { object } [ entity ]
@@ -3786,6 +3821,8 @@ class call {
     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.options.headers[ "supported" ] = "timer, path, replaces"
+    newcall.options.headers[ "min-se" ] = "90"
+    newcall.options.headers[ "session-expires" ] = `${callmanager.options.seexpire/1000}`
     
     newcall.#confignetwork( options )
     await newcall.#openchannelsfornewuac()
@@ -3861,6 +3898,7 @@ class call {
       return newcall
     }
 
+    newcall.#parsesessionexpires( newdialog.res )
     newcall.parseallow( newdialog.res )
 
     newcall.#setdialog( newdialog )
@@ -3893,10 +3931,30 @@ class call {
     this.established = true
   }
 
+  /**
+   * 
+   * @param { object } req 
+   */
+  #parsesessionexpires( req ) {
+    if( !req ) return
+    const se = req.get( "Session-Expires" )
+    if( !se ) return
+
+    const results = se.match( sessionexpirevaluere )
+    let expiresin = parseInt( results[ 1 ] )
+
+    /* min and max values */
+    if( 90 > expiresin ) expiresin = 90
+    if( 3600 < expiresin ) expiresin = 3600
+    this.#seexpire = expiresin * 1000 /* mS */
+
+    if( results[ 2 ] ) this.#refresher = results[ 2 ]
+  }
+
   /**
    * Take as input a request or a response.
-   *
    * @param { object } req
+   * @private - apart from test
    */
   parseallow( req ) {
     if( !req || !req.get ) return
@@ -3928,6 +3986,7 @@ class call {
     const c = new call()
 
     c.type = "uas"
+    c.#refresher = "uas"
 
     /**
       @typedef { Object } source
@@ -3957,6 +4016,7 @@ class call {
     */
     c._res = res
 
+    c.#parsesessionexpires( req )
     c.parseallow( req )
 
     await callstore.set( c )

package/package.json

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