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

package/src/nodes/sip-refer.js

@@ -4,7 +4,7 @@ module.exports = function(RED) {
   function sip_refer(config) {
     RED.nodes.createNode(this, config);
     var node = this;
-    node.on('input', function(msg) {
+    node.on('input', async function(msg) {
       Object.keys(config).forEach(function(key, index) {
         if (config[key] == ''){
           config[key] = false
@@ -12,15 +12,15 @@ module.exports = function(RED) {
       });
       obj = {
         verb: 'sip:refer',
-        referTo: new_resolve(RED, config.referTo, config.referToType, node, msg)
+        referTo: await new_resolve(RED, config.referTo, config.referToType, node, msg)
       }
-      config.headers ? obj.headers = new_resolve(RED, config.headers, config.headersType, node, msg) : null
+      config.headers ? obj.headers = await new_resolve(RED, config.headers, config.headersType, node, msg) : null
       if (typeof obj.headers == 'string'){
         obj.headers = JSON.parse(obj.headers)
       }
-      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
+      config.referredBy ? obj.referredBy = await new_resolve(RED, config.referredBy, config.referredByType, node, msg) : null
+      config.actionHook ? obj.actionHook = await new_resolve(RED, config.actionHook, config.actionHookType, node, msg) : null
+      config.eventHook ? obj.eventHook = await new_resolve(RED, config.eventHook, config.eventHookType, node, msg) : null
       appendVerb(msg, obj)
       node.send(msg);
     });

package/src/nodes/sip-request.js

@@ -5,7 +5,7 @@ module.exports = function(RED) {
   function sip_request(config) {
     RED.nodes.createNode(this, config);
     var node = this;
-    node.on('input', function(msg) {
+    node.on('input', async function(msg) {
       obj = {
         verb: 'sip:request',
         method: config.method
@@ -15,12 +15,12 @@ module.exports = function(RED) {
           config[key] = false
         };
       });
-      config.headers ? obj.headers = new_resolve(RED, config.headers, config.headersType, node, msg) : null
+      config.headers ? obj.headers = await new_resolve(RED, config.headers, config.headersType, node, msg) : null
       if (typeof obj.headers == 'string'){
         obj.headers = JSON.parse(obj.headers)
       }
-      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
+      config.body ? obj.body = await new_resolve(RED, config.body, config.bodyType, node, msg) : null
+      config.actionHook ? obj.actionHook = await new_resolve(RED, config.actionHook, config.actionHookType, node, msg) : null
       appendVerb(msg, obj)
       node.send(msg);
     });

package/src/nodes/tag.js

@@ -4,8 +4,8 @@ module.exports = function(RED) {
   function tag(config) {
     RED.nodes.createNode(this, config);
     var node = this;
-    node.on('input', function(msg) {
-      var data = new_resolve(RED, config.data, config.dataType, node, msg);
+    node.on('input', async function(msg) {
+      var data = await new_resolve(RED, config.data, config.dataType, node, msg);
       if (typeof(data) != 'object'){
         data = JSON.parse(data)
       }

package/src/nodes/userauth.js

@@ -6,17 +6,17 @@ module.exports = function(RED) {
     function userauth(config) {
       RED.nodes.createNode(this, config);
       var node = this;
-      node.on('input', function(msg) {
+      node.on('input', async function(msg) {
         var attemptedAuthentication = false;
         var auth = msg.authRequest;
         var authResponse = {};
         var ha1_string;
         if (config.ha1 && config.ha1.length) {
-          ha1_string = new_resolve(RED, config.ha1, config.ha1Type, node, msg),
+          ha1_string = await new_resolve(RED, config.ha1, config.ha1Type, node, msg),
           attemptedAuthentication = true;
         }
         else if (config.password && config.password.length) {
-          var password = new_resolve(RED, config.password, config.passwordType, node, msg);
+          var password = await 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,15 +51,15 @@ module.exports = function(RED) {
           if (calculated === auth.response) {
             let grantedExpires = auth.expires;
             if (config.expires && config.expires.length) {
-              const expires = new_resolve(RED, config.expires, config.expiresType, node, msg);
+              const expires = await new_resolve(RED, config.expires, config.expiresType, node, msg);
               if (auth.expires && expires != null) {
                 grantedExpires = Math.min(auth.expires, expires);
               }
             }
-            const application = new_resolve(RED, config.application, config.applicationType, node, msg);
-            const directUser = new_resolve(RED, config.directUser, config.directUserType, node, msg);
-            const directApp = new_resolve(RED, config.directApp, config.directAppType, node, msg);
-            const directQueue = new_resolve(RED, config.directQueue, config.directQueueType, node, msg);
+            const application = await new_resolve(RED, config.application, config.applicationType, node, msg);
+            const directUser = await new_resolve(RED, config.directUser, config.directUserType, node, msg);
+            const directApp = await new_resolve(RED, config.directApp, config.directAppType, node, msg);
+            const directQueue = await new_resolve(RED, config.directQueue, config.directQueueType, node, msg);
             Object.assign(authResponse, {
               status: 'ok',
               expires: grantedExpires != null ? grantedExpires : null,