catch exceptions from req.cancel() (#1359)

* catch exceptions from req.cancel()

* catch other instances of req.cancel

* fix prev commit

lib/http-routes/api/create-call.js

@@ -147,7 +147,7 @@ router.post('/',
 
       // find handling sbc sip for called user
       if (JAMBONES_DIAL_SBC_FOR_REGISTERED_USER && target.type === 'user') {
-        const { registrar }  = srf.locals.dbHelpers;
+        const { registrar}  = srf.locals.dbHelpers;
         const reg = await registrar.query(target.name);
         if (reg) {
           sbcAddress = selectHostPort(logger, reg.sbcAddress, 'tcp')[1];
@@ -159,7 +159,9 @@ router.post('/',
      * trunk isn't specified,
      * check if from-number matches any existing numbers on Jambonz
      *  */
-      if (target.type === 'phone' && !target.trunk) {
+      const { lookupLcrByAccount}  = srf.locals.dbHelpers;
+      const lcrs = await lookupLcrByAccount(req.body.account_sid);
+      if (target.type === 'phone' && !target.trunk && lcrs.length == 0) {
         const str = restDial.from || '';
         const callingNumber = str.startsWith('+') ? str.substring(1) : str;
         const voip_carrier_sid = await lookupCarrierByPhoneNumber(req.body.account_sid, callingNumber);

lib/session/call-session.js

@@ -1415,7 +1415,11 @@ class CallSession extends Emitter {
       }
       else {
         if (this.req && !this.dlg) {
-          this.req.cancel();
+          try {
+            this.req.cancel();
+          } catch (err) {
+            this.logger.error({err}, 'CallSession:_lccCallStatus error cancelling request');
+          }
           this._callReleased();
         }
       }
@@ -1862,7 +1866,7 @@ Duration=${duration} `
       return;
     }
     else if (tokens === undefined) {
-      this.logger.info({opts}, 'CallSession:_lccTtsTokens - invalid command since id is missing');
+      this.logger.info({opts}, 'CallSession:_lccTtsTokens - invalid command since tokens is missing');
       return this.requestor.request('tts:tokens-result', '/tokens-result', {
         id,
         status: 'failed',
@@ -2681,7 +2685,7 @@ Duration=${duration} `
    */
   _onRefer(req, res) {
     const task = this.currentTask;
-    const sd = task.sd;
+    const sd = task?.sd;
     if (task && TaskName.Dial === task.name && sd && task.referHook) {
       task.handleRefer(this, req, res);
     }

lib/tasks/dial.js

@@ -641,7 +641,9 @@ class TaskDial extends Task {
          * trunk isn't specified,
          * check if number matches any existing numbers
          *  */
-        if (t.type === 'phone' && !t.trunk) {
+        const { lookupLcrByAccount}  = srf.locals.dbHelpers;
+        const lcrs = await lookupLcrByAccount(cs.accountSid);
+        if (t.type === 'phone' && !t.trunk && lcrs.length == 0) {
           const str = this.callerId || req.callingNumber || '';
           const callingNumber = str.startsWith('+') ? str.substring(1) : str;
           const voip_carrier_sid = await lookupCarrierByPhoneNumber(cs.accountSid, callingNumber);
@@ -674,7 +676,8 @@ class TaskDial extends Task {
           rootSpan: cs.rootSpan,
           startSpan: this.startSpan.bind(this),
           dialTask: this,
-          onHoldMusic: this.cs.onHoldMusic
+          onHoldMusic: this.cs.onHoldMusic,
+          tmpFiles: this.cs.tmpFiles,
         });
         this.dials.set(sd.callSid, sd);
 
@@ -775,6 +778,9 @@ class TaskDial extends Task {
         this.epOther.api('uuid_break', this.epOther.uuid);
         this.epOther.bridge(sd.ep);
       }
+      else {
+        this.logger.error('Dial:_connectSingleDial - no other endpoint to bridge!');
+      }
       this.bridged = true;
     }
 

lib/tasks/rest_dial.js

@@ -19,6 +19,7 @@ class TaskRestDial extends Task {
     this.timeout = this.data.timeout || 60;
     this.sipRequestWithinDialogHook = this.data.sipRequestWithinDialogHook;
     this.referHook = this.data.referHook;
+    this.recentCallStatus = 0;
 
     this.on('connect', this._onConnect.bind(this));
     this.on('callStatus', this._onCallStatus.bind(this));
@@ -57,7 +58,11 @@ class TaskRestDial extends Task {
     this._clearCallTimer();
     if (this.canCancel) {
       this.canCancel = false;
-      cs?.req?.cancel();
+      try {
+        cs?.req?.cancel();
+      } catch (err) {
+        this.logger.error({err}, 'TaskRestDial: error cancelling call');
+      }
     }
     this.notifyTaskDone();
   }
@@ -118,7 +123,8 @@ class TaskRestDial extends Task {
   }
 
   _onCallStatus(status) {
-    this.logger.debug(`CallStatus: ${status}`);
+    this.logger.debug(`RestDial CallStatus: ${status}`);
+    this.recentCallStatus = status;
     if (status >= 200) {
       this.canCancel = false;
       this._clearCallTimer();
@@ -136,11 +142,16 @@ class TaskRestDial extends Task {
   }
 
   _onCallTimeout() {
-    this.logger.debug('TaskRestDial: timeout expired without answer, killing task');
+    this.logger.debug(`TaskRestDial: timeout expired without answer, last status ${this.recentCallStatus}`);
     this.timer = null;
-    if (this.canCancel) {
+    if (this.canCancel && this.recentCallStatus < 200) {
+      this.logger.debug('TaskRestDial: cancelling call attempt');
       this.canCancel = false;
-      this.cs?.req?.cancel();
+      try {
+        this.cs?.req?.cancel();
+      } catch (err) {
+        this.logger.error({err}, 'TaskRestDial: error cancelling call');
+      }
     }
   }
 

lib/tasks/tts-task.js

@@ -84,8 +84,7 @@ class TtsTask extends Task {
     const {api_key, model_id, custom_tts_streaming_url, auth_token} = credentials;
     let obj;
 
-    this.logger.debug({credentials},
+    this.logger.debug(`setTtsStreamingChannelVars: vendor: ${vendor}, language: ${language}, voice: ${voice}`);
-      `setTtsStreamingChannelVars: vendor: ${vendor}, language: ${language}, voice: ${voice}`);
 
     switch (vendor) {
       case 'deepgram':

lib/utils/install-srf-locals.js

@@ -173,7 +173,8 @@ function installSrfLocals(srf, logger, {
     lookupAccountCapacitiesBySid,
     lookupSmppGateways,
     lookupClientByAccountAndUsername,
-    lookupSystemInformation
+    lookupSystemInformation,
+    lookupLcrByAccount
   } = require('@jambonz/db-helpers')({
     host: JAMBONES_MYSQL_HOST,
     user: JAMBONES_MYSQL_USER,
@@ -279,7 +280,8 @@ function installSrfLocals(srf, logger, {
       retrieveByPatternSortedSet,
       sortedSetLength,
       sortedSetPositionByPattern,
-      getVerbioAccessToken
+      getVerbioAccessToken,
+      lookupLcrByAccount
     },
     parentLogger: logger,
     getSBC,

lib/utils/place-outdial.js

@@ -20,7 +20,7 @@ const { createMediaEndpoint } = require('./media-endpoint');
 
 class SingleDialer extends Emitter {
   constructor({logger, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan, dialTask,
-    onHoldMusic}) {
+    onHoldMusic, tmpFiles}) {
     super();
     assert(target.type);
 
@@ -44,6 +44,7 @@ class SingleDialer extends Emitter {
     this.callSid = crypto.randomUUID();
     this.dialTask = dialTask;
     this.onHoldMusic = onHoldMusic;
+    this.tmpFiles = tmpFiles;
 
     this.on('callStatusChange', this._notifyCallStatusChange.bind(this));
   }
@@ -328,7 +329,13 @@ class SingleDialer extends Emitter {
    */
   async kill(Reason) {
     this.killed = true;
-    if (this.inviteInProgress) await this.inviteInProgress.cancel();
+    if (this.inviteInProgress) {
+      try {
+        await this.inviteInProgress.cancel();
+      } catch (err) {
+        this.logger.error({err}, 'SingleDialer:kill error cancelling invite');
+      }
+    }
     else if (this.dlg && this.dlg.connected) {
       const duration = moment().diff(this.dlg.connectTime, 'seconds');
       this.logger.debug('SingleDialer:kill hanging up called party');
@@ -402,7 +409,7 @@ class SingleDialer extends Emitter {
         tasks,
         rootSpan: this.rootSpan,
         req: this.req,
-        tmpFiles: cs.tmpFiles,
+        tmpFiles: this.tmpFiles,
       });
       await cs.exec();
 
@@ -536,12 +543,12 @@ class SingleDialer extends Emitter {
 
 function placeOutdial({
   logger, srf, ms, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan, dialTask,
-  onHoldMusic
+  onHoldMusic, tmpFiles
 }) {
   const myOpts = deepcopy(opts);
   const sd = new SingleDialer({
     logger, sbcAddress, target, opts: myOpts, application, callInfo,
-    accountInfo, rootSpan, startSpan, dialTask, onHoldMusic
+    accountInfo, rootSpan, startSpan, dialTask, onHoldMusic, tmpFiles
   });
   sd.exec(srf, ms, myOpts);
   return sd;

package.json

@@ -27,11 +27,11 @@
   "dependencies": {
     "@aws-sdk/client-auto-scaling": "^3.549.0",
     "@aws-sdk/client-sns": "^3.549.0",
-    "@jambonz/db-helpers": "^0.9.16",
+    "@jambonz/db-helpers": "^0.9.17",
     "@jambonz/http-health-check": "^0.0.1",
     "@jambonz/mw-registrar": "^0.2.7",
     "@jambonz/realtimedb-helpers": "^0.8.15",
-    "@jambonz/speech-utils": "^0.2.22",
+    "@jambonz/speech-utils": "^0.2.23",
     "@jambonz/stats-collector": "^0.1.10",
     "@jambonz/time-series": "^0.2.14",
     "@jambonz/verb-specifications": "^0.0.113",