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

package/package.json

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

package/src/nodes/dial.html

@@ -74,7 +74,8 @@
         amd_timers_decisionTimeoutMs: {},
         amd_timers_greetingCompletionTimeoutMs:{},
         amd_timers_noSpeechTimeoutMs: {},
-        amd_timers_toneTimeoutMs: {}
+        amd_timers_toneTimeoutMs: {},
+        amd_digitCount: {},
       },
       inputs:1,
       outputs:1,
@@ -690,6 +691,10 @@
         <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">

package/src/nodes/dial.js

@@ -138,6 +138,7 @@ module.exports = function(RED) {
         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)}),

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>