@jambonz/node-red-contrib-jambonz 2.4.19 → 2.4.21

package/package.json

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

package/src/nodes/create_call.html

@@ -17,6 +17,8 @@
         fromType: {value: ''},
         to: {value: '', required: true},
         toType: {value: ''},
+        trunk: {value: ''},
+        trunkType: {value: 'str'},
         dest: {value: 'phone', required: true},
         timeout: {validate: RED.validators.regex(/^\d*$/) },
         tag: {required: true},
@@ -66,9 +68,18 @@
         var destElem = $('#node-input-dest');
         var serverElem = $('#node-input-server');
         var applicationElem = $('#node-input-application');
+        var trunkDiv = $('#trunk');
         prepareTtsControls(node);
         prepareSttControls(node);
 
+        var onDestChanged = function () {
+          var selectedDest = destElem.find(':selected').val();
+          if ('phone' === selectedDest) trunkDiv.show();
+          else trunkDiv.hide();
+        }
+        
+        destElem.change(onDestChanged);
+
         $('#node-input-from').typedInput({
           default: $('#node-input-fromType').val(),
           types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
@@ -98,7 +109,11 @@
           types: ['json', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-tagType')
         });
-
+        $('#node-input-trunk').typedInput({
+          default: $('#node-input-trunkType').val(),
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-trunkType')
+        });
         var populateApplications = function() {
           var serverId = $('#node-input-server option:selected').val();
             $.ajax({
@@ -224,6 +239,11 @@
     <input type="text" id="node-input-to" placeholder="called party info">
     <input type="hidden" id="node-input-toType">
   </div>
+  <div class="form-row" id ="trunk">
+    <label for="node-input-trunk">Trunk</label>
+    <input type="text" id="node-input-trunk" placeholder="Specify the name of the trunk used for this outbound call">
+    <input type="hidden" id="node-input-trunkType">
+  </div>
   <div class="form-row">
     <label for="node-input-dest">Call type</label>
     <select id="node-input-dest">

package/src/nodes/create_call.js

@@ -71,6 +71,10 @@ module.exports = function(RED) {
 
       switch (config.dest) {
         case 'phone':
+          if (config.trunk) {
+            var trunk = new_resolve(RED, config.trunk, config.trunkType, node, msg);
+            opts.to.trunk = trunk;
+          }
           opts.to.number = to;
           break;
         case 'user':

package/src/nodes/dial.html

@@ -16,6 +16,7 @@
         actionhook: {value: ''},
         actionhookType: {value: 'str'},
         answeronbridge: {value: false},
+        anchormedia: {value: false},
         callerid: {value: ''},
         calleridType: {value: ''},
         callername: {value: ''},
@@ -30,6 +31,8 @@
         referhookType: {value: 'str'},
         dtmfhook: {value: ''},
         dtmfhookType: {value: 'str'},
+        onholdhook: {value: ''},
+        onholdhookType: {value: 'str'},
         timelimit: {validate:RED.validators.regex(/^\d*$/) },
         timeout: {validate:RED.validators.regex(/^\d*$/) },
         listenurl: {value: ''},
@@ -106,6 +109,10 @@
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-dtmfhookType')
         });
+        $('#node-input-onholdhook').typedInput({
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-onholdhookType')
+        });
         $('#node-input-transcribeurl').typedInput({
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-transcribeurlType')
@@ -408,6 +415,10 @@
       <label for="node-input-answeronbridge">Answer on bridge</label>
       <input type="checkbox" id="node-input-answeronbridge">
     </div>
+    <div class="form-row">
+      <label for="node-input-anchormedia">Anchor media</label>
+      <input type="checkbox" id="node-input-anchormedia">
+    </div>
     <div class="form-row">
       <label for="node-input-callerid">Caller ID</label>
       <input type="text" id="node-input-callerid" placeholder="caller id to place on outbound call">
@@ -443,6 +454,11 @@
       <input type="text" id="node-input-dtmfhook" placeholder="webhook to call when dtmf is captured">
       <input type="hidden" id="node-input-dtmfhookType">
     </div>
+    <div class="form-row">
+      <label for="node-input-onholdhook">Onhold hook</label>
+      <input type="text" id="node-input-onholdhook" placeholder="webhook to call when call is on hold">
+      <input type="hidden" id="node-input-onholdhookType">
+    </div>
     <div class="form-row">
       <label for="node-input-timelimit">Time limit</label>
       <input type="text" id="node-input-timelimit" placeholder="max duration of call in secs">

package/src/nodes/dial.js

@@ -54,6 +54,14 @@ module.exports = function(RED) {
         dtmfHook: new_resolve(RED, config.dtmfhook, config.dtmfhookType, node, msg),
       };
 
+      if (config.hasOwnProperty('anchormedia')) {
+        data.anchorMedia = config.anchormedia;
+      }
+
+      if (config.onholdhook) {
+        data.onHoldHook = new_resolve(RED, config.onholdhook, config.onholdhookType, node, msg);
+      }
+
       // headers
       var headers = {};
       config.headers.forEach(function(h) {

package/src/nodes/lcc.html

@@ -55,6 +55,15 @@
         siprecHeaders: {value: []},
         recordingID: {value: ''},
         recordingIDType: {value: 'str'},
+        dtmfDigit: {value: '', validate: function(v) {
+          const action = $('#node-input-action').val();
+          return action !== 'send_dtmf' || v.length > 0;
+        }},
+        dtmfDigitType: {value: 'str'},
+        dtmfDuration: {value: ''},
+        dtmfDurationType: {value: 'str'},
+        tag: {value: ''},
+        tagType: {value: 'str'},
       },
       inputs:1,
       outputs:1,
@@ -74,6 +83,8 @@
         var waitHookDiv = $('#wait-options');
         var recordDiv = $('#record-options');
         var sipRequestDiv = $('#sip-request-options');
+        var dtmfDiv = $('#dtmf-options');
+        var tagDiv = $('#tag-options');
 
         $('#node-input-callSid').typedInput({
           default: $('#node-input-callSidType').val(),
@@ -120,6 +131,21 @@
           types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-recordingIDType')
         });
+        $('#node-input-dtmfDigit').typedInput({
+          default: $('#node-input-dtmfDigitType').val(),
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-dtmfDigitType')
+        });
+        $('#node-input-dtmfDuration').typedInput({
+          default: $('#node-input-dtmfDurationType').val(),
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-dtmfDurationType')
+        });
+        $('#node-input-tag').typedInput({
+          default: $('#node-input-tagType').val(),
+          types: ['json', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-tagType')
+        });
 
         var onActionChanged = function () {
           var selectedAction = actionElem.find(':selected').val();
@@ -133,6 +159,10 @@
           else recordDiv.hide();
           if ('sip_request' === selectedAction) sipRequestDiv.show();
           else sipRequestDiv.hide();
+          if ('send_dtmf' === selectedAction) dtmfDiv.show();
+          else dtmfDiv.hide();
+          if ('tag' === selectedAction) tagDiv.show();
+          else tagDiv.hide();
         }
 
         var onVendorChanged = function() {
@@ -299,6 +329,8 @@
       <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>
+      <option value="send_dtmf">send RFC 2833 DTMF</option>
+      <option value="tag">tag call</option>
     </select>
   </div>
   <div id="say-options">
@@ -394,6 +426,25 @@
       <input type="hidden" id="node-input-sipRequestHeadersType">
     </div>
   </div>
+  <div id="dtmf-options">
+    <div class="form-row">
+      <label for="node-input-dtmfDigit">DTMF digit</label>
+      <input type="text" id="node-input-dtmfDigit">
+      <input type="hidden" id="node-input-dtmfDigitType">
+    </div>
+    <div class="form-row">
+      <label for="node-input-dtmfDuration">DTMF duration</label>
+      <input type="text" id="node-input-dtmfDuration" placeholder="250">
+      <input type="hidden" id="node-input-dtmfDurationType">
+    </div>  
+  </div>
+  <div id="tag-options">
+    <div class="form-row">
+      <label for="node-input-tag">Data</label>
+      <input type="text" id="node-input-tag" placeholder="data object">
+      <input type="hidden" id="node-input-tagType">
+    </div>
+  </div>
 </script>
 
 <!-- Help Text -->

package/src/nodes/lcc.js

@@ -113,6 +113,15 @@ function lcc(config) {
         case 'resume_call_recording':
           opts.record = { action: 'resumeCallRecording' };
           break;
+        case 'send_dtmf':
+          opts.dtmf = { 
+            digit: new_resolve(RED, config.dtmfDigit, config.dtmfDigitType, node, msg),
+            duration: new_resolve(RED, config.dtmfDuration, config.dtmfDurationType, node, msg) || '250'
+          };
+          break;
+        case 'tag':
+            opts.tag = new_resolve(RED, config.tag, config.tagType, node, msg);
+            break;
         default:
           node.log(`invalid action: ${config.action}`);
           send(msg);

package/src/nodes/libs.js

@@ -127,7 +127,11 @@ exports.appendVerb = (msg, obj) => {
       error.statusText = response.statusText;
       throw error;
     }
-    return response.json();
+    const contentType = response.headers.get('content-type');
+    if (contentType && contentType.indexOf('application/json') !== -1) {
+      return response.json();
+    }
+    return response.text();
   }
 
   exports.doCreateCall = async (node, baseUrl, accountSid, apiToken, opts) => {

package/src/nodes/sip-decline.html

@@ -14,7 +14,9 @@
         status: {},
         statusType: {value: 'num'},
         reason: {value: ''},
-        reasonType: {value: 'str'}
+        reasonType: {value: 'str'},
+        headers: {value: ''},
+        headersType: {value: 'json'},
       },
       inputs:1,
       outputs:1,
@@ -31,6 +33,11 @@
           types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-reasonType')
         });
+        $('#node-input-headers').typedInput({
+          default: $('#node-input-headersType').val(),
+          types: ['json','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-headersType')
+        });
       }
   });
 </script>
@@ -51,6 +58,11 @@
       <input type="text" id="node-input-reason" placeholder="sip reason">
       <input type="hidden" id="node-input-reasonType">
     </div>
+    <div class="form-row">
+      <label for="node-input-headers">Headers</label>
+      <input type="text" id="node-input-headers" placeholder="SIP headers">
+      <input type="hidden" id="node-input-headersType">
+    </div>
 </script>
 
 <!-- Help Text -->
@@ -62,6 +74,8 @@
       <dd>A valid SIP status code in the range 4XX - 6XX</dd>
       <dt>Reason<span class="property-type">string</span></dt>
       <dd>A brief description</dd>
+      <dt>Headers<span class="property-type">object</span></dt>
+      <dd>Additional SIP headers to include in the response</dd>
   </dl>
   
   <h3>Outputs</h3>

package/src/nodes/sip-decline.js

@@ -8,11 +8,16 @@ module.exports = function(RED) {
     node.on('input', function(msg) {
       var status = new_resolve(RED, config.status, config.statusType, node, msg);
       var reason = new_resolve(RED, config.reason, config.reasonType, node, msg);
-      appendVerb(msg, {
+      var obj = {
         verb: 'sip:decline',
         status: parseInt(status),
         reason
-      });
+      }
+      config.headers ? obj.headers = new_resolve(RED, config.headers, config.headersType, node, msg) : null
+      if (typeof obj.headers == 'string'){
+        obj.headers = JSON.parse(obj.headers)
+      }
+      appendVerb(msg, obj);
       node.send(msg);
     });
   }