@jambonz/node-red-contrib-jambonz 2.4.29 → 2.4.31

package/package.json

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

package/resources/editor.js

@@ -156,10 +156,10 @@
     }
   }
 
-  function prepareSttControls(node) {
-    var vendorElem = $('#node-input-transcriptionvendor');
-    var languageElem = $('#node-input-recognizerlang');
-    var mixtypeElem = $('#node-input-mixtype');
+  function prepareSttControls(node, vendor='#node-input-transcriptionvendor', lang='#node-input-recognizerlang', mixType='#node-input-mixtype') {
+    var vendorElem = $(vendor);
+    var languageElem = $(lang);
+    var mixtypeElem = $(mixType);
 
     console.log('entering prepareSttControls');
     

package/src/nodes/dial.html

@@ -65,7 +65,17 @@
         vocabularynameType: {value: 'str'},
         vocabularyfiltername: {},
         vocabularyfilternameType: {value: 'str'},
-        vocabularyfiltermethod: {}
+        vocabularyfiltermethod: {},
+        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,
@@ -147,6 +157,7 @@
         });
 
         prepareSttControls(node);
+        prepareSttControls(node, '#node-input-amd_recognizer_vendor', '#node-input-amd_recognizer_lang');
 
         $('#node-input-target-container').css('min-height','180px').css('min-width','450px').editableList({
           addItem: function(container, i, opt) {
@@ -652,6 +663,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>
 </script>
 

package/src/nodes/dial.js

@@ -49,7 +49,7 @@ module.exports = function(RED) {
         confirmHook: await new_resolve(RED, config.confirmhook, config.confirmhookType, node, msg), 
         dialMusic: await new_resolve(RED, config.dialmusic, config.dialmusicType, node, msg),
         referHook: await new_resolve(RED, config.referhook, config.referhookType, node, msg),
-        dtmfHook: await new_resolve(RED, config.dtmfhook, config.dtmfhookType, node, msg),
+        dtmfHook: await new_resolve(RED, config.dtmfhook, config.dtmfhookType, node, msg)
       };
 
       if (config.hasOwnProperty('anchormedia')) {
@@ -132,6 +132,32 @@ module.exports = function(RED) {
         delete data.dtmfHook;
       }
 
+      // AMD
+      const _amd_actionHook =  await new_resolve(RED, config.amd_actionHook, config.amd_actionHookType, node, msg)
+      if (_amd_actionHook){
+        data.amd = {}
+        data.amd.actionHook = _amd_actionHook;
+        config.amd_thresholdWordCount && (data.amd.thresholdWordCount = Number(config.amd_thresholdWordCount))
+        config.amd_digitCount && (data.amd.digitCount = Number(config.amd_digitCount))
+        data.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(data.amd.timers).length == 0){
+          delete(data.amd.timers)
+        }
+        //If custom recogniser is used
+        if (config.amd_recognizer_vendor != 'default'){
+          data.amd.recognizer = {
+            ...(config.amd_recognizer_vendor && {vendor : config.amd_recognizer_vendor}),
+            ...(config.amd_recognizer_lang && {language : config.amd_recognizer_lang})
+          }
+        }
+      }
+
       node.log(`dial verb: ${JSON.stringify(data)}`);
 
       appendVerb(msg, data);

package/src/nodes/generic-verb.html

@@ -1,6 +1,14 @@
 <!-- Javascript -->
 <script type="text/javascript">
- 
+  
+  function formatjson(e) {
+    e.preventDefault();
+    e = s.getValue() || "";
+    try {
+      e = JSON.stringify(JSON.parse(e), null, 4)
+    } catch (e) {}
+    s.getSession().setValue(e || "", -1)
+  }
 
   RED.nodes.registerType('generic',{
       category: 'jambonz',
@@ -8,20 +16,32 @@
       defaults: {
         name: {value: ''},
         verb: {required: true},
-        data: {value: '{}'},
-        dataType: {value: 'json'},
+        data: { value: '',
+                validate: function(v) {
+                  return (typeof(JSON.parse(v)) == 'object')
+                }
+        },
       },
       inputs:1,
       outputs:1,
       icon: "font-awesome/fa-cubes",
       label: function() { return this.name || 'generic';},
       oneditprepare: function() {
-        $('#node-input-data').typedInput({
-          default: $('#node-input-dataType').val(),
-          types: ['json','msg', 'flow', 'global', 'jsonata', 'env'],
-          typeField: $('#node-input-dataType')
-        });
-      }
+            this.editor = RED.editor.createEditor({
+                id: 'node-input-data-editor',
+                mode: 'ace/mode/json',
+                value: this.data
+            });
+        },
+        oneditsave: function() {
+            this.data = this.editor.getValue();
+            this.editor.destroy();
+            delete this.editor;
+        },
+        oneditcancel: function() {
+            this.editor.destroy();
+            delete this.editor;
+        }
   });
 </script>
 
@@ -35,11 +55,12 @@
       <label for="node-input-verb">Verb</label>
       <input type="text" id="node-input-verb" placeholder="verb">
     </div>
-    <div class="form-row">
-      <label for="node-input-data">Attributes</label>
-      <input type="text" id="node-input-data">
-      <input type="hidden" id="node-input-dataType">
-    </div>
+    <div class="form-row" style="position: relative; height: 250px;">
+      <label for="node-input-data"><i class="fa fa-code"></i> Attributes</label>
+      <div style="position: absolute; right: 0; bottom: 0; top: 0; left: 100px;">
+          <div id="node-input-data-editor" style="width: 100%; height: 100%;"></div>
+      </div>
+  </div>
 </script>
 
 <!-- Help Text -->

package/src/nodes/generic-verb.js

@@ -1,4 +1,5 @@
 var {appendVerb, new_resolve} = require('./libs')
+const assert = require('node:assert/strict');
 
 module.exports = function(RED) {
   function generic(config) {
@@ -6,12 +7,21 @@ module.exports = function(RED) {
     var node = this;
     node.verb = config.verb
     node.on('input', async function(msg) {
-      let data = await new_resolve(RED, config.data, config.dataType, node, msg);
-      appendVerb(msg, {
-        ...{verb: node.verb}, 
-        ...data
-      });
-      node.send(msg);
+      if (config.data.length==0) config.data='{}';
+      const _data = await new_resolve(RED, config.data, 'mustache', node, msg);
+      try {
+        const data = JSON.parse(_data)
+        assert.ok(typeof(data)=='object')
+        appendVerb(msg, {
+          ...{verb: node.verb}, 
+          ...data
+        });
+        node.send(msg);
+      } catch (error) {
+        console.error(error)
+        node.error(`Invalid Attributes object: ${_data}`)
+      }
+      
     });
   }
   RED.nodes.registerType('generic', generic);

package/src/nodes/lcc.html

@@ -508,7 +508,7 @@
     <div class="form-row">
       <label for="node-input-dubSay">Say Text</label>
       <input type="text" id="node-input-dubSay" placeholder="Text">
-      <input type="hidden" id="node-input-tagType">
+      <input type="hidden" id="node-input-dubSayType">
     </div>
     <div class="form-row">
       <label for="node-input-dubLoop">Loop</label>