@babblevoice/babble-drachtio-callmanager 3.7.7 → 3.7.8

package/lib/call.js

@@ -1328,38 +1328,60 @@ class call {
     }
   }
 
+  /**
+   * 
+   * @returns { boolean } - true if an error has occured
+   */
+  #answerparenterrors() {
+    if( !this.parent.established ) {
+      this.hangup( hangupcodes.USER_GONE )
+      return true
+    }
+
+    /* are we still established? */
+    if( !this.established || this.state.destroyed || this.parent.destroyed ) return true
+    if( !this.channels.audio ) {
+      /* something bad has happened */
+      this.hangup( hangupcodes.NOT_ACCEPTABLE )
+      return true
+    }
+
+    if( !this.parent.channels.audio ) {
+      this.hangup( hangupcodes.USER_GONE )
+      return true
+    }
+
+    return false
+  }
+
+  /**
+   * 
+   * @returns { Promise< object > } - return ourself
+   */
   async #answerparent() {
-    if( this.parent ) {
-      if( !this.parent.established ) {
-        try {
-          await this.parent.answer()
-        } catch( e ) {
-          console.trace( e )
-        }
-  
-        if( !this.parent.established ) {
-          return this.hangup( hangupcodes.USER_GONE )
-        }
-      }
-  
-      /* are we still established? */
-      if( !this.established || this.state.destroyed || this.parent.destroyed ) return this
-      if( !this.channels.audio ) {
-        /* something bad has happened */
-        this.hangup( hangupcodes.NOT_ACCEPTABLE )
-        return this
+    if( !this.parent ) return
+
+    if( !this.parent.established ) {
+      try {
+        await this.parent.answer()
+      } catch( e ) {
+        console.trace( e )
       }
+    }
 
-      this.channels.audio.mix( this.parent.channels.audio )
+    if( this.#answerparenterrors() ) return this
 
-      this._em.emit( "call.mix", this )
-      callmanager.options.em.emit( "call.mix", this )
-      this.parent._em.emit( "call.mix", this.parent )
-      callmanager.options.em.emit( "call.mix", this.parent )
+    this.channels.audio.mix( this.parent.channels.audio )
 
-      this.epochs.mix = Math.floor( +new Date() / 1000 )
-      if( this.parent ) this.parent.epochs.mix = Math.floor( +new Date() / 1000 )
-    }
+    this._em.emit( "call.mix", this )
+    callmanager.options.em.emit( "call.mix", this )
+    this.parent._em.emit( "call.mix", this.parent )
+    callmanager.options.em.emit( "call.mix", this.parent )
+
+    this.epochs.mix = Math.floor( +new Date() / 1000 )
+    if( this.parent ) this.parent.epochs.mix = Math.floor( +new Date() / 1000 )
+
+    return this
   }
 
   /**

package/package.json

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