@babblevoice/babble-drachtio-callmanager 1.3.0 → 1.3.3

package/lib/call.js

@@ -317,13 +317,15 @@ class call {
       }
   
       let entitycalls = await callstore.getbyentity( this._entity.uri )
+      let entitycallcount = 0
+      if( false !== entitycalls ) entitycallcount = entitycalls.size
   
       return {
         "username": this._entity.username,
         "realm": this._entity.realm,
         "uri": this._entity.uri,
         "display": this._entity.display?this._entity.display:"",
-        "ccc": entitycalls.size
+        "ccc": entitycallcount
       }
     } )()
   }
@@ -420,8 +422,8 @@ class call {
           parsed = this._req.getParsedHeader( "from" )
         }
 
-        let parseduri = parseuri( parsed.uri )
         if( !parsed ) parsed = {}
+        let parseduri = parseuri( parsed.uri )
         if( !parsed.params ) parsed.params = {}
 
         return {
@@ -1957,13 +1959,13 @@ class call {
     /* Call outstanding resolves for promises - this will trigger out hangup promise also */
     resolves.forEach( r => r( this ) )
 
-    this.removealllisteners()
-
     this._em.emit( "call.destroyed", this )
     callmanager.options.em.emit( "call.destroyed", this )
 
     this._em.emit( "call.reporting", this )
     callmanager.options.em.emit( "call.reporting", this )
+
+    this.removealllisteners()
   }
 
   /**
@@ -2465,7 +2467,7 @@ class call {
     @private
     */
     c._req = req
-    c._req.on( "cancel", () => this._oncanceled() )
+    c._req.on( "cancel", () => c._oncanceled.bind( c ) )
     /**
     @member
     @private

package/package.json

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

package/test/interface/call.js

@@ -554,9 +554,9 @@ describe( "call object", function() {
       eventhappened = true
     } )
 
-    await c.hangup()
-
     expect( eventhappened ).to.be.false
+    await c.hangup()
+    expect( eventhappened ).to.be.true
   } )
 
   it( `uas.newuac - answered and destroyed event`, async function() {