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

package/package.json

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

package/src/nodes/dial.js

@@ -9,9 +9,8 @@ module.exports = function(RED) {
       node.log(`dial config: ${JSON.stringify(config)}, msg.call: ${JSON.stringify(msg.call)}`);
       var target = config.targets.map((t) => {
         const obj = Object.assign({}, t);
-        var dest = new_resolve(RED, config.dest, config.destType, node, msg)
-        var trunk = new_resolve(RED, config.trunk, config.trunkType, node, msg)
-        node.log(`dial: dest ${t.destType}:${t.dest} resolved to ${dest}`);
+        var dest = new_resolve(RED, obj.dest, obj.varType, node, msg)
+        var trunk = new_resolve(RED, obj.trunk, obj.trunkType, node, msg)
         switch (t.type) {
           case 'phone':
             obj.number = dest;

package/src/nodes/sip-refer.html

@@ -27,7 +27,6 @@
       icon: "font-awesome/fa-cubes",
       label: function() { return this.name || 'sip:refer';},
       oneditprepare: function() {
-
         $('#node-input-referTo').typedInput({
           default: $('#node-input-referToType').val(),
           types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
@@ -46,7 +45,7 @@
         $('#node-input-eventHook').typedInput({
           default: $('#node-input-eventHookType').val(),
           types: ['str','msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
-          typeField: $('#node-input-actionHookType')
+          typeField: $('#node-input-eventHookType')
         });
         $('#node-input-headers').typedInput({
           default: $('#node-input-headersType').val(),
@@ -64,12 +63,12 @@
       <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row">
-      <label for="node-input-referTo">referTo</label>
+      <label for="node-input-referTo">Refer To</label>
       <input type="text" id="node-input-referTo" placeholder="address">
-      <input type="hidden" id="node-input-referTobody">
+      <input type="hidden" id="node-input-referToType">
     </div>
     <div class="form-row">
-      <label for="node-input-referredBy">referredBy</label>
+      <label for="node-input-referredBy">Referred By</label>
       <input type="text" id="node-input-referredBy" placeholder="address">
       <input type="hidden" id="node-input-referredByType">
     </div>
@@ -94,11 +93,11 @@
 <script type="text/html" data-help-name="sip:refer">
     <p>The sip:refer action will send a sip REFER to the far end carrier or sip phone</p>
     <h3>Properties</h3>
-    <p><code>referTo</code> -  a sip uri or a phone number / user identifier	</p>
-    <p><code>referredBy</code> -  	a sip uri or a phone number / user identifier; if not provided it will default to the identity of the party being transferred</p>
-    <p><code>actionHook</code> -  a webhook to call when the transfer has completed	</p>
-    <p><code>eventHook</code> -  a webhook to call when NOTIFY messages of follow-on call status are received	</p>
-    <p><code>headers</code> -  additional SIP headers to include in the response	</p>
+    <p><code>Refer To</code> - a sip uri or a phone number / user identifier	</p>
+    <p><code>Referred By</code> - a sip uri or a phone number / user identifier; if not provided it will default to the identity of the party being transferred</p>
+    <p><code>Action Hook</code> - a webhook to call when the transfer has completed	</p>
+    <p><code>Event Hook</code> - a webhook to call when NOTIFY messages of follow-on call status are received	</p>
+    <p><code>Headers</code> - additional SIP headers to include in the response	</p>
     
   <h3>Outputs</h3>
   <dl class="message-properties">

package/src/nodes/sip-refer.js

@@ -14,10 +14,10 @@ module.exports = function(RED) {
         verb: 'sip:refer',
         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 = 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