@jambonz/node-red-contrib-jambonz 2.3.9 → 2.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/node-red-contrib-jambonz",
-  "version": "2.3.9",
+  "version": "2.3.11",
   "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

@@ -6,13 +6,15 @@ module.exports = function(RED) {
     RED.nodes.createNode(this, config);
     var node = this;
     node.on('input', function(msg, send, done) {
+      const timeout = v_resolve(config.timeout, config.timeoutType, this.context(), msg);
       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),
-        timeout:  v_resolve(config.timeout, config.timeoutType, this.context(), msg)
+        timeout: (/^\d+$/.test(timeout)) ? parseInt(timeout) : null,
       });
       node.send(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/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);
     }
   });
 };