@babblevoice/babble-drachtio-callmanager 2.0.2 → 2.0.3

package/.eslintrc.js

@@ -0,0 +1,67 @@
+module.exports = {
+  "env": {
+    "browser": false,
+    "node": true,
+    "mocha": true,
+    "commonjs": true,
+    "es2021": true
+  },
+  "extends": [ "plugin:promise/recommended", "eslint:recommended" ],
+  "overrides": [
+  ],
+  "parserOptions": {
+    "ecmaVersion": "latest"
+  },
+  "ignorePatterns": [ "out" ],
+  "rules": {
+    "require-atomic-updates": [
+      "error"
+    ],
+    "no-invalid-this": [
+      "error"
+    ],
+    "no-useless-call": [
+      "error"
+    ],
+    "no-useless-return": [
+      "error"
+    ],
+    "no-var": [
+      "error"
+    ],
+    "prefer-const": [
+      "error"
+    ],
+    "complexity": [
+      "error",
+      10
+    ],
+    "max-depth": [
+      "error",
+      5
+    ],
+    "no-eval": [
+      "error"
+    ],
+    "indent": [
+      "error",
+      2
+    ],
+    "linebreak-style": [
+      "error",
+      "unix"
+    ],
+    "quotes": [
+      "error",
+      "double"
+    ],
+    "semi": [
+      "error",
+      "never"
+    ],
+    "yoda": [
+      "error",
+      "always"
+    ]
+  }
+}

package/index.js

@@ -1,5 +1,4 @@
 
-const assert = require( "assert" )
 const callmanager = require( "./lib/callmanager.js" )
 const store = require( "./lib/store.js" )
 
@@ -9,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 */
+  "seexpire": 120000, /* session expires timeout mS */
   "rfc2833": true,  /* Enable RFC 2833 - DTMF */
   "late": false,  /* Late negotiation */
   "registrar": false, /* our registrar object or falsey */
@@ -21,7 +20,7 @@ const default_options = {
 @returns { callmanager }
 */
 module.exports.callmanager = ( options ) => {
-  let ouroptions = { ...default_options, ...options }
+  const ouroptions = { ...default_options, ...options }
   return callmanager.callmanager( ouroptions )
 }
 
@@ -43,4 +42,4 @@ module.exports.store = store
 /**
  * Call
  */
- module.exports.call = callmanager.call
+module.exports.call = callmanager.call

package/lib/call.js

@@ -66,17 +66,13 @@ const inboundsiperros = {
   404: hangupcodes.UNALLOCATED_NUMBER
 }
 
-var callmanager = {
+let callmanager = {
   "options": {}
 }
 
 /** @class */
 class call {
 
-  #state = { 
-    "waitingforevent": false
-  }
-
   /**
   Construct our call object with all defaults, including a default UUID.
   @constructs call
@@ -1459,7 +1455,7 @@ class call {
   /**
     Private helper function to add events to our RTP channel.
     @param {object} e - the rtp event
-    @internal
+    @private
   */
   _handlechannelevents( e ) {
 
@@ -1489,16 +1485,6 @@ class call {
       this._tevent( e.event )
     }
 
-    if( !this._promises.resolve.channelevent ) {
-      this.#state.waitingforevent = e
-      return
-    }
-
-    this.#matchandthrow( e )
-
-  }
-
-  #matchandthrow( e ) {
     if( this._eventconstraints ) {
       let constraintkeys = Object.keys( this._eventconstraints )
       for( const k of constraintkeys ) {
@@ -1506,11 +1492,11 @@ class call {
         if( "object" === typeof this._eventconstraints[ k ] ) {
           /* regex */
           if( !e[ k ].match( this._eventconstraints[ k ] ) ) {
-            return false
+            return
           }
         } else if( this._eventconstraints[ k ] != e[ k ] ) {
           /* not a match */
-          return false
+          return
         }
       }
     }
@@ -1527,7 +1513,7 @@ class call {
     this._promises.resolve.channelevent = false
     this._promises.promise.channelevent = false
     if( r ) r( e )
-    return true
+
   }
 
   /**
@@ -1540,7 +1526,6 @@ class call {
   A telephone event will resolve this promise as we typically need speech to be interupted
   by the user. Note, peeking a telephone-event (i.e. DTMF) will not clear it like waitfortelevents will.
   @param { regex } constraints - event to filter for from our RTP server - excluding DTMF events - these will always return
-  @returns { Promise< object > }
   */
   waitforanyevent( constraints, timeout = 500 ) {
 
@@ -1560,11 +1545,6 @@ class call {
       if( r ) r( "timeout" )
     }, timeout * 1000 )
 
-    if( this.#state.waitingforevent ) {
-      this.#matchandthrow( this.#state.waitingforevent )
-    }
-    this.#state.waitingforevent = false
-
     return this._promises.promise.channelevent
   }
 

package/lib/callmanager.js

@@ -37,9 +37,9 @@ class callmanager {
     @private
   */
   async _oninvite( req, res, next ) {
-    if( req.msg.method !== "INVITE" ) return next()
+    if( "INVITE" !== req.msg.method ) return next()
 
-    let calldesc = {
+    const calldesc = {
       "callid": req.getParsedHeader( "call-id" ),
       "tags": {
         "remote": req.getParsedHeader( "from" ).params.tag,
@@ -97,7 +97,7 @@ Is configured to use drachtio and registers emitter for presence.
 */
 let cm = false
 module.exports.callmanager = ( options ) => {
-  if( cm !== false ) return cm
+  if( false !== cm ) return cm
 
   assert( undefined !== options.srf )
   cm = new callmanager( options )

package/lib/sdp.js

@@ -6,7 +6,7 @@ const crypto = require( "crypto" )
 /*
   An SDP Generator.
 */
-var sessionidcounter = Math.floor( Math.random() * 100000 )
+let sessionidcounter = Math.floor( Math.random() * 100000 )
 
 const codecconv = {
   "0": "pcmu",
@@ -34,27 +34,27 @@ const codecdefs = {
   "rtp": {
     "pcmu": {
       payload: 0,
-      codec: 'PCMU',
+      codec: "PCMU",
       rate: 8000
     },
     "pcma": {
       payload: 8,
-      codec: 'PCMA',
+      codec: "PCMA",
       rate: 8000
     },
     "g722": {
       payload: 9,
-      codec: 'G722',
+      codec: "G722",
       rate: 8000
     },
     "ilbc": {
       payload: 97,
-      codec: 'ilbc',
+      codec: "ilbc",
       rate: 8000
     },
     "2833": {
       payload: 101,
-      codec: 'telephone-event/8000'
+      codec: "telephone-event/8000"
     }
   },
   "fmtp": {
@@ -80,6 +80,44 @@ const defaultaudiomedia = {
   "direction": "sendrecv"
 }
 
+/**
+ * Takes a mixed input and outputs an array in the form [ "pcmu", "pcma" ]
+ * @param { string | array<string|number> } codecarray
+ * @return { array< string >}
+ */
+function alltocodecname( codecarray ) {
+
+  /* check and convert to array */
+  if ( "string" === typeof codecarray ) {
+    codecarray = codecarray.split( /[ ,]+/ )
+  }
+
+  /* convert to payloads */
+  const retval = []
+  for( const oin of codecarray ) {
+    if( undefined != codecrconv[ oin ] ) {
+      retval.push( oin )
+    } else if( codecconv[ oin ] ) {
+      retval.push( codecconv[ oin ] )
+    }
+  }
+
+  return retval
+}
+
+/**
+ * 
+ * @param { object } audio 
+ * @param { number } pt 
+ * @returns { string }
+ */
+function getconfigforpt( audio, pt ) {
+  for( const fmtp of audio.fmtp ) {
+    if( pt == fmtp.payload ) return fmtp.config
+  }
+  return ""
+}
+
 class sdp {
 
   constructor( sdp ) {
@@ -90,14 +128,14 @@ class sdp {
       this.sdp = {
         version: 0,
         origin: {
-          username: '-',
+          username: "-",
           sessionId: sessionidcounter,
           sessionVersion: 0,
-          netType: 'IN',
+          netType: "IN",
           ipVer: 4,
           address: "127.0.0.1"
         },
-        name: 'project',
+        name: "project",
         timing: {
           start: 0,
           stop: 0
@@ -130,7 +168,7 @@ class sdp {
       this.sdp.media.forEach( ( media, i, a ) => {
 
         if ( "audio" === media.type ) {
-          if ( typeof media.payloads === "string" ) {
+          if ( "string" === typeof media.payloads ) {
             media.payloads = media.payloads.split( /[ ,]+/ )
           }
 
@@ -149,7 +187,7 @@ class sdp {
   Ideally we replicate the object required for target in our RTP service.
   */
   getaudio() {
-    let m = this.sdp.media.find( mo => "audio" === mo.type )
+    const m = this.sdp.media.find( mo => "audio" === mo.type )
 
     if ( m ) {
 
@@ -270,11 +308,11 @@ class sdp {
     }
 
     codecarr.forEach( codec => {
-      let codecn = codecrconv[ codec ]
-      let def = codecdefs.rtp[ codec ]
+      const codecn = codecrconv[ codec ]
+      const def = codecdefs.rtp[ codec ]
       if ( undefined !== def ) {
         /* suported audio */
-        let m = this.getmedia( codecdefs.type[ codec ] )
+        const m = this.getmedia( codecdefs.type[ codec ] )
 
         /* Don't allow duplicates */
         if( m.payloads.includes( codecn ) ) return
@@ -303,7 +341,7 @@ class sdp {
     }
 
     for( const m of this.sdp.media ) {
-      let mmsid = crypto.randomBytes( 16 ).toString( "hex" )
+      const mmsid = crypto.randomBytes( 16 ).toString( "hex" )
       m.ssrcs = [
         { "id": ssrc, "attribute": "cname", "value": crypto.randomBytes( 16 ).toString( "hex" ) },
         { "id": ssrc, "attribute": "msid", "value": this.sdp.msidSemantic.token + " " + mmsid },
@@ -351,7 +389,7 @@ class sdp {
         "port": port,
         "type": "host",
         "generation": 0
-        }
+      }
       ]
 
       m.iceUfrag = crypto.randomBytes( 8 ).toString( "hex" )
@@ -361,7 +399,7 @@ class sdp {
     return this
   }
 
-  rtcpmux( v = true ) {
+  rtcpmux() {
     for( const m of this.sdp.media ) {
       m.rtcpMux = "rtcp-mux"
     }
@@ -395,43 +433,37 @@ class sdp {
   If first ony, it only returns the first match
   */
   intersection( other, firstonly = false ) {
-    if ( typeof other === "string" ) {
-      other = other.split( /[ ,]+/ )
+
+    /* ensure other side is on the format [ "pcma", "pcmu" ] */
+    other = alltocodecname( other )
+
+    let audio = []
+    for( const m of this.sdp.media ) {
+      if( "audio" == m.type ) audio = m
     }
 
-    /* convert to payloads */
-    other.forEach( ( codec, i, a ) => {
-      if ( isNaN( codec ) ) {
-        a[ i ] = codecrconv[ codec ]
+    /* work out an array of codecs on this side in the format of [ "pcma", "pcmu" ] */
+    const ourcodecs = []
+    for( const pt of audio.payloads ) {
+      if( undefined === codecconv[ pt ] ) continue
+      if( 97 == pt ) {
+        if( -1 == getconfigforpt( audio, 97 ).indexOf( "mode=30" ) )
+          ourcodecs.push( codecconv[ pt ] )
+      } else {
+        ourcodecs.push( codecconv[ pt ] )
       }
-    } )
-
-    /* Does it exist in payloads and fmtp where required */
-    let retval = []
-    this.sdp.media.forEach( m => {
-      retval = retval.concat( other.filter( pl => {
-        if ( m.payloads.includes( pl ) ) {
-          let codecname = codecconv[ pl ]
-          if ( undefined === codecdefs.fmtp[ codecname ] ) return true
+    }
 
-          let fmtp = codecdefs.fmtp[ codecname ] /* i.e. { payload: 97, config: "mode=20" } */
-          if ( undefined !== m.fmtp.find( f => f.payload == fmtp.payload && f.config == fmtp.config ) ) return true
-        }
-        return false
-      } ) )
-    } )
+    /* intersection */
+    let retval = other.filter( value => ourcodecs.includes( value ) )
 
-    if ( firstonly && retval.length > 0 ) {
+    /* If fisrt only - i.e. select codec */
+    if ( firstonly && 0 < retval.length ) {
       retval = [ retval[ 0 ] ]
       this.select( retval[ 0 ] )
     }
 
-    /* We want named codecs */
-    retval.forEach( ( codec, i, a ) => {
-      if ( undefined != codecconv[ codec ] ) a[ i ] = codecconv[ codec ]
-    } )
-
-    let full = retval.join( " " )
+    const full = retval.join( " " )
     if( !full ) return false
     
     return full
@@ -440,7 +472,7 @@ class sdp {
   toString() {
 
     /* We need to convert payloads back to string to stop a , being added */
-    let co = Object.assign( this.sdp )
+    const co = Object.assign( this.sdp )
 
     co.media.forEach( ( media, i, a ) => {
       if( Array.isArray( media.payloads ) ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/babble-drachtio-callmanager",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {
@@ -21,14 +21,18 @@
   "license": "MIT",
   "dependencies": {
     "@babblevoice/babble-drachtio-auth": "^1.0.2",
-    "chai": "^4.3.4",
     "drachtio-srf": "^4.4.47",
-    "mocha": "^9.2.2",
     "uuid": "^8.3.2"
   },
   "optionalDependencies": {
     "@babblevoice/projectrtp": "^2.3.7"
   },
+  "devDependencies": {
+    "chai": "^4.3.4",
+    "eslint": "^8.42.0",
+    "eslint-plugin-promise": "^6.1.1",
+    "mocha": "^9.2.2"
+  },
   "bugs": {
     "url": "https://github.com/tinpotnick/babble-drachtio-callmanager/issues"
   },