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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/node-red-contrib-jambonz",
-  "version": "2.3.11",
+  "version": "2.4.1",
   "description": "Node-RED nodes for jambonz platform",
   "keywords": [
     "node-red"
@@ -53,9 +53,9 @@
   "author": "Dave Horton",
   "license": "MIT",
   "dependencies": {
-    "aws-sdk": "^2.1302.0",
+    "aws-sdk": "^2.1354.0",
     "bent": "^7.3.12",
-    "body-parser": "^1.20.1",
+    "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "hash-sum": "^2.0.0",
@@ -64,8 +64,8 @@
     "multer": "^1.4.4",
     "mustache": "^4.2.0",
     "on-headers": "^1.0.2",
-    "raw-body": "^2.5.1",
+    "raw-body": "^2.5.2",
     "s3-upload-stream": "^1.0.7",
-    "ws": "^8.12.1"
+    "ws": "^8.13.0"
   }
 }

package/resources/editor.js

@@ -392,9 +392,11 @@
     }
     var onXVoiceChanged = function() {
       var voice = xvoiceElem.find(':selected').val();
-      node.voice = voice;
-      console.log(`voice dropdown changed to ${voice}`);
-      voiceElem.val(voice);
+      if (voice) {
+        node.voice = voice;
+        console.log(`voice dropdown changed to ${voice}`);
+        voiceElem.val(voice);
+      }
     }
 
     vendorElem.change(onVendorChanged);

package/resources/icons/mustache.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="none"><path transform ="rotate(90, 12, 12)" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9.5 5H9a2 2 0 0 0-2 2v2c0 1-.6 3-3 3 1 0 3 .6 3 3v2a2 2 0 0 0 2 2h.5m5-14"/></svg> 

package/src/nodes/{template.js → _template.js}

@@ -2,7 +2,7 @@ var {createHash} = require('crypto');
 const bent = require('bent');
 var mustache = require('mustache');
 mustache.escape = function(text) {return text;};
-var {appendVerb, v_resolve, v_text_resolve, doLCC, doCreateCall, doCreateMessage} = require('./libs')
+var {appendVerb, v_resolve, v_text_resolve, doLCC, doCreateCall, doCreateMessage, new_resolve} = require('./libs')
 
 module.exports = function(RED) {
 

package/src/nodes/conference.html

@@ -1,5 +1,12 @@
 <!-- Javascript -->
 <script type="text/javascript">
+    var mustacheType = {
+    value: 'mustache',
+    label: 'mustache',
+    hasvalue: true,
+    icon: 'resources/@jambonz/node-red-contrib-jambonz/icons/mustache.svg'
+  }
+
   RED.nodes.registerType('conference',{
     category: 'jambonz',
     color: '#bbabaa',
@@ -26,19 +33,19 @@
     },
     oneditprepare: function() {
       $('#node-input-conference').typedInput({
-        types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+        types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
         typeField: $('#node-input-conferenceType')
       });
       $('#node-input-enterHook').typedInput({
-        types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+        types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
         typeField: $('#node-input-enterHookType')
       });
       $('#node-input-waitHook').typedInput({
-        types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+        types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
         typeField: $('#node-input-waitHookType')
       });
       $('#node-input-maxParticipants').typedInput({
-        types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+        types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
         typeField: $('#node-input-maxParticipantsType')
       });
     }

package/src/nodes/conference.js

@@ -1,4 +1,4 @@
-var {appendVerb, v_resolve} = require('./libs')
+var {appendVerb, new_resolve} = require('./libs')
 
 module.exports = function(RED) {
   /** conference */
@@ -6,14 +6,12 @@ module.exports = function(RED) {
     RED.nodes.createNode(this, config);
     var node = this;
     node.on('input', function(msg) {
-      var val = v_resolve(config.maxParticipants, config.maxParticipantsType, this.context(), msg);
-      var maxParticipants = /^\d+$/.test(val) ? parseInt(val) : val;
-
+      var maxParticipants = new_resolve(RED, config.maxParticipants, config.maxParticipantsType, node, msg)
       appendVerb(msg, {
         verb: 'conference',
-        name:  v_resolve(config.conference, config.conferenceType, this.context(), msg),
-        enterHook: v_resolve(config.enterHook, config.enterHookType, this.context(), msg),
-        waitHook: v_resolve(config.waitHook, config.waitHookType, this.context(), msg),
+        name: new_resolve(RED, config.conference, config.conferenceType, node, msg),
+        enterHook: new_resolve(RED, config.enterHook, config.enterHookType, node, msg),
+        waitHook: new_resolve(RED, config.waitHook, config.waitHookType, node, msg),
         maxParticipants,
         beep: config.beep,
         startConferenceOnEnter: config.startConferenceOnEnter,

package/src/nodes/config.html

@@ -85,15 +85,15 @@
         $('#bargeIn-options').hide()
 
         $('#node-input-transcriptionhints').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-transcriptionhintsType')
         });
         $('#node-input-recognizeraltlang').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-recognizeraltlangType')
         });
         $('#node-input-naics').typedInput({
-          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-naicsType')
         });
 
@@ -131,7 +131,7 @@
         });
 
         $('#node-input-bargeIn_actionHook').typedInput({
-            types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-bargeIn_actionHookType')
         });
         $('#node-input-bargeIn_input').typedInput({
@@ -146,23 +146,23 @@
           typeField: $('#node-input-bargeIn_inputType')
         });
         $('#node-input-bargeIn_finishOnKey').typedInput({
-            types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-bargeIn_finishOnKeyType')
         });
         $('#node-input-bargeIn_numDigits').typedInput({
-            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-bargeIn_numDigitsType')
         });
         $('#node-input-bargeIn_minDigits').typedInput({
-            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-bargeIn_minDigitsType')
         });
         $('#node-input-bargeIn_maxDigits').typedInput({
-            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-bargeIn_maxDigitsType')
         });
         $('#node-input-bargeIn_interDigitTimeout').typedInput({
-            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-bargeIn_interDigitTimeoutType')
         });
 
@@ -177,27 +177,27 @@
           }
         });
         $('#node-input-amd_actionHook').typedInput({
-            types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-amd_actionHookType')
         });
         $('#node-input-amd_thresholdWordCount').typedInput({
-            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-amd_thresholdWordCountType')
         });
         $('#node-input-amd_timers_noSpeechTimeoutMs').typedInput({
-            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-amd_timers_noSpeechTimeoutMsType')
         });
         $('#node-input-amd_timers_decisionTimeoutMs').typedInput({
-            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-amd_timers_decisionTimeoutMsType')
         });
         $('#node-input-amd_timers_toneTimeoutMs').typedInput({
-            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-amd_timers_toneTimeoutMsType')
         });
         $('#node-input-amd_timers_greetingCompletionTimeoutMs').typedInput({
-            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-amd_timers_greetingCompletionTimeoutMsType')
         });
 
@@ -225,11 +225,11 @@
           typeField: $('#node-input-record_actionType')
         });
         $('#node-input-record_siprecServerURL').typedInput({
-            types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-record_siprecServerURLType')
         });
         $('#node-input-record_recordingID').typedInput({
-            types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+            types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-record_recordingIDType')
         });
       }

package/src/nodes/config.js

@@ -1,4 +1,4 @@
-var {appendVerb} = require('./libs')
+var {appendVerb, new_resolve} = require('./libs')
 
 module.exports = function(RED) {
     function cfg(config) {
@@ -23,9 +23,9 @@ module.exports = function(RED) {
               }
             })
             if (config.transcriptionvendor == 'google'){
-              obj.recognizer.hints = config.transcriptionhints
-              obj.recognizer.altLanguages = [config.altLanguages]
-              obj.recognizer.naicsCode = config.naics
+              obj.recognizer.hints = new_resolve(RED, config.transcriptionhints, config.transcriptionhintsType, node, msg)
+              obj.recognizer.altLanguages = [new_resolve(RED, config.altLanguages, config.altLanguagesType, node, msg)]
+              obj.recognizer.naicsCode = new_resolve(RED, config.naics, config.naicsType, node, msg)
             }
             if (config.transcriptionvendor == 'aws'){
               obj.recognizer.vocabularyName = config.vocabularyname
@@ -37,30 +37,30 @@ module.exports = function(RED) {
           if (config.bargeIn){
             obj.bargeIn = {}
             config.bargeIn_enable != '' ? obj.bargeIn.enable = config.bargeIn_enable : null
-            config.bargeIn_actionHook != '' ? obj.bargeIn.actionHook = config.bargeIn_actionHook : null
+            config.bargeIn_actionHook != '' ? obj.bargeIn.actionHook = new_resolve(RED, config.bargeIn_actionHook, config.bargeIn_actionHookType, node, msg) : null
             config.bargeIn_input != '' ? obj.bargeIn.input = config.bargeIn_input.split(',') : null
-            config.bargeIn_finishOnKey != '' ? obj.bargeIn.finishOnKey = config.bargeIn_finishOnKey : null
-            config.bargeIn_numDigits != '' ? obj.bargeIn.numDigits = config.bargeIn_numDigits : null
-            config.bargeIn_minDigits != '' ? obj.bargeIn.minDigits = config.bargeIn_minDigits : null
-            config.bargeIn_maxDigits != '' ? obj.bargeIn.maxDigits = config.bargeIn_maxDigits : null
-            config.bargeIn_interDigitTimeout != '' ? obj.bargeIn.interDigitTimeout = config.bargeIn_interDigitTimeout : null
+            config.bargeIn_finishOnKey != '' ? obj.bargeIn.finishOnKey = new_resolve(RED, config.bargeIn_finishOnKey, config.bargeIn_finishOnKeyType, node, msg) : null
+            config.bargeIn_numDigits != '' ? obj.bargeIn.numDigits = new_resolve(RED, config.bargeIn_numDigits, config.bargeIn_numDigitsType, node, msg) : null
+            config.bargeIn_minDigits != '' ? obj.bargeIn.minDigits = new_resolve(RED, config.bargeIn_minDigits, config.bargeIn_minDigitsType, node, msg) : null
+            config.bargeIn_maxDigits != '' ? obj.bargeIn.maxDigits = new_resolve(RED, config.bargeIn_maxDigits, config.bargeIn_maxDigitsType, node, msg) : null
+            config.bargeIn_interDigitTimeout != '' ? obj.bargeIn.interDigitTimeout = new_resolve(RED, config.bargeIn_interDigitTimeout, config.bargeIn_interDigitTimeoutType, node, msg) : null
           }
 
           if (config.amd){
             obj.amd = {timers : {}}
-            config.amd_actionHook != '' ? obj.amd.actionHook = config.amd_actionHook : null
-            config.amd_thresholdWordCount != '' ? obj.amd.thresholdWordCount = config.amd_thresholdWordCount : null
-            config.amd_timers_noSpeechTimeoutMs != '' ? obj.amd.timers.noSpeechTimeoutMs = config.amd_timers_noSpeechTimeoutMs : null
-            config.amd_timers_decisionTimeoutMs != '' ? obj.amd.timers.decisionTimeoutMs = config.amd_timers_decisionTimeoutMs : null
-            config.amd_timers_toneTimeoutMs != '' ?	 obj.amd.timers.toneTimeoutMs = config.amd_timers_toneTimeoutMs : null
-            config.amd_timers_greetingCompletionTimeoutMs != '' ? obj.amd.timers.greetingCompletionTimeoutMs = config.amd_timers_greetingCompletionTimeoutMs : null
+            config.amd_actionHook != '' ? obj.amd.actionHook = new_resolve(RED, config.amd_actionHook, config.amd_actionHookType, node, msg) : null
+            config.amd_thresholdWordCount != '' ? obj.amd.thresholdWordCount = new_resolve(RED, config.amd_thresholdWordCount, config.amd_thresholdWordCountType, node, msg) : null
+            config.amd_timers_noSpeechTimeoutMs != '' ? obj.amd.timers.noSpeechTimeoutMs = new_resolve(RED, config.amd_timers_noSpeechTimeoutMs, config.amd_timers_noSpeechTimeoutMsType, node, msg) : null
+            config.amd_timers_decisionTimeoutMs != '' ? obj.amd.timers.decisionTimeoutMs = new_resolve(RED, config.amd_timers_decisionTimeoutMs, config.amd_timers_decisionTimeoutMsType, node, msg) : null
+            config.amd_timers_toneTimeoutMs != '' ?	 obj.amd.timers.toneTimeoutMs = new_resolve(RED, config.amd_timers_toneTimeoutMs, config.amd_timers_toneTimeoutMsType, node, msg) : null
+            config.amd_timers_greetingCompletionTimeoutMs != '' ? obj.amd.timers.greetingCompletionTimeoutMs = new_resolve(RED, config.amd_timers_greetingCompletionTimeoutMs, config.amd_timers_greetingCompletionTimeoutMsType, node, msg) : null
           }
 
           if (config.record){
             obj.record = {}
             config.record_action != '' ? obj.record.action = config.record_action : null //TODO if multiple, split into array
-            config.record_siprecServerURL != '' ? obj.record.siprecServerURL = config.record_siprecServerURL : null
-            config.record_recordingID != '' ? obj.record.recordingID = config.record_recordingID : null
+            config.record_siprecServerURL != '' ? obj.record.siprecServerURL = new_resolve(RED, config.record_siprecServerURL, config.record_siprecServerURLType, node, msg) : null
+            config.record_recordingID != '' ? obj.record.recordingID = new_resolve(RED, config.record_recordingID, config.record_recordingIDType, node, msg) : null
           }
           appendVerb(msg,  obj);
           node.send(msg);

package/src/nodes/create_call.html

@@ -1,5 +1,12 @@
 <!-- Javascript -->
 <script type="text/javascript">
+  var mustacheType = {
+    value: 'mustache',
+    label: 'mustache',
+    hasvalue: true,
+    icon: 'resources/@jambonz/node-red-contrib-jambonz/icons/mustache.svg'
+  }
+
   RED.nodes.registerType('create-call',{
       category: 'jambonz',
       color: '#aebfb9',
@@ -59,22 +66,22 @@
 
         $('#node-input-from').typedInput({
           default: $('#node-input-fromType').val(),
-          types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-fromType')
         });
         $('#node-input-to').typedInput({
           default: $('#node-input-toType').val(),
-          types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-toType')
         });
         $('#node-input-call_hook_url').typedInput({
           default: $('#node-input-call_hook_urlType').val(),
-          types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-call_hook_urlType')
         });
         $('#node-input-call_status_url').typedInput({
           default: $('#node-input-call_status_urlType').val(),
-          types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-call_status_urlType')
         });
 

package/src/nodes/create_call.js

@@ -1,4 +1,4 @@
-var {v_resolve, doCreateCall, } = require('./libs')
+var {doCreateCall, new_resolve } = require('./libs')
 
 module.exports = function(RED) {
   /** Create call */
@@ -19,8 +19,8 @@ module.exports = function(RED) {
         return;
       }
 
-      var from = v_resolve(config.from, config.fromType, this.context(), msg);
-      var to = v_resolve(config.to, config.toType, this.context(), msg);
+      var from = new_resolve(RED, config.from, config.fromType, node, msg)
+      var to =   new_resolve(RED, config.to, config.toType, node, msg)
 
       const opts = {
         from,
@@ -35,11 +35,11 @@ module.exports = function(RED) {
           break
         case 'url':
           opts.call_hook = {
-            url: v_resolve(config.call_hook_url, config.call_hook_urlType, this.context(), msg),
+            url:  new_resolve(RED, config.call_hook_url, config.call_hook_urlType, node, msg),
             method: config.call_hook_method
           };
           opts.call_status_hook = {
-            url: v_resolve(config.call_status_url, config.call_status_urlType, this.context(), msg),
+            url: new_resolve(RED, config.call_status_url, config.call_status_urlType, node, msg),
             method: config.call_status_method
           };
           opts.speech_synthesis_vendor = config.vendor;

package/src/nodes/create_sms.html

@@ -1,5 +1,12 @@
 <!-- Javascript -->
 <script type="text/javascript">
+  var mustacheType = {
+    value: 'mustache',
+    label: 'mustache',
+    hasvalue: true,
+    icon: 'resources/@jambonz/node-red-contrib-jambonz/icons/mustache.svg'
+  }
+
   RED.nodes.registerType('create-sms',{
       category: 'jambonz',
       color: '#aebfb9',
@@ -26,22 +33,22 @@
 
         $('#node-input-from').typedInput({
           default: $('#node-input-fromType').val(),
-          types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-fromType')
         });
         $('#node-input-to').typedInput({
           default: $('#node-input-toType').val(),
-          types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-toType')
         });
         $('#node-input-text').typedInput({
           default: $('#node-input-textType').val(),
-          types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-textType')
         });
         $('#node-input-provider').typedInput({
           default: $('#node-input-providerType').val(),
-          types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-providerType')
         });
       }

package/src/nodes/create_sms.js

@@ -1,4 +1,4 @@
-var {v_resolve, doCreateMessage} = require('./libs')
+var {doCreateMessage, new_resolve} = require('./libs')
 
 module.exports = function(RED) {
 /** Create sms */
@@ -19,10 +19,10 @@ function create_sms(config) {
         return;
       }
 
-      var from = v_resolve(config.from, config.fromType, this.context(), msg);
-      var to = v_resolve(config.to, config.toType, this.context(), msg);
-      var text = v_resolve(config.text, config.textType, this.context(), msg);
-      var provider = v_resolve(config.provider, config.providerType, this.context(), msg);
+      var from = new_resolve(RED, config.from, config.fromType, node, msg)
+      var to = new_resolve(RED, config.to, config.toType, node, msg)
+      var text = new_resolve(RED, config.text, config.textType, node, msg);
+      var provider = new_resolve(RED, config.provider, config.providerType, node, msg)
 
       const opts = {
         from,

package/src/nodes/dequeue.html

@@ -1,5 +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'
+  }
   RED.nodes.registerType('dequeue',{
       category: 'jambonz',
       color: '#bbabaa',
@@ -25,23 +31,23 @@
       },
       oneditprepare: function() {
         $('#node-input-queue').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-queueType')
         });
         $('#node-input-callSid').typedInput({
-          types: ['str', 'msg', 'flow', 'global'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-callSidType')
         });
         $('#node-input-actionHook').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-actionHookType')
         });
         $('#node-input-confirmHook').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-confirmHookType')
         });
         $('#node-input-timeout').typedInput({
-          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-timeoutType')
         });
       }

package/src/nodes/dequeue.js

@@ -1,4 +1,4 @@
-var {appendVerb, v_resolve} = require('./libs')
+var {appendVerb,  new_resolve} = require('./libs')
 
 module.exports = function(RED) {
   /** dequeue */
@@ -6,14 +6,14 @@ 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);
+      const timeout = new_resolve(RED, config.timeout, config.timeoutType, node, 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),
+        name:  new_resolve(RED, config.queue, config.queueType, node, msg),
+        callSid: new_resolve(RED, config.callSid, config.callSidType, node, msg),
         beep: config.beep,
-        actionHook: v_resolve(config.actionHook, config.actionHookType, this.context(), msg),
-        confirmHook: v_resolve(config.confirmHook, config.confirmHookType, this.context(), msg),
+        actionHook: new_resolve(RED, config.actionHook, config.actionHookType, node, msg),
+        confirmHook: new_resolve(RED, config.confirmHook, config.confirmHookType, node, msg),
         timeout: (/^\d+$/.test(timeout)) ? parseInt(timeout) : null,
       });
       node.send(msg);

package/src/nodes/dial.html

@@ -1,11 +1,17 @@
 <!-- Javascript -->
 <script type="text/javascript">
+    var mustacheType = {
+    value: 'mustache',
+    label: 'mustache',
+    hasvalue: true,
+    icon: 'resources/@jambonz/node-red-contrib-jambonz/icons/mustache.svg'
+  }
   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: '', destType: 'str', trunk: '', trunkType: 'str'}]},
         headers: {value: []},
         actionhook: {value: ''},
         actionhookType: {value: 'str'},
@@ -61,67 +67,66 @@
       oneditprepare: function() {
         var node = this;
         $('#node-input-callerid').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-calleridType')
         });
         $('#node-input-target-property-trunk').typedInput({
-          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-target-property-trunk')
         });
         $('#node-input-actionhook').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-actionhookType')
         });
         $('#node-input-confirmhook').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-confirmhookType')
         });
         $('#node-input-dialmusic').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-dialmusicType')
         });
         $('#node-input-dtmfcapture').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-dtmfcaptureType')
         });
         $('#node-input-dtmfhook').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-dtmfhookType')
         });
         $('#node-input-transcribeurl').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-transcribeurlType')
         });
         $('#node-input-listenurl').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-listenurlType')
         });
         $('#node-input-transcriptionhook').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-transcriptionhookType')
         });
         $('#node-input-transcriptionhints').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-transcriptionhintsType')
         });
         $('#node-input-recognizeraltlang').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-recognizeraltlangType')
         });
         $('#node-input-diarizationmin').typedInput({
-          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-diarizationminType')
         });
         $('#node-input-diarizationmax').typedInput({
-          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-diarizationmaxType')
         });
         $('#node-input-naics').typedInput({
-          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-naicsType')
         });
 
-        console.log('oneditprepare - dial');
         prepareSttControls(node);
 
         $('#node-input-target-container').css('min-height','180px').css('min-width','450px').editableList({
@@ -134,7 +139,7 @@
                 dest: '',
                 user: '',
                 pass: '',
-                varType: 'str',
+                destType: 'str',
                 trunk: '',
                 trunkType: 'str'
               };
@@ -159,7 +164,7 @@
             }
             var propertyName = $('<input/>', {class:"node-input-target-property-name", type:"text"})
               .appendTo(row1)
-              .typedInput({types: ['str', 'msg', 'flow', 'global']});
+              .typedInput({types: ['str', 'msg', 'flow', 'global','jsonata', 'env', mustacheType]});
 
             $('<label style="padding-top:8px; padding-right:20px">Auth Username:</label>')
               .appendTo(row2);
@@ -189,7 +194,7 @@
               placeholder: 'Specify the name of the trunk used for this outbound call'
             })
               .appendTo(row5)
-              .typedInput({types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env']});
+              .typedInput({types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType]});
             
             selectField.on('change', function() {
               var type = $(this).val();