@jambonz/node-red-contrib-jambonz 2.5.0 → 2.5.2

package/package.json

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

package/src/nodes/conference.html

@@ -27,7 +27,8 @@
       actionHookType: {value: 'str'},
       statusHook: {},
       statusHookType: {value: 'str'},
-      joinMuted : {value: false}
+      joinMuted : {value: false},
+      distributeDtmf: {value: false}
     },
     inputs:1,
     outputs:1,
@@ -110,6 +111,10 @@
     <div class="form-row">
       <label for="node-input-joinMuted">Join muted</label>
       <input type="checkbox" id="node-input-joinMuted">
+    </div>
+      <div class="form-row">
+      <label for="node-input-distributeDtmf">Distribute DTMF</label>
+      <input type="checkbox" id="node-input-distributeDtmf">
     </div>
     <div class="form-row">
       <label for="node-input-maxParticipants">Max participants</label>

package/src/nodes/conference.js

@@ -19,7 +19,8 @@ module.exports = function(RED) {
         beep: config.beep,
         startConferenceOnEnter: config.startConferenceOnEnter,
         endConferenceOnExit: config.endConferenceOnExit,
-        joinMuted: config.joinMuted
+        joinMuted: config.joinMuted,
+        ...(config.distributeDtmf && {'distributeDtmf': true})
       });
       node.send(msg);
     });

package/src/nodes/create_call.html

@@ -165,12 +165,14 @@
               url: `_jambonz/applications/${serverId}`,
               dataType: 'json',
               timeout: 5000,
-              error: (err) => {
-                console.error(`Unable to get application list ${err.statusText}`);
+                error: (err) => {
+                applicationElem.find('option').remove();
+                applicationElem.append('<option value="msg.application_sid">--msg.application_sid--</option>');
+                console.log(`Unable to get application list ${err.statusText} ${err}`);
               },
               success: (res) => {
                 applicationElem.find('option').remove();
-                var options = '';
+                var options = '<option value="msg.application_sid">--msg.application_sid--</option>';
                 res.forEach((app) => {
                   if (node.application === app.application_sid) {
                     options += `<option value="${app.application_sid}" selected>${app.name}</option>`;

package/src/nodes/create_call.js

@@ -48,7 +48,11 @@ module.exports = function(RED) {
 
       switch (config.mode) {
         case 'app':
-          opts.application_sid = config.application;
+          if (config.application == 'msg.application_sid'){
+            opts.application_sid = msg.application_sid
+          } else{
+            opts.application_sid = config.application;
+          }
           break
         case 'url':
           opts.call_hook = {

package/src/nodes/dial.html

@@ -373,7 +373,7 @@
           addItem: function(container, i, opt) {
             var header = opt;
             if (!header.hasOwnProperty('h')) {
-                header = {h: '', v: ''};
+                header = {h: '', v: '', vType: 'str'};
             }
             container.css({
               overflow: 'hidden',
@@ -382,20 +382,23 @@
             let fragment = document.createDocumentFragment();
             var row1 = $('<div/>',{style:"display:flex;"}).appendTo(fragment);
             $('<input/>', {
-              class:"node-input-header-property-name", 
-              type:"text", 
+              class:"node-input-header-property-name",
+              type:"text",
               placeholder: 'SIP Header'
             })
               .appendTo(row1);
             $('<input/>', {
-              class:"node-input-value-property-name", 
-              type:"text", 
+              class:"node-input-value-property-name",
+              type:"text",
               placeholder: 'value'
             })
-              .appendTo(row1);
+              .appendTo(row1)
+              .typedInput({types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType]});
 
             row1.find('.node-input-header-property-name').val(header.h);
-            row1.find('.node-input-value-property-name').val(header.v);
+            var valueField = row1.find('.node-input-value-property-name');
+            valueField.typedInput('type', header.vType || 'str');
+            valueField.typedInput('value', header.v);
 
             container[0].appendChild(fragment);
           },
@@ -406,6 +409,7 @@
           var header = {
             h: '',
             v: '',
+            vType: 'str'
           };
           this.headers = [header];
         }
@@ -457,11 +461,13 @@
           var header = $(this);
           console.log(`header: ${JSON.stringify(header)}`);
           var h = header.find(".node-input-header-property-name").val();
-          var v = header.find(".node-input-value-property-name").val();
-          console.log(`added ${h}: ${v}`);
+          var vField = header.find(".node-input-value-property-name");
+          var v = vField.typedInput('value');
+          var vType = vField.typedInput('type');
+          console.log(`added ${h}: ${v} (type: ${vType})`);
           var obj = {};
           obj[h] = v;
-          headers.push({h, v});
+          headers.push({h, v, vType});
         });
         node.headers = headers;
         console.log(`saved headers ${JSON.stringify(node.headers)}`);

package/src/nodes/dial.js

@@ -74,9 +74,12 @@ module.exports = function(RED) {
 
       // headers
       const headers = {};
-      config.headers.forEach(function(h) {
-        if (h.h.length && h.v.length) headers[h.h] = h.v;
-      });
+      for (const h of config.headers) {
+        if (h.h.length && h.v.length) {
+          const resolvedValue = await new_resolve(RED, h.v, h.vType || 'str', node, msg);
+          if (resolvedValue) headers[h.h] = resolvedValue;
+        }
+      }
       Object.assign(data, {headers});
 
       // nested listen

package/src/nodes/gather.js

@@ -57,8 +57,7 @@ module.exports = function(RED) {
         if (/^\d+$/.test(config.mindigits)) obj.minDigits = parseInt(config.mindigits);
         if (/^\d+$/.test(config.maxdigits)) obj.maxDigits = parseInt(config.maxdigits);
         if (/^\d+$/.test(config.interdigittimeout)) obj.interDigitTimeout = parseInt(config.interdigittimeout);
-
-        if (config.dtmfbargein) obj.dtmfBargein = config.dtmfbargein;
+        if (config.dtmfbargein !== undefined) obj.dtmfBargein = config.dtmfbargein;
       }
 
       // prompt

package/src/utils/http-helpers.js

@@ -55,8 +55,9 @@ module.exports = function(RED) {
   RED.httpAdmin.get('/_jambonz/applications/:serverId', (req, res) => {
     const conn = RED.nodes.getNode(req.params.serverId);
     if (conn && conn.credentials && conn.credentials.apiToken) {
-      const { apiToken } = conn.credentials;
-      const { url } = conn;
+      const url =  RED.util.evaluateNodeProperty( conn.url, conn.urlType, conn, {});
+      const apiToken =  RED.util.evaluateNodeProperty(conn.credentials.apiToken, conn.apiTokenType, conn, {});
+
       fetch(`${url}/v1/Applications`, {
         method: 'GET',
         headers: {