@jambonz/node-red-contrib-jambonz 2.4.25 → 2.4.27

package/package.json

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

package/src/nodes/dial.html

@@ -11,7 +11,7 @@
       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', tenant: '', tenantType: 'str', vmail: false }] },
         headers: {value: []},
         actionhook: {value: ''},
         actionhookType: {value: 'str'},
@@ -160,7 +160,10 @@
                 pass: '',
                 varType: 'str',
                 trunk: '',
-                trunkType: 'str'
+                trunkType: 'str',
+                tenant: '',
+                tenantType: 'str',
+                vmail: false
               };
             }
 
@@ -174,14 +177,16 @@
             var row3 = $('<div/>',{style:"margin-top:8px;"}).appendTo(fragment);
             var row4 = $('<div/>',{style:"display:flex;margin-top:8px;"}).appendTo(fragment);
             var row5 = $('<div/>',{style:"display:flex;margin-top:8px;"}).appendTo(fragment);
+            var row6 = $('<div/>',{style:"display:flex;margin-top:8px;"}).appendTo(fragment);
+            var row7 = $('<div/>',{style:"display:flex;margin-top:8px;"}).appendTo(fragment);
 
             var selectField = $('<select/>',{class:"node-input-target-type",style:"width:110px; margin-right:10px;"})
               .appendTo(row1);
-            var selectOptions = ['phone', 'user', 'sip', 'teams'];
+            const selectOptions = ['phone', 'user', 'sip', 'teams'];
             for (var i = 0; i < 4; i++) {
                 selectField.append($("<option></option>").val(selectOptions[i]).text(selectOptions[i]));
             }
-            var propertyName = $('<input/>', {class:"node-input-target-property-name", type:"text"})
+            const propertyName = $('<input/>', {class:"node-input-target-property-name", type:"text"})
               .appendTo(row1)
               .typedInput({types: ['str', 'msg', 'flow', 'global','jsonata', 'env', mustacheType]});
 
@@ -207,14 +212,33 @@
             $('<label style="padding-top:8px; padding-right:20px">Trunk:</label>')
               .appendTo(row5);
 
-              var trunkName = $('<input/>',{
-              class:"node-input-target-property-trunk",
-              type:"text",
+            $('<input/>',{
+              class: "node-input-target-property-trunk",
+              type: "text",
               placeholder: 'Specify the name of the trunk used for this outbound call'
             })
               .appendTo(row5)
               .typedInput({types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType]});
             
+            $('<label style="padding-top:8px; padding-right:20px">Tenant:</label>')
+              .appendTo(row6);
+            
+            $('<input/>',{
+              class: "node-input-target-property-tenant",
+              type: "text",
+              placeholder: 'Specify the name of the tenant used for this outbound call'
+            })
+              .appendTo(row6)
+              .typedInput({types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType]});
+
+            $('<label style="padding-top:8px; padding-right:20px">Voicemail:</label>')
+              .appendTo(row7);
+            $('<input/>',{
+              class: "node-input-target-property-vmail",
+              type: "checkbox",
+              style: 'height: fit-content;'
+            })
+              .appendTo(row7);
             selectField.on('change', function() {
               var type = $(this).val();
               console.log(`type changed to ${type}`);
@@ -243,11 +267,18 @@
                 row3.show();
               }
 
-              if(type !== 'phone') {
+              if (type !== 'phone') {
                 row5.hide();
               } else {
                 row5.show();
               }
+              if (type !== 'teams') {
+                row6.hide();
+                row7.hide();
+              } else {
+                row6.show();
+                row7.show();
+              }
             });
             selectField.val(target.type);
             propertyName.typedInput('value', target.dest);
@@ -257,7 +288,8 @@
             var userfield = row2.find('.node-input-target-property-authuser');
             var passfield = row3.find('.node-input-target-property-authpassword');
             var trunkfield = row5.find('.node-input-target-property-trunk');
-
+            var tenantfield = row6.find('.node-input-target-property-tenant');
+            var vmailfield = row7.find('.node-input-target-property-vmail');
             datafield.typedInput('type', target.varType);
 
             switch (target.type) {
@@ -267,6 +299,10 @@
               case 'sip': 
                 userfield.val(target.user);
                 passfield.val(target.pass);
+              case 'teams':
+                tenantfield.typedInput('type', target.tenantType);
+                tenantfield.typedInput('value', target.tenant);
+                vmailfield.prop('checked', target.vmail);
               default:
                 datafield.typedInput('value', target.dest);
                 break;
@@ -285,7 +321,10 @@
             user: '',
             pass: '',
             trunk: '',
-            varType: 'str'
+            varType: 'str',
+            tenant: '',
+            tenantType: 'str',
+            vmail: false
           }
           this.targets = [target];
         }
@@ -350,11 +389,14 @@
           var target = $(this);
           var type = target.find('.node-input-target-type').val();
           var varType = target.find('.node-input-target-property-name').typedInput('type');
-          var dest    = target.find('.node-input-target-property-name').typedInput('value');
+          var dest = target.find('.node-input-target-property-name').typedInput('value');
           var user = target.find('.node-input-target-property-authuser').val();
           var pass = target.find('.node-input-target-property-authpassword').val();
           var trunk = target.find('.node-input-target-property-trunk').typedInput('value');
           var trunkType = target.find('.node-input-target-property-trunk').typedInput('type');
+          var tenant = target.find('.node-input-target-property-tenant').typedInput('value');
+          var tenantType = target.find('.node-input-target-property-tenant').typedInput('type');
+          var vmail = target.find('.node-input-target-property-vmail').prop("checked");
           if (!['phone', 'user', 'sip', 'teams'].includes(type) || 0 === dest.length) return;
 
           var t = {
@@ -362,6 +404,9 @@
             varType,
             dest
           };
+          if ('teams' === type && (tenant || vmail)) {
+            Object.assign(t, {tenant, tenantType, vmail});
+          }
           if ('sip' === type && user.length > 0 && pass.length > 0) {
             Object.assign(t, {user, pass});
           }

package/src/nodes/dial.js

@@ -3,14 +3,15 @@ var {appendVerb, new_resolve} = require('./libs')
 module.exports = function(RED) {
   function dial(config) {
     RED.nodes.createNode(this, config);
-    var node = this;
+    const node = this;
 
     node.on('input', async function(msg) {
       node.log(`dial config: ${JSON.stringify(config)}, msg.call: ${JSON.stringify(msg.call)}`);
-      var target = await Promise.all(config.targets.map(async (t) => {
-        const obj = Object.assign({}, t);
-        var dest = await new_resolve(RED, obj.dest, obj.varType, node, msg);
-        var trunk = await new_resolve(RED, obj.trunk, obj.trunkType, node, msg);
+      const target = await Promise.all(config.targets.map(async (t) => {
+        const obj = {};
+        const dest = await new_resolve(RED, t.dest, t.varType, node, msg);
+        const trunk = await new_resolve(RED, t.trunk, t.trunkType, node, msg);
+        const tenant = t.tenant ? await new_resolve(RED, t.tenant, t.tenantType, node, msg) : '';
         switch (t.type) {
           case 'phone':
             obj.number = dest;
@@ -27,19 +28,16 @@ module.exports = function(RED) {
                 password: t.pass
               };
             }
-            delete obj.user;
-            delete obj.pass;
             break;
           case 'teams':
             obj.number = dest;
+            if (tenant) obj.tenant = tenant;
+            if (t.vmail) obj.vmail = t.vmail;
             break;
         }
-        delete obj.varType;
-        delete obj.trunkType;
-        delete obj.dest;
         return obj;
       }));
-      var data = {
+      const data = {
         verb: 'dial',
         target,
         answerOnBridge: config.answeronbridge,
@@ -63,7 +61,7 @@ module.exports = function(RED) {
       }
 
       // headers
-      var headers = {};
+      const headers = {};
       config.headers.forEach(function(h) {
         if (h.h.length && h.v.length) headers[h.h] = h.v;
       });

package/src/nodes/lcc.html

@@ -60,10 +60,16 @@
           return action !== 'send_dtmf' || v.length > 0;
         }},
         dtmfDigitType: {value: 'str'},
-        dtmfDuration: {value: ''},
+        dtmfDuration: {value: '', validate: function(v) {
+          const action = $('#node-input-action').val();
+          return action !== 'send_dtmf' || v.length > 0;
+        }},
         dtmfDurationType: {value: 'str'},
-        tag: {value: ''},
-        tagType: {value: 'str'},
+        tag: {value: '{}', validate: function(v) {
+          const action = $('#node-input-action').val();
+          return action !== 'tag' || v.length > 0;
+        }},
+        tagType: {value: 'json'},
       },
       inputs:1,
       outputs:1,
@@ -118,7 +124,7 @@
         });
         $('#node-input-sipRequestHeaders').typedInput({
           default: $('#node-input-sipRequestHeadersType').val(),
-          types: ['json','msg', 'flow', 'global'],
+          types: ['msg', 'flow', 'global', 'json', 'jsonata'],
           typeField: $('#node-input-sipRequestHeadersType')
         });
         $('#node-input-siprecServerURL').typedInput({
@@ -143,7 +149,7 @@
         });
         $('#node-input-tag').typedInput({
           default: $('#node-input-tagType').val(),
-          types: ['json', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          types: ['msg', 'flow', 'global', 'json', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-tagType')
         });
 

package/src/nodes/lcc.js

@@ -62,11 +62,12 @@ function lcc(config) {
           break;
         case 'unhold_conf':
           opts.conf_hold_status = 'unhold';
+          break;
         case 'whisper':
           Object.assign(opts, {
             whisper: {
               verb: 'say',
-              text: config.text
+              text: await new_resolve(RED, config.text, 'mustache', node, msg),
             }
           });
           if (['aws', 'google'].includes(config.vendor)) {

package/src/nodes/listen.js

@@ -74,7 +74,7 @@ module.exports = function(RED) {
         };
       }
       if (/^\d+$/.test(config.timeout)) obj.timeout = parseInt(config.timeout);
-      if (/^\d+$/.test(config.maxlength)) obj.maxLength = parseInt(config.maxLength);
+      if (/^\d+$/.test(config.maxlength)) obj.maxLength = parseInt(config.maxlength);
       if (config.finishonkey.length) obj.finishOnKey = config.finishonkey;
 
       var data = await new_resolve(RED, config.metadata, config.metadataType, node, msg);
@@ -85,4 +85,4 @@ module.exports = function(RED) {
     });
   }
   RED.nodes.registerType('listen', listen);
-}
+}