@jambonz/node-red-contrib-jambonz 2.3.0 → 2.3.1

package/package.json

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

package/src/nodes/dial.html

@@ -5,7 +5,7 @@ RED.nodes.registerType('dial',{
       color: '#bbabaa',
       defaults: {
         name: {value: ''},
-        targets:{value:[{type: 'phone', dest: '', user: '', pass: '', varType: 'str', trunk: ''}]},
+        targets:{value:[{type: 'phone', dest: '', user: '', pass: '', varType: 'str', trunk: '', trunkType: 'str'}]},
         headers: {value: []},
         actionhook: {value: ''},
         actionhookType: {value: 'str'},
@@ -64,6 +64,10 @@ RED.nodes.registerType('dial',{
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
           typeField: $('#node-input-calleridType')
         });
+        $('#node-input-target-property-trunk').typedInput({
+          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          typeField: $('#node-input-target-property-trunk')
+        });
         $('#node-input-actionhook').typedInput({
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
           typeField: $('#node-input-actionhookType')
@@ -130,7 +134,9 @@ RED.nodes.registerType('dial',{
                 dest: '',
                 user: '',
                 pass: '',
-                varType: 'str'
+                varType: 'str',
+                trunk: '',
+                trunkType: 'str'
               };
             }
 
@@ -143,7 +149,7 @@ RED.nodes.registerType('dial',{
             var row2 = $('<div/>',{style:"display:flex;margin-top:8px;"}).appendTo(fragment);
             var row3 = $('<div/>',{style:"margin-top:8px;"}).appendTo(fragment);
             var row4 = $('<div/>',{style:"display:flex;margin-top:8px;"}).appendTo(fragment);
-            var row5 = $('<div/>',{style:"margin-top:8px;"}).appendTo(fragment);
+            var row5 = $('<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);
@@ -177,12 +183,13 @@ RED.nodes.registerType('dial',{
             $('<label style="padding-top:8px; padding-right:20px">Trunk:</label>')
               .appendTo(row5);
 
-            $('<input/>',{
+              var trunkName = $('<input/>',{
               class:"node-input-target-property-trunk",
               type:"text",
               placeholder: 'Specify the name of the trunk used for this outbound call'
             })
-              .appendTo(row5);
+              .appendTo(row5)
+              .typedInput({types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env']});
             
             selectField.on('change', function() {
               var type = $(this).val();
@@ -231,7 +238,8 @@ RED.nodes.registerType('dial',{
 
             switch (target.type) {
               case 'phone':
-                trunkfield.val(target.trunk);
+                trunkfield.typedInput('type', target.trunkType);
+                trunkfield.typedInput('value', target.trunk);
               case 'sip': 
                 userfield.val(target.user);
                 passfield.val(target.pass);
@@ -321,7 +329,8 @@ RED.nodes.registerType('dial',{
           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').val();
+          var trunk = target.find('.node-input-target-property-trunk').typedInput('value');
+          var trunkType = target.find('.node-input-target-property-trunk').typedInput('type');
           if (!['phone', 'user', 'sip', 'teams'].includes(type) || 0 === dest.length) return;
 
           var t = {
@@ -333,6 +342,7 @@ RED.nodes.registerType('dial',{
             Object.assign(t, {user, pass});
           }
           if ('phone' === type && trunk.length > 0) {
+            t.trunkType = trunkType;
             t.trunk = trunk;
           }
           node.targets.push(t);

package/src/nodes/dial.js

@@ -13,10 +13,12 @@ module.exports = function(RED) {
       var target = config.targets.map((t) => {
         const obj = Object.assign({}, t);
         var dest = v_resolve(obj.dest, obj.varType, this.context(), msg);
+        var trunk = v_resolve(obj.trunk, obj.trunkType, this.context(), msg);
         node.log(`dial: dest ${t.varType}:${t.dest} resolved to ${dest}`);
         switch (t.type) {
           case 'phone':
             obj.number = dest;
+            obj.trunk = trunk;
             break;
           case 'user':
             obj.name = dest;
@@ -37,6 +39,7 @@ module.exports = function(RED) {
             break;
         }
         delete obj.varType;
+        delete obj.trunkType;
         delete obj.dest;
         return obj;
       });

package/src/nodes/gather.html

@@ -315,6 +315,10 @@
   
     <h3>Details</h3>
     The gather command is used to collect dtmf or speech input.
+
+    Within the text field you can use mustache syntax to insert properties of the msg, flow or global objects.
+    For example if you wanted to insert the value of msg.payload into the text you could put
+    <code>The payload is {{msg.payload}}</code>
     <h3>References</h3>
       <ul>
           <li><a href="https://docs.jambonz.org/jambonz/#gather">Jambonz gather reference</a></li>

package/src/nodes/libs.js

@@ -71,7 +71,8 @@ exports.appendVerb = (msg, obj) => {
       }
       return '${' + b + '}';
     });
-    return newString;
+    data = {'global' : glob, 'flow' : flow, 'msg' : msg}
+    return mustache.render(newString, data);
   }
   
 

package/src/nodes/say.html

@@ -109,6 +109,10 @@
   <h3>Details</h3>
   The say command is used to send synthesized speech to the remote party. 
   The text provided may be either plain text or may use SSML tags.
+  
+  Within the text field you can use mustache syntax to insert properties of the msg, flow or global objects.
+  For example if you wanted to insert the value of msg.payload into the text you could put
+  <code>The payload is {{msg.payload}}</code>
   <h3>References</h3>
     <ul>
         <li><a href="https://docs.jambonz.org/jambonz/#say">Jambonz say reference</a></li>