@jambonz/node-red-contrib-jambonz 2.4.32 → 2.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/node-red-contrib-jambonz",
-  "version": "2.4.32",
+  "version": "2.5.1",
   "description": "Node-RED nodes for jambonz platform",
   "keywords": [
     "node-red"
@@ -41,6 +41,10 @@
       "dialogflow": "src/nodes/dialogflow.js",
       "leave": "src/nodes/leave.js",
       "rasa": "src/nodes/rasa.js",
+      "answer": "src/nodes/answer.js",
+      "dub": "src/nodes/dub.js",
+      "generic": "src/nodes/generic-verb.js",
+      "alert": "src/nodes/alert.js",
       "userauth": "src/nodes/userauth.js",
       "create call": "src/nodes/create_call.js",
       "create sms": "src/nodes/create_sms.js",
@@ -48,10 +52,7 @@
       "get_alerts": "src/nodes/get_alerts.js",
       "get_call": "src/nodes/get_call.js",
       "get_calls": "src/nodes/get_calls.js",
-      "get_recent_calls": "src/nodes/get_recent_calls.js",
-      "answer": "src/nodes/answer.js",
-      "dub": "src/nodes/dub.js",
-      "generic": "src/nodes/generic-verb.js"
+      "get_recent_calls": "src/nodes/get_recent_calls.js"
     }
   },
   "author": "Dave Horton",
@@ -64,9 +65,9 @@
     "hash-sum": "^2.0.0",
     "is-utf8": "^0.2.1",
     "media-typer": "^1.1.0",
-    "multer": "^2.0.1",
+    "multer": "^2.0.2",
     "mustache": "^4.2.0",
-    "on-headers": "^1.0.2",
+    "on-headers": "^1.1.0",
     "raw-body": "^2.5.2",
     "s3-upload-stream": "^1.0.7",
     "undici": "^5.28.5",

package/resources/editor.js

@@ -123,9 +123,14 @@
 
   function testCredentials() {
     let baseUrl
+
     const accountSid =  $("#node-config-input-accountSid").val();
     const token =  $("#node-config-input-apiToken").val();
     const status = $("#node-config-test-status");
+    if (!['str', 'https://api.jambonz.cloud'].includes($("#node-config-input-urlType").val()) || ($("#node-config-input-apiTokenType").val() != 'str') || ($("#node-config-input-accountSidType").val() != 'str')){
+      status.text('Cannot test credentials using TypedInputs');
+      return;
+    }
     status.text('');
     if ($("#node-config-input-urlType").val() == 'str'){
       baseUrl = $("#node-config-input-url").val();

package/src/nodes/alert.html

@@ -0,0 +1,75 @@
+<!-- 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("alert", {
+        category: "jambonz",
+        color: "#bbabaa",
+        defaults: {
+            name: { value: "" },
+            message: { value: "" },
+            messageType: { value: "str" },
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "font-awesome/fa-cubes",
+        label: function () {
+            return this.name || "alert";
+        },
+        oneditprepare: function () {
+            $("#node-input-message").typedInput({
+                default: $("#node-input-messageType").val(),
+                types: ["str", "msg", "flow", "global", mustacheType],
+                typeField: $("#node-input-messageType"),
+            });
+        },
+    });
+</script>
+
+<!-- HTML -->
+<script type="text/html" data-template-name="alert">
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name" />
+    </div>
+    <div class="form-row">
+        <label for="node-input-message">Message</label>
+        <input
+            type="text"
+            id="node-input-message"
+            placeholder="Alert message"
+        />
+        <input type="hidden" id="node-input-messageType" />
+    </div>
+</script>
+
+<!-- Help Text -->
+<script type="text/html" data-help-name="alert">
+    <p>Raise an alert in the jambonz platform.</p>
+    <h3>Properties</h3>
+    <p><code>Message</code> - an alert message</p>
+
+    <h3>Outputs</h3>
+    <dl class="message-properties">
+        <dt>jambonz<span class="property-type">object</span></dt>
+        <dd>
+            <code>msg.jambonz</code> will contain any previous actions provided
+            to the input with the new <code>alert</code> action appended
+        </dd>
+    </dl>
+
+    <h3>Details</h3>
+    The alert verb raises an alert in the jambonz platform
+    <h3>References</h3>
+    <ul>
+        <li>
+            <a href="https://docs.jambonz.org/verbs/verbs/alert"
+                >Jambonz alert reference</a
+            >
+        </li>
+    </ul>
+</script>

package/src/nodes/alert.js

@@ -0,0 +1,23 @@
+var { appendVerb, new_resolve } = require("./libs");
+
+module.exports = function (RED) {
+  /** alert */
+  function alert(config) {
+    RED.nodes.createNode(this, config);
+    var node = this;
+    node.on("input", async function (msg) {
+      appendVerb(msg, {
+        verb: "alert",
+        message: await new_resolve(
+          RED,
+          config.message,
+          config.messageType,
+          node,
+          msg
+        ),
+      });
+      node.send(msg);
+    });
+  }
+  RED.nodes.registerType("alert", alert);
+};

package/src/nodes/auth.html

@@ -5,7 +5,9 @@
     defaults: {
       name: {},
       urlType: {},
-      url: {type: 'text'}
+      url: {type: 'text'},
+      accountSidType: {value: 'str'},
+      apiTokenType: {value: 'str'}
     },
     credentials: {
       accountSid: {type: 'text'},
@@ -15,10 +17,17 @@
     oneditprepare: function() {
       $('#btn-test-credentials').on('click', testCredentials);
       $('#node-config-input-url').typedInput({
-          types: ['str', 
-                  {value: 'https://api.jambonz.cloud', label : 'jambonz.cloud', hasValue: false}],
+          types: ['str', 'env', 'msg', 'flow', 'global', {value: 'https://api.jambonz.cloud', label : 'jambonz.cloud', hasValue: false}],
           typeField: $('#node-config-input-urlType')
       });
+      $('#node-config-input-accountSid').typedInput({
+          types: ['str', 'env', 'msg', 'flow', 'global'],
+          typeField: $('#node-config-input-accountSidType')
+      });
+      $('#node-config-input-apiToken').typedInput({
+          types: ['str', 'env', 'msg', 'flow', 'global'],
+          typeField: $('#node-config-input-apiTokenType')
+      });
     },
     oneditsave: function() {
       const baseUrl = $('#node-config-input-url').val();
@@ -72,10 +81,13 @@
 <div class="form-row">
   <label for="node-config-input-accountSid">Account SID</label>
   <input type="text" id="node-config-input-accountSid">
+  <input type="hidden" id="node-config-input-accountSidType">
 </div>
 <div class="form-row">
   <label for="node-config-input-apiToken">API token</label>
   <input type="text" id="node-config-input-apiToken">
+  <input type="hidden" id="node-config-input-apiTokenType">
+
 </div>
 <div class="form-row">
   <button id="btn-test-credentials"><i class="fa fa-lock"></i> Test Credentials</button>

package/src/nodes/auth.js

@@ -1,15 +1,14 @@
 module.exports = function(RED) {
     function jambonz_auth(config) {
       RED.nodes.createNode(this, config);
-      this.accountSid = config.accountSid;
-      this.apiKey = config.apiKey;
+      var node = this;
       this.name = config.name;
-      this.urlType = config.urlType
-      if (this.urlType == 'str'){
-        this.url = config.url;
-      } else {
-        this.url = config.urlType;
-      }
+      this.url = config.url;
+      this.urlType = config.urlType;
+      this.accountSid = config.accountSid;
+      this.accountSidType = config.accountSidType;
+      this.apiToken = config.apiToken;
+      this.apiTokenType = config.apiTokenType;
     }
     
     RED.nodes.registerType('jambonz_auth', jambonz_auth, {
@@ -17,7 +16,9 @@ module.exports = function(RED) {
         url: {type: 'text'},
         urlType: {},
         accountSid: {type: 'text'},
-        apiToken: {type: 'text'}
+        accountSidType: {},
+        apiToken: {type: 'text'},
+        apiTokenType: {}
       }
     });
 

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

@@ -19,6 +19,12 @@
         toType: {value: ''},
         trunk: {value: ''},
         trunkType: {value: 'str'},
+        sipauth_user: {value: ''},
+        sipauth_userType: {value: 'str'},
+        sipauth_password: {value: ''},
+        sipauth_passwordType: {value: 'str'},
+        sip_proxy: {value: ''},
+        sip_proxyType: {value: 'str'},
         dest: {value: 'phone', required: true},
         timeout: {value: '' },
         timeoutType: {value: 'num'},
@@ -56,7 +62,17 @@
             return(true)
           }
         }},
-        recognizerlang: {value: 'default'}
+        recognizerlang: {value: 'default'},
+        amd_actionHook : {},
+        amd_actionHookType: {value: 'str'},
+        amd_recognizer_vendor: {value: 'default'},
+        amd_recognizer_lang: {value: 'default'},
+        amd_thresholdWordCount: {},
+        amd_timers_decisionTimeoutMs: {},
+        amd_timers_greetingCompletionTimeoutMs:{},
+        amd_timers_noSpeechTimeoutMs: {},
+        amd_timers_toneTimeoutMs: {},
+        amd_digitCount: {}
       },
       inputs:1,
       outputs:1,
@@ -70,6 +86,7 @@
         var serverElem = $('#node-input-server');
         var applicationElem = $('#node-input-application');
         var trunkDiv = $('#trunk');
+        var sipDiv = $('#sip');
         prepareTtsControls(node);
         prepareSttControls(node);
 
@@ -77,6 +94,8 @@
           var selectedDest = destElem.find(':selected').val();
           if ('phone' === selectedDest) trunkDiv.show();
           else trunkDiv.hide();
+          if ('sip' === selectedDest) sipDiv.show();
+          else sipDiv.hide();
         }
         
         destElem.change(onDestChanged);
@@ -119,19 +138,41 @@
           default: $('#node-input-timeoutType').val(),
           types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
           typeField: $('#node-input-timeoutType')
+        });
+         $('#node-input-amd_actionHook').typedInput({
+          default: $('#node-input-amd_actionHookType').val(),
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-amd_actionHookType')
+        });
+        $('#node-input-sipauth_user').typedInput({
+          default: $('#node-input-sipauth_userType').val(),
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-sipauth_userType')
+        });
+        $('#node-input-sipauth_password').typedInput({
+          default: $('#node-input-sipauth_passwordType').val(),
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-sipauth_passwordType')
+        });
+        $('#node-input-sip_proxy').typedInput({
+          default: $('#node-input-sip_proxyType').val(),
+          types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-sip_proxyType')
         });
         var populateApplications = function() {
           var serverId = $('#node-input-server option:selected').val();
             $.ajax({
               url: `_jambonz/applications/${serverId}`,
               dataType: 'json',
-              timeout: 500,
-              error: (err) => {
-                console.log(err);
+              timeout: 5000,
+                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>`;
@@ -240,9 +281,18 @@
     <input type="text" id="node-input-callername" placeholder="calling party name">
     <input type="hidden" id="node-input-callernameType">
   </div>
+  <div class="form-row">
+    <label for="node-input-dest">Dest Type</label>
+    <select id="node-input-dest">
+      <option value="phone">phone number</option>
+      <option value="user">registered sip device/user</option>
+      <option value="sip">sip endpoint</option>
+      <option value="ms-teams">Microsoft teams</option>
+    </select>
+  </div>
   <div class="form-row">
     <label for="node-input-to">To</label>
-    <input type="text" id="node-input-to" placeholder="called party info">
+    <input type="text" id="node-input-to" placeholder="destination">
     <input type="hidden" id="node-input-toType">
   </div>
   <div class="form-row" id ="trunk">
@@ -250,15 +300,24 @@
     <input type="text" id="node-input-trunk" placeholder="Specify the name of the trunk used for this outbound call">
     <input type="hidden" id="node-input-trunkType">
   </div>
+  <div id="sip">
   <div class="form-row">
-    <label for="node-input-dest">Call type</label>
-    <select id="node-input-dest">
-      <option value="phone">phone number</option>
-      <option value="user">registered sip device/user</option>
-      <option value="sip">sip endpoint</option>
-      <option value="ms-teams">Microsoft teams</option>
-    </select>
+    <label for="node-input-sipauth_user">SIP Auth Username</label>
+    <input type="text" id="node-input-sipauth_user" placeholder="Username for SIP Authentication">
+    <input type="hidden" id="node-input-sipauth_userType">
+  </div>
+  <div class="form-row">
+    <label for="node-input-sipauth_password">SIP Auth Password</label>
+    <input type="text" id="node-input-sipauth_password" placeholder="Passwrd for SIP Authentication">
+    <input type="hidden" id="node-input-sipauth_passwordType">
+  </div>
+  <div class="form-row">
+    <label for="node-input-sip_proxy">SIP Proxy</label>
+    <input type="text" id="node-input-sip_proxy" placeholder="SIP Proxy">
+    <input type="hidden" id="node-input-sip_proxyType">
   </div>
+  </div>
+  
   <div class="form-row">
     <label for="node-input-timeout">Ring timeout</label>
     <input type="text" id="node-input-timeout" placeholder="ring no answer timeout in secs (default: 60)">
@@ -292,6 +351,55 @@
         <ol id="node-input-headers-container"></ol>
     </div>
   </fieldset>
+  <fieldset>
+      <legend>Answering Machine Detection</legend>
+      <div class="form-row">
+        <label for="node-input-amd_actionHook">actionHook</label>
+        <input type="text" id="node-input-amd_actionHook">
+        <input type="hidden" id="node-input-amd_actionHookType">
+      </div>
+      <div class="form-row">
+        <label for="node-input-amd_recognizer_vendor">Vendor</label>
+        <select id="node-input-amd_recognizer_vendor">
+          <option value="default" selected>--application default--</option>
+          <option value="google">Google</option>
+          <option value="aws">AWS</option>
+          <option value="deepgram">deepgram</option>
+          <option value="microsoft">microsoft</option>
+          <option value="ibm">ibm</option>
+          <option value="nuance">nuance</option>
+        </select>
+      </div>
+      <div class="form-row">
+        <label for="node-input-amd_recognizer_lang">Language</label>
+        <select id="node-input-amd_recognizer_lang">
+        </select>
+      </div>
+      <div class="form-row">
+        <label for="node-input-amd_thresholdWordCount">Threshold Word Count</label>
+        <input type="text" id="node-input-amd_thresholdWordCount">
+      </div>
+      <div class="form-row">
+        <label for="node-input-amd_digitCount">Digit Count</label>
+        <input type="text" id="node-input-amd_digitCount">
+      </div>
+      <div class="form-row">
+        <label for="node-input-amd_timers_decisionTimeoutMs">Decision Timeout</label>
+        <input type="text" id="node-input-amd_timers_decisionTimeoutMs">
+      </div>
+      <div class="form-row">
+        <label for="node-input-amd_timers_greetingCompletionTimeoutMs">Greeting Completion Timeout</label>
+        <input type="text" id="node-input-amd_timers_greetingCompletionTimeoutMs">
+      </div>
+      <div class="form-row">
+        <label for="node-input-amd_timers_noSpeechTimeoutMs">No-Speech Timeout</label>
+        <input type="text" id="node-input-amd_timers_noSpeechTimeoutMs">
+      </div>
+      <div class="form-row">
+        <label for="node-input-amd_timers_toneTimeoutMs">Tone Timeout</label>
+        <input type="text" id="node-input-amd_timers_toneTimeoutMs">
+      </div>
+    </fieldset>
   <div id="url-options">
     <fieldset>
       <legend>Webhook options</legend>

package/src/nodes/create_call.js

@@ -10,8 +10,10 @@ module.exports = function(RED) {
     node.on('input', async (msg, send, done) => {
       send = send || function() { node.send.apply(node, arguments);};
 
-      const {accountSid, apiToken} = server.credentials;
-      const url = server.url
+      const url = await new_resolve(RED, server.url, server.urlType, node, msg);
+      const accountSid = await new_resolve(RED, server.credentials.accountSid, server.accountSidType, node, msg);
+      const apiToken = await new_resolve(RED, server.credentials.apiToken, server.apiTokenType, node, msg);
+
       if (!url || !accountSid || !apiToken) {
         node.error(`invalid / missing credentials, skipping create-call node: ${JSON.stringify(server.credentials)}`);
         send(msg);
@@ -46,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 = {
@@ -82,7 +88,12 @@ module.exports = function(RED) {
           opts.to.name = to;
           break;
         case 'sip':
+          var sipauth_user = await new_resolve(RED, config.sipauth_user, config.sipauth_userType, node, msg);
+          var sipauth_password = await new_resolve(RED, config.sipauth_password, config.sipauth_passwordType, node, msg);
+          var sip_proxy = await new_resolve(RED, config.sip_proxy, config.sip_proxyType, node, msg);
           opts.to.sipUri = to;
+          sip_proxy ? opts.to.proxy = sip_proxy : null
+          sipauth_user ? opts.to.auth = { username :sipauth_user, password: sipauth_password} : null
           break;
         case 'ms-teams':
           opts.to.user = to;
@@ -93,6 +104,33 @@ module.exports = function(RED) {
           send(msg);
           return;
       }
+
+      // AMD
+      const _amd_actionHook =  await new_resolve(RED, config.amd_actionHook, config.amd_actionHookType, node, msg)
+      if (_amd_actionHook){
+        opts.amd = {}
+        opts.amd.actionHook = _amd_actionHook;
+        config.amd_thresholdWordCount && (opts.amd.thresholdWordCount = Number(config.amd_thresholdWordCount))
+        config.amd_digitCount && (opts.amd.digitCount = Number(config.amd_digitCount))
+        opts.amd.timers = {
+          ...(config.amd_timers_decisionTimeoutMs && {decisionTimeoutMs: Number(config.amd_timers_decisionTimeoutMs)}),
+          ...(config.amd_timers_greetingCompletionTimeoutMs && {greetingCompletionTimeoutMs: Number(config.amd_timers_greetingCompletionTimeoutMs)}),
+          ...(config.amd_timers_noSpeechTimeoutMs && {noSpeechTimeoutMs: Number(config.amd_timers_noSpeechTimeoutMs)}),
+          ...(config.amd_timers_toneTimeoutMs && {toneTimeoutMs: Number(config.amd_timers_toneTimeoutMs)}),
+        }
+        //If none of the timer values are set remove the object
+        if (Object.keys(opts.amd.timers).length == 0){
+          delete(opts.amd.timers)
+        }
+        //If custom recogniser is used
+        if (config.amd_recognizer_vendor != 'default'){
+          opts.amd.recognizer = {
+            ...(config.amd_recognizer_vendor && {vendor : config.amd_recognizer_vendor}),
+            ...(config.amd_recognizer_lang && {language : config.amd_recognizer_lang})
+          }
+        }
+      }
+
       try {
         const response = await doCreateCall(node, url, accountSid, apiToken, opts);
         msg.statusCode = 201;

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/get_alerts.js

@@ -6,8 +6,19 @@ module.exports = function(RED) {
         RED.nodes.createNode(this, config);
         var node = this;
         const server = RED.nodes.getNode(config.server);
-        const {accountSid, apiToken} = server.credentials;
+        
         node.on('input', async (msg, send, done) => {
+            const url = await new_resolve(RED, server.url, server.urlType, node, msg);
+            const accountSid = await new_resolve(RED, server.credentials.accountSid, server.accountSidType, node, msg);
+            const apiToken = await new_resolve(RED, server.credentials.apiToken, server.apiTokenType, node, msg);
+
+            if (!url || !accountSid || !apiToken) {
+                node.error(`invalid / missing credentials ${JSON.stringify(server.credentials)}`);
+                send(msg);
+                if (done) done();
+                return;
+            }
+
             const data = {
                 page: await new_resolve(RED, config.page, config.pageType, node, msg),
                 count: await new_resolve(RED, config.count, config.countType, node, msg),
@@ -16,7 +27,7 @@ module.exports = function(RED) {
             Object.keys(data).forEach((k) => data[k] == null || data[k] == '' && delete data[k]);
             const params = new URLSearchParams(data).toString()           
             try {
-                const response = await fetch(`${server.url}/v1/Accounts/${accountSid}/Alerts?${params}`, {
+                const response = await fetch(`${url}/v1/Accounts/${accountSid}/Alerts?${params}`, {
                     method: 'GET',
                     headers: {
                         'Authorization': `Bearer ${apiToken}`

package/src/nodes/get_call.js

@@ -6,8 +6,19 @@ module.exports = function (RED) {
     RED.nodes.createNode(this, config);
     var node = this;
     const server = RED.nodes.getNode(config.server);
-    const { accountSid, apiToken } = server.credentials;
+
     node.on("input", async (msg, send, done) => {
+      const url = await new_resolve(RED, server.url, server.urlType, node, msg);
+      const accountSid = await new_resolve(RED, server.credentials.accountSid, server.accountSidType, node, msg);
+      const apiToken = await new_resolve(RED, server.credentials.apiToken, server.apiTokenType, node, msg);
+
+      if (!url || !accountSid || !apiToken) {
+          node.error(`invalid / missing credentials ${JSON.stringify(server.credentials)}`);
+          send(msg);
+          if (done) done();
+          return;
+      }
+      
       const callSid = await new_resolve(RED, config.callSid, config.callSidType, node, msg);
       if (!callSid) {
         if (done) done(new Error('CallSid empty'));
@@ -15,7 +26,7 @@ module.exports = function (RED) {
         return;
       }
       try {
-        const response = await fetch(`${server.url}/v1/Accounts/${accountSid}/Calls/${callSid}`, {
+        const response = await fetch(`${url}/v1/Accounts/${accountSid}/Calls/${callSid}`, {
           method: 'GET',
           headers: {
             'Authorization': `Bearer ${apiToken}`

package/src/nodes/get_calls.js

@@ -6,8 +6,18 @@ module.exports = function (RED) {
     RED.nodes.createNode(this, config);
     var node = this;
     const server = RED.nodes.getNode(config.server);
-    const { accountSid, apiToken } = server.credentials;
     node.on("input", async (msg, send, done) => {
+      const url = await new_resolve(RED, server.url, server.urlType, node, msg);
+      const accountSid = await new_resolve(RED, server.credentials.accountSid, server.accountSidType, node, msg);
+      const apiToken = await new_resolve(RED, server.credentials.apiToken, server.apiTokenType, node, msg);
+
+      if (!url || !accountSid || !apiToken) {
+          node.error(`invalid / missing credentials ${JSON.stringify(server.credentials)}`);
+          send(msg);
+          if (done) done();
+          return;
+      }
+
       const data = {
         direction: await new_resolve(RED, config.direction, config.directionType, node, msg),
         from: await new_resolve(RED, config.from, config.fromType, node, msg),
@@ -19,7 +29,7 @@ module.exports = function (RED) {
       );
       const params = new URLSearchParams(data).toString();
       try {
-        const response = await fetch(`${server.url}/v1/Accounts/${accountSid}/Calls${ params ? '?' + params : ''}`, {
+        const response = await fetch(`${url}/v1/Accounts/${accountSid}/Calls${ params ? '?' + params : ''}`, {
           method: 'GET',
           headers: {
             'Authorization': `Bearer ${apiToken}`

package/src/nodes/get_recent_calls.js

@@ -6,8 +6,18 @@ module.exports = function(RED) {
         RED.nodes.createNode(this, config);
         var node = this;
         const server = RED.nodes.getNode(config.server);
-        const {accountSid, apiToken} = server.credentials;
         node.on('input', async (msg, send, done) => {
+            const url = await new_resolve(RED, server.url, server.urlType, node, msg);
+            const accountSid = await new_resolve(RED, server.credentials.accountSid, server.accountSidType, node, msg);
+            const apiToken = await new_resolve(RED, server.credentials.apiToken, server.apiTokenType, node, msg);
+
+            if (!url || !accountSid || !apiToken) {
+                node.error(`invalid / missing credentials ${JSON.stringify(server.credentials)}`);
+                send(msg);
+                if (done) done();
+                return;
+            }
+
             const data = {
                 direction: await new_resolve(RED, config.direction, config.directionType, node, msg),
                 trunk: await new_resolve(RED, config.trunk, config.trunkType, node, msg),
@@ -18,7 +28,7 @@ module.exports = function(RED) {
             Object.keys(data).forEach((k) => data[k] == null || data[k] == '' && delete data[k]);
             const params = new URLSearchParams(data).toString();       
             try {
-                const response = await fetch(`${server.url}/v1/Accounts/${accountSid}/RecentCalls?${params}`, {
+                const response = await fetch(`${url}/v1/Accounts/${accountSid}/RecentCalls?${params}`, {
                     method: 'GET',
                     headers: {
                         'Authorization': `Bearer ${apiToken}`

package/src/nodes/lcc.js

@@ -11,9 +11,11 @@ function lcc(config) {
     node.on('input', async (msg, send, done) => {
       send = send || function() { node.send.apply(node, arguments);};
 
-      const {accountSid, apiToken} = server.credentials;
-      const url = server.url;
+      const url = await new_resolve(RED, server.url, server.urlType, node, msg);
+      const accountSid = await new_resolve(RED, server.credentials.accountSid, server.accountSidType, node, msg);
+      const apiToken = await new_resolve(RED, server.credentials.apiToken, server.apiTokenType, node, msg);
       const callSid = await new_resolve(RED, config.callSid, config.callSidType, node, msg);
+      
       if (!url || !accountSid || !apiToken || !callSid) {
         node.log(`invalid / missing credentials or callSid, skipping LCC node: ${JSON.stringify(server.credentials)}`);
         send(msg);

package/src/nodes/s3-upload.html

@@ -16,6 +16,10 @@
 </script>
 
 <script type="text/html" data-template-name="audio in">
+  <div class="form-row ui-state-error">
+    <strong>Attention:</strong> 
+      This node has been deprecated. <a href="https://github.com/jambonz/node-red-contrib-jambonz/issues/53" target="_blank">See issue #53<i class="fa fa-external-link external-link"></i></a> for more details.
+  </div>
   <div class="form-row">
     <label for="node-input-name"><i class="icon-tag"></i> Name</label>
     <input type="text" id="node-input-name" placeholder="Name">
@@ -35,6 +39,10 @@
 </script>
 
 <script type="text/html" data-help-name="audio in">
+  <div class="ui-state-error">
+    <strong>Attention:</strong> 
+      This node has been deprecated.
+  </div>
   <p>Receives audio from jambonz and uploads to S3</p>
   <h3>Outputs</h3>
           <dl class="message-properties">

package/src/nodes/s3-upload.js

@@ -24,6 +24,8 @@ module.exports = function(RED) {
     RED.nodes.createNode(this, n);
     var node = this;
 
+    node.warn("This node has been deprecated. See https://github.com/jambonz/node-red-contrib-jambonz/issues/53");
+
     // Get AWS Creds
     const awsCreds = RED.nodes.getNode(n.aws);
     if (awsCreds && awsCreds.credentials) {

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: {