@babblevoice/babble-drachtio-callmanager 2.2.1 → 2.2.3

package/lib/call.js

@@ -5,13 +5,40 @@ const dns = require( "node:dns" )
 
 const projectrtp = require( "@babblevoice/projectrtp" ).projectrtp
 
-const parseuri = require( "drachtio-srf" ).parseUri
 const sdpgen = require( "./sdp.js" )
 const callstore = require( "./store.js" )
 
 const sipauth = require( "@babblevoice/babble-drachtio-auth" )
 
 const ipv6regex = /^(?:(?:[a-fA-F\d]{1,4}:){7}(?:[a-fA-F\d]{1,4}|:)|(?:[a-fA-F\d]{1,4}:){6}(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|:[a-fA-F\d]{1,4}|:)|(?:[a-fA-F\d]{1,4}:){5}(?::(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,2}|:)|(?:[a-fA-F\d]{1,4}:){4}(?:(?::[a-fA-F\d]{1,4}){0,1}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,3}|:)|(?:[a-fA-F\d]{1,4}:){3}(?:(?::[a-fA-F\d]{1,4}){0,2}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,4}|:)|(?:[a-fA-F\d]{1,4}:){2}(?:(?::[a-fA-F\d]{1,4}){0,3}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,5}|:)|(?:[a-fA-F\d]{1,4}:){1}(?:(?::[a-fA-F\d]{1,4}){0,4}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,6}|:)|(?::(?:(?::[a-fA-F\d]{1,4}){0,5}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,7}|:)))(?:%[0-9a-zA-Z]{1,})?$/gm
+const parseurire = /^(sips?):(?:([^\s>:@]+)(?::([^\s@>]+))?@)?([\w\-.]+)(?::(\d+))?((?:;[^\s=?>;]+(?:=[^\s?;]+)?)*)(?:\?(([^\s&=>]+=[^\s&=>]+)(&[^\s&=>]+=[^\s&=>]+)*))?$/
+const parseuriparamsre = /([^;=]+)(=([^;=]+))?/g
+const parseuriheadersre = /[^&=]+=[^&=]+/g
+
+function parseuri( s ) {
+  if( "object" === typeof s )
+    return s
+
+  const r = parseurire.exec( s )
+
+  if( r ) {
+    return {
+      schema: r[ 1 ],
+      user: r[ 2 ],
+      password: r[ 3 ],
+      host: r[ 4 ],
+      port: +r[ 5 ],
+      params: (r[ 6 ].match( parseuriparamsre ) || [] )
+        .map( function( s ) { return s.split( "=" ) } )
+        .reduce(function(params, x) { params[x[0]]=x[1] || null; return params }, {} ),
+      headers: ( ( r[ 7 ] || "" ).match( parseuriheadersre ) || [])
+        .map(function(s){ return s.split( "=") } )
+        .reduce(function(params, x) { params[ x[ 0 ] ] = x[ 1 ]; return params }, {} )
+    }
+  }
+
+  return {}
+}
 
 /*
 Enum for different reasons for hangup.
@@ -446,10 +473,25 @@ class call {
     return parsed
   }
 
+  #fixparseduriobj( parsed ) {
+
+    if( !parsed ) parsed = {}
+    if( !parsed.uri && parsed.user && parsed.host ) parsed.uri = parsed.user + "@" + parsed.host
+    if( parsed.uri && !parsed.user && !parsed.host ) parsed = parseuri( parsed.uri )
+
+    let parseduri = parseuri( parsed.uri )
+
+    if( !parseduri ) parseduri = { "user": parsed.user, "host": parsed.host }
+    if( !parsed.params ) parsed.params = {}
+
+    return parsed
+  }
+
   /**
    * 
    * @returns { object }
    */
+  // eslint-disable-next-line complexity
   #getremoteuas() {
     /* uas - inbound */
     let parsed
@@ -466,16 +508,13 @@ class call {
       parsed = this.#getremotefromheaders()
     }
 
-    if( !parsed ) parsed = {}
-    let parseduri = parseuri( parsed.uri )
-    if( !parseduri ) parseduri = { "user": parsed.user, "host": parsed.host }
-    if( !parsed.params ) parsed.params = {}
+    parsed = this.#fixparseduriobj( parsed )
 
     return {
       "name": this._remote.name?this._remote.name:( !parsed.name?"":parsed.name.replace( /['"]+/g, "" ) ),
       "uri": parsed.uri,
-      "user": this._remote.id?this._remote.id:(parseduri.user),
-      "host": parseduri.host,
+      "user": this._remote.id?this._remote.id:(parsed.user),
+      "host": parsed.host,
       "privacy": "true" === parsed.params.privacy,
       "type": "callerid"
     }
@@ -2823,13 +2862,15 @@ class call {
     @private
     */
     c._req = req
-    c._req.on( "cancel", () => c._oncanceled.bind( c ) )
+
     /**
     @member
     @private
     */
     c._res = res
 
+    c._req.on( "cancel", () => c._oncanceled.bind( c ) )
+
     await callstore.set( c )
     callmanager.options.em.emit( "call.new", c )
 

package/package.json

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

package/test/interface/call.js

@@ -209,7 +209,7 @@ describe( "call object", function() {
 
     const options = {
       "registrar": {
-        "contacts": async ( entity ) => {
+        "contacts": async ( /* entity */ ) => {
           return {
             "username": "1000",
             "realm": "dummy.com",