@jambonz/node-red-contrib-jambonz 2.4.6 → 2.4.8

package/package.json

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

package/src/nodes/dial.html

@@ -1,29 +1,33 @@
 <!-- Javascript -->
 <script type="text/javascript">
-    var mustacheType = {
+  var mustacheType = {
     value: 'mustache',
     label: 'mustache',
     hasvalue: true,
     icon: 'resources/@jambonz/node-red-contrib-jambonz/icons/mustache.svg'
   }
-  RED.nodes.registerType('dial',{
+  RED.nodes.registerType('dial', {
       category: 'jambonz',
       color: '#bbabaa',
       defaults: {
         name: {value: ''},
-        targets:{value:[{type: 'phone', dest: '', user: '', pass: '', varType: 'str', trunk: '', trunkType: 'str'}]},
+        targets: {value:[{type: 'phone', dest: '', user: '', pass: '', varType: 'str', trunk: '', trunkType: 'str'}]},
         headers: {value: []},
         actionhook: {value: ''},
         actionhookType: {value: 'str'},
         answeronbridge: {value: false},
         callerid: {value: ''},
         calleridType: {value: ''},
+        callername: {value: ''},
+        callernameType: {value: ''},
         confirmhook: {value: ''},
         confirmhookType: {value: 'str'},
         dialmusic: {value: ''},
         dialmusicType: {value: 'str'},
         dtmfcapture: {value: ''},
         dtmfcaptureType: {value: 'str'},
+        referhook: {value: ''},
+        referhookType: {value: 'str'},
         dtmfhook: {value: ''},
         dtmfhookType: {value: 'str'},
         timelimit: {validate:RED.validators.regex(/^\d*$/) },
@@ -70,6 +74,10 @@
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-calleridType')
         });
+        $('#node-input-callername').typedInput({
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-callernameType')
+        });
         $('#node-input-target-property-trunk').typedInput({
           types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-target-property-trunk')
@@ -90,6 +98,10 @@
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-dtmfcaptureType')
         });
+        $('#node-input-referhook').typedInput({
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-referhookType')
+        });
         $('#node-input-dtmfhook').typedInput({
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-dtmfhookType')
@@ -382,7 +394,7 @@
       <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row" style="margin-bottom:0;">
-      <label><i class="fa fa-list"></i><span>Dial Targets</span></label>
+      <label><i class="fa fa-list"></i> <span>Dial Targets</span></label>
     </div>
     <div class="form-row node-input-target-container-row">
         <ol id="node-input-target-container"></ol>
@@ -398,9 +410,14 @@
     </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">
+      <input type="text" id="node-input-callerid" placeholder="caller id to place on outbound call">
       <input type="hidden" id="node-input-calleridType">
     </div>
+    <div class="form-row">
+      <label for="node-input-callername">Caller name</label>
+      <input type="text" id="node-input-callername" placeholder="caller name to place on outbound call">
+      <input type="hidden" id="node-input-callernameType">
+    </div>
     <div class="form-row">
       <label for="node-input-confirmhook">Confirm hook</label>
       <input type="text" id="node-input-confirmhook" placeholder="webhook to run on called party after answer">
@@ -416,6 +433,11 @@
       <input type="text" id="node-input-dtmfcapture" placeholder="comma-separated list of dtmf captures">
       <input type="hidden" id="node-input-dtmfcaptureType">
     </div>
+    <div class="form-row">
+      <label for="node-input-referhook">Refer hook</label>
+      <input type="text" id="node-input-referhook" placeholder="webhook to call when sip refer is received">
+      <input type="hidden" id="node-input-referhookType">
+    </div>
     <div class="form-row">
       <label for="node-input-dtmfhook">Dtmf hook</label>
       <input type="text" id="node-input-dtmfhook" placeholder="webhook to call when dtmf is captured">

package/src/nodes/dial.js

@@ -46,9 +46,11 @@ module.exports = function(RED) {
         timeLimit: config.timelimit ? parseInt(config.timelimit) : null,
         timeout: config.timeout ? parseInt(config.timeout) : null,
         callerId: new_resolve(RED, config.callerid, config.calleridType, node, msg),
+        callerName: new_resolve(RED, config.callername, config.callernameType, node, msg),
         actionHook: new_resolve(RED, config.actionhook, config.actionhookType, node, msg),
         confirmHook: new_resolve(RED, config.confirmhook, config.confirmhookType, node, msg), 
         dialMusic: new_resolve(RED, config.dialmusic, config.dialmusicType, node, msg),
+        referHook: new_resolve(RED, config.referhook, config.referhookType, node, msg),
         dtmfHook: new_resolve(RED, config.dtmfhook, config.dtmfhookType, node, msg),
       };
 

package/src/nodes/lcc.html

@@ -1,12 +1,11 @@
 <!-- Javascript -->
 <script type="text/javascript">
   var mustacheType = {
-  value: 'mustache',
-  label: 'mustache',
-  hasvalue: true,
-  icon: 'resources/@jambonz/node-red-contrib-jambonz/icons/mustache.svg'
+    value: 'mustache',
+    label: 'mustache',
+    hasvalue: true,
+    icon: 'resources/@jambonz/node-red-contrib-jambonz/icons/mustache.svg'
   }
-
   RED.nodes.registerType('lcc',{
       category: 'jambonz',
       color: '#aebfb9',
@@ -38,6 +37,7 @@
           return action !== 'start_call_recording' || v.length > 0;
         }},
         siprecServerURLType: {value: 'str'},
+        siprecHeaders: {value: []},
         recordingID: {value: ''},
         recordingIDType: {value: 'str'},
       },
@@ -166,6 +166,61 @@
         vendorElem.change(onVendorChanged);
         langElem.change(onLangChanged);
         voiceElem.change(onVoiceChanged);
+
+        $('#node-input-siprecHeaders-container').css('min-height','120px').css('min-width','450px').editableList({
+          addItem: function(container, i, opt) {
+            var header = opt;
+            if (!header.hasOwnProperty('h')) {
+                header = {h: '', v: ''};
+            }
+            container.css({
+              overflow: 'hidden',
+              whiteSpace: 'nowrap'
+            });
+            let fragment = document.createDocumentFragment();
+            var row1 = $('<div/>',{style:"display:flex;"}).appendTo(fragment);
+            $('<input/>', {
+              class:"node-input-header-property-name", 
+              type:"text", 
+              placeholder: 'SIP Header'
+            })
+              .appendTo(row1);
+            $('<input/>', {
+              class:"node-input-value-property-name", 
+              type:"text", 
+              placeholder: 'value'
+            })
+              .appendTo(row1);
+            row1.find('.node-input-header-property-name').val(header.h);
+            row1.find('.node-input-value-property-name').val(header.v);
+            container[0].appendChild(fragment);
+          },
+          removable: true
+        });
+        if (!this.siprecHeaders) {
+          var header = {
+            h: '',
+            v: '',
+          };
+          this.siprecHeaders = [header];
+        }
+        for (var i=0; i < this.siprecHeaders.length; i++) {
+            var header = this.siprecHeaders[i];
+            $("#node-input-siprecHeaders-container").editableList('addItem', header);
+        }
+      },
+      oneditsave: function () {
+        var node = this;
+        var headers = [];
+        $("#node-input-siprecHeaders-container").editableList('items').each(function(i) {
+          var header = $(this);
+          var h = header.find(".node-input-header-property-name").val();
+          var v = header.find(".node-input-value-property-name").val();
+          var obj = {};
+          obj[h] = v;
+          headers.push({h, v});
+        });
+        node.siprecHeaders = headers;
       }
   });
 </script>
@@ -259,6 +314,14 @@
       <input type="text" id="node-input-recordingID" placeholder="545362a9-4cb3-4a55-85b8-b33ca83a6517">
       <input type="hidden" id="node-input-recordingIDType">
     </div>  
+    <fieldset>
+      <div class="form-row" style="margin-bottom:0;">
+        <label style="width:100%"><i class="fa fa-list"></i> <span>Add custom SIPREC headers</span></label>
+      </div>
+      <div class="form-row node-input-siprecHeaders-container-row">
+          <ol id="node-input-siprecHeaders-container"></ol>
+      </div>
+    </fieldset>
   </div>
 </script>
 

package/src/nodes/lcc.js

@@ -76,6 +76,16 @@ function lcc(config) {
             siprecServerURL: new_resolve(RED, config.siprecServerURL, config.siprecServerURLType, node, msg),
             recordingID: new_resolve(RED, config.recordingID, config.recordingIDType, node, msg) || crypto.randomUUID()
           };
+          // SIPREC headers
+          if (config.siprecHeaders) {
+            var headers = {};
+            config.siprecHeaders.forEach(function(h) {
+              if (h.h.length && h.v.length) headers[h.h] = h.v;
+            });
+            if (Object.keys(headers).length) {
+              Object.assign(opts.record, {headers});
+            }
+          }
           break;
         case 'stop_call_recording':
           opts.record = { action: 'stopCallRecording' };