@jambonz/node-red-contrib-jambonz 2.4.8 → 2.4.10

package/package.json

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

package/src/nodes/gather.html

@@ -12,12 +12,15 @@
       defaults: {
         name: {value: ''},
         actionhook: {value: ''},
-        actionhooktype: {val: 'str'},
+        actionhookType: {val: 'str'},
         finishonkey: {value: ''},
         dtmfinput: {value: 0},
         speechinput: {value: 1},
         numdigits: {value: ''},
         timeout: {value: ''},
+        bargein: {value: true},
+        dtmfbargein: {value: true},
+        listenduringprompt: {value: true},
         prompttype: {value: 'say'},
         playurl: {value: ''},
         playurlType: {value: 'str'},
@@ -203,6 +206,10 @@
       <input type="checkbox" id="node-input-dtmfinput">
     </div>
     <div id="dtmf-input-container">
+      <div class="form-row">
+        <label for="node-input-dtmfbargein">Allow DTMF bargein</label>
+        <input type="checkbox" id="node-input-dtmfbargein">
+      </div>
       <div class="form-row">
         <label for="node-input-finishonkey"><i class="icon-tag"></i> Finish key</label>
         <input type="text" id="node-input-finishonkey" placeholder="dtmf key to signal end of input">
@@ -224,6 +231,14 @@
       <input type="checkbox" id="node-input-speechinput">
     </div>
     <div id="speech-input-container">
+      <div class="form-row">
+        <label for="node-input-bargein">Allow Speech bargein</label>
+        <input type="checkbox" id="node-input-bargein">
+      </div>
+      <div class="form-row">
+        <label for="node-input-listenduringprompt">Listen during prompt</label>
+        <input type="checkbox" id="node-input-listenduringprompt">
+      </div>
       <div class="form-row">
         <label for="node-input-transcriptionvendor">Vendor</label>
         <select id="node-input-transcriptionvendor">
@@ -234,7 +249,6 @@
           <option value="microsoft">microsoft</option>
           <option value="ibm">ibm</option>
           <option value="nuance">nuance</option>
-
         </select>
       </div>
       <div class="form-row">

package/src/nodes/gather.js

@@ -11,7 +11,7 @@ module.exports = function(RED) {
       node.log(`config: ${JSON.stringify(config)}`);
 
       var obj = {verb: 'gather', input: []};
-      if (config.actionhook) obj.actionHook = new_resolve(RED, config.actionHook, config.actionHookType, node, msg)
+      if (config.actionhook) obj.actionHook = new_resolve(RED, config.actionhook, config.actionhookType, node, msg)
 
       // input
       if (config.speechinput) {
@@ -45,12 +45,15 @@ module.exports = function(RED) {
           });
         }
         obj.recognizer = recognizer;
+        if (config.bargein) obj.bargein = config.bargein;
+        if (config.listenduringprompt) obj.listenDuringPrompt = config.listenduringprompt;
       }
       if (config.dtmfinput) {
         obj.input.push('digits');
         if (config.finishonkey && config.finishonkey.length) obj.finishOnKey = config.finishonkey;
         if (/^\d+$/.test(config.numdigits)) obj.numDigits = parseInt(config.numdigits);
         if (/^\d+$/.test(config.timeout)) obj.timeout = parseInt(config.timeout);
+        if (config.dtmfbargein) obj.dtmfBargein = config.dtmfbargein;
       }
 
       // prompt

package/src/nodes/sip-request.html

@@ -1,11 +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'
-}
+    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',
@@ -18,8 +18,8 @@
         bodyType: {value: 'str'},
         actionHook: {value: ''},
         actionHookType: {value: 'str'}      },
-      inputs:1,
-      outputs:1,
+      inputs: 1,
+      outputs: 1,
       icon: "font-awesome/fa-cubes",
       label: function() { return this.name || 'sip:request';},
       oneditprepare: function() {
@@ -64,7 +64,7 @@
     <div class="form-row">
       <label for="node-input-body">SIP Body</label>
       <input type="text" id="node-input-body" placeholder="SIP body">
-      <input type="hidden" id="node-input-reasonbody">
+      <input type="hidden" id="node-input-bodyType">
     </div>
     <div class="form-row">
       <label for="node-input-actionHook">Action Hook</label>
@@ -75,12 +75,12 @@
 
 <!-- Help Text -->
 <script type="text/html" data-help-name="sip:request">
-    <p>send a SIP INFO, NOTIFY, or MESSAGE request on an established call leg</p>
+    <p>Send a SIP INFO, NOTIFY, or MESSAGE request on an established call leg.</p>
     <h3>Properties</h3>
-    <p><code>method</code> -  SIP method, should be one of INFO, MESSAGE, or NOTIFY		</p>
-    <p><code>headers</code> -  additional SIP headers to include in the response	</p>
-    <p><code>body</code> - the body of the SIP request, if any		</p>
-    <p><code>actionHook</code> -  a webhook to call when the sip request has completed		</p>
+    <p><code>Method</code> - SIP method, should be one of INFO, MESSAGE or NOTIFY		</p>
+    <p><code>Headers</code> - additional SIP headers to include in the response	</p>
+    <p><code>SIP Body</code> - the body of the SIP request, if any		</p>
+    <p><code>Action Hook</code> - a webhook to call when the sip request has completed		</p>
   
   <h3>Outputs</h3>
   <dl class="message-properties">

package/src/nodes/sip-request.js

@@ -15,10 +15,10 @@ module.exports = function(RED) {
           config[key] = false
         };
       });
-      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.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)