Merge branch 'main' of github.com:jambonz/jambonz-feature-server into feature/cognigy-enhancements-alex

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

@@ -35,6 +35,8 @@ router.post('/', async(req, res) => {
 
     opts.headers = {
       ...opts.headers,
+      'X-Jambonz-Routing': target.type,
+      'X-Jambonz-FS-UUID': srf.locals.fsUUID,
       'X-Call-Sid': callSid,
       'X-Account-Sid': req.body.account_sid
     };

lib/session/call-session.js

@@ -264,6 +264,12 @@ class CallSession extends Emitter {
             region: credential.region
           };
         }
+        else if ('wellsaid' === vendor) {
+          return {
+            speech_credential_sid: credential.speech_credential_sid,
+            api_key: credential.api_key
+          };
+        }
       }
       else {
         writeAlerts({

lib/tasks/dial.js

@@ -179,6 +179,7 @@ class TaskDial extends Task {
     this._killOutdials();
     if (this.sd) {
       this.sd.kill();
+      this.sd.removeAllListeners();
       this.sd = null;
     }
     if (this.callSid) sessionTracker.remove(this.callSid);

lib/tasks/task.js

@@ -62,7 +62,9 @@ class Task extends Emitter {
   kill(cs) {
     if (this.cs && !this.cs.isConfirmCallSession) this.logger.debug(`${this.name} is being killed`);
     this._killInProgress = true;
-    // no-op
+
+    /* remove reference to parent task or else entangled parent-child tasks will not be gc'ed */
+    setImmediate(() => this.parentTask = null);
   }
 
   /**

lib/utils/db-utils.js

@@ -36,6 +36,10 @@ const speechMapper = (cred) => {
     obj.api_key = o.api_key;
     obj.region = o.region;
   }
+  else if ('wellsaid' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.api_key = o.api_key;
+  }
   return obj;
 };
 
@@ -53,6 +57,7 @@ module.exports = (logger, srf) => {
     const haveGoogle = speech.find((s) => s.vendor === 'google');
     const haveAws = speech.find((s) => s.vendor === 'aws');
     const haveMicrosoft = speech.find((s) => s.vendor === 'microsoft');
+    const haveWellsaid = speech.find((s) => s.vendor === 'wellsaid');
     if (!haveGoogle || !haveAws || !haveMicrosoft) {
       const [r3] = await pp.query(sqlSpeechCredentialsForSP, account_sid);
       if (r3.length) {
@@ -68,6 +73,10 @@ module.exports = (logger, srf) => {
           const ms = r3.find((s) => s.vendor === 'microsoft');
           if (ms) speech.push(speechMapper(ms));
         }
+        if (!haveWellsaid) {
+          const wellsaid = r3.find((s) => s.vendor === 'wellsaid');
+          if (wellsaid) speech.push(speechMapper(wellsaid));
+        }
       }
     }