@jambonz/node-red-contrib-jambonz 2.3.8 → 2.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/node-red-contrib-jambonz",
-  "version": "2.3.8",
+  "version": "2.3.10",
   "description": "Node-RED nodes for jambonz platform",
   "keywords": [
     "node-red"

package/src/nodes/dequeue.html

@@ -7,6 +7,8 @@
         name: {value: ''},
         queue: {required: true, value: ''},
         queueType: {value: 'str'},
+        callSid: {value: ''},
+        callSidType: {value: 'str'},
         actionHook: {},
         actionHookType: {value: 'str'},
         confirmHook: {},
@@ -26,6 +28,10 @@
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
           typeField: $('#node-input-queueType')
         });
+        $('#node-input-callSid').typedInput({
+          types: ['str', 'msg', 'flow', 'global'],
+          typeField: $('#node-input-callSidType')
+        });
         $('#node-input-actionHook').typedInput({
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
           typeField: $('#node-input-actionHookType')
@@ -53,6 +59,11 @@
       <input type="text" id="node-input-queue" placeholder="name of queue to remove caller from">
       <input type="hidden" id="node-input-queueType">
     </div>
+    <div class="form-row">
+      <label for="node-input-callSid">Call Sid</label>
+      <input type="text" id="node-input-callSid" placeholder="sid of the call">
+      <input type="hidden" id="node-input-callSidType">
+    </div>
     <div class="form-row">
       <label for="node-input-beep">Play beep on connecting</label>
       <input type="checkbox" id="node-input-beep">
@@ -79,6 +90,7 @@
     <p>removes the a call from the front of a queue and bridges that call to the current caller.</p>
     <h3>Properties</h3>
     <p><code>Queue name</code> -  Name of the queue.</p>
+    <p><code>Call Sid</code> -  An optional parameter to specify which call to dequeue.</p>
     <p><code>Play beep on connecting</code> -  Play a beep tone to this caller only just prior to connecting the queued call.</p>
     <p><code>Action hook</code> - A webhook invoke when call ends.</p>
     <p><code>Confirm hook</code> - A webhook for an application to run on the callee's end before the call is bridged.</p>

package/src/nodes/dequeue.js

@@ -9,6 +9,7 @@ module.exports = function(RED) {
       appendVerb(msg, {
         verb: 'dequeue',
         name:  v_resolve(config.queue, config.queueType, this.context(), msg),
+        callSid: v_resolve(config.callSid, config.callSidType, this.context(), msg),
         beep: config.beep,
         actionHook: v_resolve(config.actionHook, config.actionHookType, this.context(), msg),
         confirmHook: v_resolve(config.confirmHook, config.confirmHookType, this.context(), msg),

package/src/nodes/enqueue.html

@@ -7,6 +7,8 @@
         name: {value: ''},
         queue: {required: true, value: ''},
         queueType: {value: 'str'},
+        priority: {value: 999},
+        priorityType: {value: 'num'},
         actionHook: {},
         actionHookType: {value: 'str'},
         waitHook: {},
@@ -23,6 +25,10 @@
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
           typeField: $('#node-input-queueType')
         });
+        $('#node-input-priority').typedInput({
+          types: ['num', 'msg', 'flow', 'global'],
+          typeField: $('#node-input-priorityType')
+        });
         $('#node-input-actionHook').typedInput({
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
           typeField: $('#node-input-actionHookType')
@@ -46,6 +52,11 @@
       <input type="text" id="node-input-queue" placeholder="name of queue">
       <input type="hidden" id="node-input-queueType">
     </div>
+    <div class="form-row">
+      <label for="node-input-priority">Priority</label>
+      <input type="text" id="node-input-priority" placeholder="caller priority">
+      <input type="hidden" id="node-input-priorityType">
+    </div>
     <div class="form-row">
       <label for="node-input-actionHook">Action hook</label>
       <input type="text" id="node-input-actionHook" placeholder="webhook url">
@@ -64,6 +75,8 @@
     <h3>Properties</h3>
       <p><code>Queue name</code> - 
         The name of the queue</p>
+      <p><code>Priority</code> - 
+        The priority for which the call will be added to the queue. Must be a non-negative value and defaults to 999 (low-priority) if not set.</p>
       <p><code>Action hook</code> - 
         A webhook invoke when operation completes.</p>
       <p><code>Wait hook</code> - 

package/src/nodes/enqueue.js

@@ -6,9 +6,12 @@ module.exports = function(RED) {
     RED.nodes.createNode(this, config);
     var node = this;
     node.on('input', function(msg, send, done) {
+      const priorityValue = v_resolve(config.priority, config.priorityType, this.context(), msg);
+
       appendVerb(msg, {
         verb: 'enqueue',
         name:  v_resolve(config.queue, config.queueType, this.context(), msg),
+        priority:  (/^\d+$/.test(priorityValue)) ? parseInt(priorityValue) : null,
         actionHook: v_resolve(config.actionHook, config.actionHookType, this.context(), msg),
         waitHook: v_resolve(config.waitHook, config.waitHookType, this.context(), msg)
       });

package/src/nodes/lcc.html

@@ -26,10 +26,18 @@
           return action !== 'hold_conf' || v.length > 0;
         }},
         waitHookType: {value: 'str'},
+        siprecServerURL: {value: '', validate: function(v) {
+          const action = $('#node-input-action').val();
+          return action !== 'start_call_recording' || v.length > 0;
+        }},
+        siprecServerURLType: {value: 'str'},
+        recordingID: {value: ''},
+        recordingIDType: {value: 'str'},
       },
       inputs:1,
       outputs:1,
       icon: "font-awesome/fa-cubes",
+      paletteLabel: "Live Call Control",
       label: function() { 
         return this.name || (this.action ? `LCC - ${this.action}` : 'LCC');
       },
@@ -42,8 +50,7 @@
         var sayDiv = $('#say-options');
         var redirectDiv = $('#redirect-options');
         var waitHookDiv = $('#wait-options');
-        sayDiv.hide();
-        waitHookDiv.hide();
+        var recordDiv = $('#record-options');
 
         $('#node-input-callSid').typedInput({
           default: $('#node-input-callSidType').val(),
@@ -60,15 +67,27 @@
           types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
           typeField: $('#node-input-waitHookType')
         });
+        $('#node-input-siprecServerURL').typedInput({
+          default: $('#node-input-siprecServerURLType').val(),
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
+          typeField: $('#node-input-siprecServerURLType')
+        });
+        $('#node-input-recordingID').typedInput({
+          default: $('#node-input-recordingIDType').val(),
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
+          typeField: $('#node-input-recordingIDType')
+        });
 
         var onActionChanged = function () {
-          node.action = actionElem.find(':selected').val();
-          if ('whisper' === node.action) sayDiv.show();
+          var selectedAction = actionElem.find(':selected').val();
+          if ('whisper' === selectedAction) sayDiv.show();
           else sayDiv.hide();
-          if ('redirect' === node.action) redirectDiv.show();
+          if ('redirect' === selectedAction) redirectDiv.show();
           else redirectDiv.hide();
-          if ('hold_conf' === node.action) waitHookDiv.show();
+          if ('hold_conf' === selectedAction) waitHookDiv.show();
           else waitHookDiv.hide();
+          if ('start_call_recording' === selectedAction) recordDiv.show();
+          else recordDiv.hide();
         }
 
         var onVendorChanged = function() {
@@ -146,7 +165,7 @@
 
 <!-- HTML -->
 <script type="text/html" data-template-name="lcc">
-    <div class="form-row">
+  <div class="form-row">
       <label for="node-input-name"><i class="icon-tag"></i> Name</label>
       <input type="text" id="node-input-name" placeholder="Name">
   </div>
@@ -173,6 +192,10 @@
       <option value="resume">resume listen audio feed</option>
       <option value="redirect">redirect call</option>
       <option value="whisper">whisper</option>
+      <option value="start_call_recording">start call recording</option>
+      <option value="stop_call_recording">stop call recording</option>
+      <option value="pause_call_recording">pause call recording</option>
+      <option value="resume_call_recording">resume call recording</option>
     </select>
   </div>
   <div id="say-options">
@@ -216,6 +239,18 @@
       <label for="node-input-waitHook">Wait webhook</label>
       <input type="text" id="node-input-waitHook" placeholder="/path">
       <input type="hidden" id="node-input-waitHookType">
+    </div>
+  </div>
+  <div id="record-options">
+    <div class="form-row">
+      <label for="node-input-siprecServerURL">SIPREC URI</label>
+      <input type="text" id="node-input-siprecServerURL" placeholder="sip:srs@recording.example.com">
+      <input type="hidden" id="node-input-siprecServerURLType">
+    </div>
+    <div class="form-row">
+      <label for="node-input-recordingID">Recording ID</label>
+      <input type="text" id="node-input-recordingID" placeholder="545362a9-4cb3-4a55-85b8-b33ca83a6517">
+      <input type="hidden" id="node-input-recordingIDType">
     </div>  
   </div>
 </script>

package/src/nodes/lcc.js

@@ -1,3 +1,4 @@
+var crypto = require('crypto');
 var {v_resolve, doLCC} = require('./libs')
 
 module.exports = function(RED) {
@@ -44,7 +45,6 @@ function lcc(config) {
           opts.listen_status = 'resume';
           break;
         case 'redirect':
-          node.log(`LCC redirect callHook ${config.callHook} callHookType: ${config.callHookType}`);
           opts.call_hook = {url: v_resolve(config.callHook, config.callHookType, this.context(), msg)};
           break;
         case 'hold_conf':
@@ -70,6 +70,22 @@ function lcc(config) {
             });
           }
           break;
+        case 'start_call_recording':
+          opts.record = { 
+            action: 'startCallRecording',
+            siprecServerURL: v_resolve(config.siprecServerURL, config.siprecServerURLType, this.context(), msg),
+            recordingID: v_resolve(config.recordingID, config.recordingIDType, this.context(), msg) || crypto.randomUUID()
+          };
+          break;
+        case 'stop_call_recording':
+          opts.record = { action: 'stopCallRecording' };
+          break;
+        case 'pause_call_recording':
+          opts.record = { action: 'pauseCallRecording' };
+          break;
+        case 'resume_call_recording':
+          opts.record = { action: 'resumeCallRecording' };
+          break;
         default:
           node.log(`invalid action: ${config.action}`);
           send(msg);

package/src/nodes/libs.js

@@ -81,7 +81,7 @@ exports.appendVerb = (msg, obj) => {
       'Authorization': `Bearer ${apiToken}`
     });
     const url = `Accounts/${accountSid}/Calls/${callSid}`;
-    node.log(`invoking LCC with callSid ${callSid} at ${baseUrl}/v1/${url}`);
+    node.log(`invoking LCC with payload ${JSON.stringify(opts)} at ${baseUrl}/v1/${url}`);
     return post(url, opts);
   }
 

package/src/utils/http-helpers.js

@@ -53,17 +53,22 @@ module.exports = function(RED) {
   });
 
   RED.httpAdmin.get('/_jambonz/applications/:serverId', (req, res) => {
-    var conn = RED.nodes.getNode(req.params.serverId);
+    const conn = RED.nodes.getNode(req.params.serverId);
     if (conn && conn.credentials) {
-      const {apiToken} = conn.credentials;
-      const url = conn.url
+      const { apiToken } = conn.credentials;
+      const { url } = conn;
       const getApps = bent(`${url}/v1/Applications`, 'GET', 'json', 200, {
       'Authorization': `Bearer ${apiToken}`
       });
       getApps()
-      .then( (apps) =>{
-          res.send(apps)
+      .then((apps) => {
+        res.send(apps);
       })
+      .catch((error) => {
+        res.status(500).send(error.message);
+      });
+    } else {
+      res.status(404);
     }
   });
 };