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

package/src/nodes/sip-refer.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('sip:refer',{
       category: 'jambonz',
       color: '#bbabaa',
@@ -24,27 +30,27 @@
 
         $('#node-input-referTo').typedInput({
           default: $('#node-input-referToType').val(),
-          types: ['str','msg', 'flow', 'global'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-referToType')
         });
         $('#node-input-referredBy').typedInput({
           default: $('#node-input-referredByType').val(),
-          types: ['str','msg', 'flow', 'global'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-referredByType')
         });
         $('#node-input-actionHook').typedInput({
           default: $('#node-input-actionHookType').val(),
-          types: ['str','msg', 'flow', 'global'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-actionHookType')
         });
         $('#node-input-eventHook').typedInput({
           default: $('#node-input-eventHookType').val(),
-          types: ['str','msg', 'flow', 'global'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-actionHookType')
         });
         $('#node-input-headers').typedInput({
           default: $('#node-input-headersType').val(),
-          types: ['json','msg', 'flow', 'global'],
+          types: ['json','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-headersType')
         });
       }

package/src/nodes/sip-refer.js

@@ -1,4 +1,4 @@
-var {appendVerb} = require('./libs');
+var {appendVerb, new_resolve} = require('./libs');
 
 module.exports = function(RED) {
   function sip_refer(config) {
@@ -12,15 +12,15 @@ module.exports = function(RED) {
       });
       obj = {
         verb: 'sip:refer',
-        referTo: config.referTo
+        referTo: new_resolve(RED, config.referTo, config.referToType, node, msg)
       }
       if (typeof(config.headers == 'string')){
         config.headers=JSON.parse(config.headers)
       }
-      config.headers ? obj.headers = config.headers : null
-      config.referredBy ? obj.referredBy = config.referredBy : null
-      config.actionHook ? obj.actionHook = config.actionHook : null
-      config.eventHook ? obj.eventHook = config.eventHook : null
+      config.headers ? obj.headers = new_resolve(RED, config.headers, config.headersType, node, msg) : null
+      config.referredBy ? obj.referredBy = new_resolve(RED, config.referredBy, config.referredByType, node, msg) : null
+      config.actionHook ? obj.actionHook = new_resolve(RED, config.actionHook, config.actionHookType, node, msg) : null
+      config.eventHook ? obj.eventHook = new_resolve(RED, config.eventHook, config.eventHookType, node, msg) : null
       appendVerb(msg, obj)
       node.send(msg);
     });

package/src/nodes/sip-request.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('sip:request',{
       category: 'jambonz',
       color: '#bbabaa',
@@ -19,17 +25,17 @@
       oneditprepare: function() {
         $('#node-input-headers').typedInput({
           default: $('#node-input-headersType').val(),
-          types: ['json','msg', 'flow', 'global'],
+          types: ['json','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-headersType')
         });
         $('#node-input-body').typedInput({
           default: $('#node-input-bodyType').val(),
-          types: ['str','msg', 'flow', 'global'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-bodyType')
         });
         $('#node-input-actionHook').typedInput({
           default: $('#node-input-actionHookType').val(),
-          types: ['str','msg', 'flow', 'global'],
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-actionHookType')
         });
       }

package/src/nodes/sip-request.js

@@ -1,4 +1,4 @@
-var {appendVerb} = require('./libs');
+var {appendVerb, new_resolve} = require('./libs');
 
 module.exports = function(RED) {
   /** sip:decline */
@@ -18,9 +18,9 @@ module.exports = function(RED) {
       if (typeof(config.headers == 'string')){
         config.headers=JSON.parse(config.headers)
       }
-      config.headers ? obj.headers = config.headers : null
-      config.body ? obj.body = config.body : null
-      config.actionHook ? obj.actionHook = config.actionHook : null
+      config.headers ? obj.headers = new_resolve(RED, config.headers, config.headersType, node, msg) : null
+      config.body ? obj.body = new_resolve(RED, config.body, config.bodyType, node, msg) : null
+      config.actionHook ? obj.actionHook = new_resolve(RED, config.actionHook, config.actionHookType, node, msg) : null
       appendVerb(msg, obj)
       node.send(msg);
     });

package/src/nodes/tag.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('tag',{
     category: 'jambonz',
     color: '#bbabaa',
@@ -15,7 +21,7 @@
     oneditprepare: function() {
       $('#node-input-data').typedInput({
         default: $('#node-input-dataType').val(),
-        types: ['json', 'msg', 'flow', 'global'],
+        types: ['json', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
         typeField: $('#node-input-dataType')
       });
     }

package/src/nodes/tag.js

@@ -1,11 +1,11 @@
-var {appendVerb, v_resolve} = require('./libs')
+var {appendVerb, new_resolve} = require('./libs')
 
 module.exports = function(RED) {
   function tag(config) {
     RED.nodes.createNode(this, config);
     var node = this;
     node.on('input', function(msg) {
-      var data = v_resolve(config.data, config.dataType, this.context(), msg, true);
+      var data = new_resolve(RED, config.data, config.dataType, node, msg);
       appendVerb(msg, {
         verb: 'tag',
         data

package/src/nodes/userauth.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('user auth',{
       category: 'jambonz',
       color:"#c1f986",
@@ -22,23 +28,23 @@ RED.nodes.registerType('user auth',{
       label: function() { return this.name || 'user auth';},
       oneditprepare: function() {
         $('#node-input-password').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-passwordType')
         });
         $('#node-input-ha1').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-ha1Type')
         });
         $('#node-input-expires').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-expiresType')
         });
         $('#node-input-callHook').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-callHookType')
         });
         $('#node-input-callStatusHook').typedInput({
-          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-callStatusHookType')
         });
       }

package/src/nodes/userauth.js

@@ -1,5 +1,5 @@
 var {createHash} = require('crypto');
-var {v_resolve} = require('./libs');
+var {new_resolve} = require('./libs');
 
 /** user auth */
 module.exports = function(RED) {
@@ -12,11 +12,11 @@ module.exports = function(RED) {
         var authResponse = {};
         var ha1_string;
         if (config.ha1 && config.ha1.length) {
-          ha1_string = v_resolve(config.ha1, config.ha1Type, this.context(), msg);
+          ha1_string = new_resolve(RED, config.ha1, config.ha1Type, node, msg),
           attemptedAuthentication = true;
         }
         else if (config.password && config.password.length) {
-          var password = v_resolve(config.password, config.passwordType, this.context(), msg);
+          var password = new_resolve(RED, config.password, config.passwordType, node, msg);
           var ha1 = createHash('md5');
           ha1.update([auth.username, auth.realm, password].join(':'));
           ha1_string = ha1.digest('hex');
@@ -51,13 +51,13 @@ module.exports = function(RED) {
           if (calculated === auth.response) {
             let grantedExpires = auth.expires;
             if (config.expires && config.expires.length) {
-              const expires = v_resolve(config.expires, config.expiresType, this.context(), msg);
+              const expires = new_resolve(RED, config.expires, config.expiresType, node, msg);
               if (auth.expires && expires != null) {
                 grantedExpires = Math.min(auth.expires, expires);
               }
             }
-            const callHook = v_resolve(config.callHook, config.callHookType, this.context(), msg);
-            const callStatusHook = v_resolve(config.callStatusHook, config.callStatusHookType, this.context(), msg);
+            const callHook = new_resolve(RED, config.callHook, config.callHookType, node, msg);
+            const callStatusHook = new_resolve(RED, config.callStatusHook, config.callStatusHookType, node, msg);
             Object.assign(authResponse, {
               status: 'ok',
               expires: grantedExpires != null ? grantedExpires : null,