@babblevoice/babble-drachtio-callmanager 1.2.1 → 1.3.2

package/lib/call.js

@@ -420,8 +420,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 {
@@ -1443,6 +1443,24 @@ class call {
     }
   }
 
+  /**
+   * Set the sound soup for music on hold.
+   * @param { object } soup - sound soup as described in projectrtp
+   */
+  set moh( soup ) {
+    this._moh = soup 
+  }
+
+  /**
+   * Return the current moh
+   */
+  get moh() {
+    if( this._moh ) {
+      return this._moh
+    }
+    return callmanager.options.moh
+  }
+
   /**
    * If we have been placed on hold (and it has been neotiated) then configure audio to match.
    * @private
@@ -1458,7 +1476,7 @@ class call {
     let other = this.other
     if( other ) {
       other.channels.audio.unmix()
-      other.channels.audio.play( callmanager.options.moh )
+      other.channels.audio.play( this.moh )
     }
 
     this._em.emit( "call.hold", this )
@@ -1939,13 +1957,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()
   }
 
   /**
@@ -2447,7 +2465,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.2.1",
+  "version": "1.3.2",
   "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() {
@@ -752,7 +752,7 @@ describe( "call object", function() {
   } )
 
   it( `uas.newuac - early callback is called`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -768,7 +768,7 @@ describe( "call object", function() {
   } )
 
   it( `uas.newuac - confirmed callback is called`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -784,7 +784,7 @@ describe( "call object", function() {
   } )
 
   it( `uas.newuac - simple update`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -814,7 +814,7 @@ describe( "call object", function() {
   } )
 
   it( `uas.newuac - simple update - but don't allow as not in allow`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -841,7 +841,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit event on call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -864,7 +864,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit event on and removealllisteners call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -890,7 +890,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit event on and removealllisteners (none specified) call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -916,7 +916,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit event on and off call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -944,7 +944,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit event once call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -968,7 +968,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit call.pick on call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -990,7 +990,7 @@ describe( "call object", function() {
   } )
 
   it( `Create a call and mock rtpengine and ensure we receive events`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
     let rtpserver = callmanager.projectrtp.proxy.listen()
 
     let connection = net.createConnection( 9002, "127.0.0.1" )
@@ -1072,4 +1072,32 @@ describe( "call object", function() {
     connection.destroy()
     rtpserver.destroy()
   } )
+
+  it( `set get moh`, async function() {
+    new srf.srfscenario( {} )
+
+    let options = {
+      "contact": "ourcontactstring",
+      "late": true
+    }
+
+    let c = await call.newuac( options )
+
+    let s = {
+      "loop": true,
+      "files": [
+        { "wav": "some.wav" }
+      ]
+    }
+
+    /* no default configured */
+    expect( c.moh ).to.be.undefined
+    c.moh = s
+
+    expect( c._moh.loop ).to.equal( true )
+    expect( c.moh.loop ).to.equal( true )
+
+    c._onhangup( "wire" )
+
+  } )
 } )