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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/node-red-contrib-jambonz",
-  "version": "2.4.30",
+  "version": "2.4.32",
   "description": "Node-RED nodes for jambonz platform",
   "keywords": [
     "node-red"
@@ -64,7 +64,7 @@
     "hash-sum": "^2.0.0",
     "is-utf8": "^0.2.1",
     "media-typer": "^1.1.0",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^2.0.1",
     "mustache": "^4.2.0",
     "on-headers": "^1.0.2",
     "raw-body": "^2.5.2",

package/src/nodes/create_call.html

@@ -20,8 +20,9 @@
         trunk: {value: ''},
         trunkType: {value: 'str'},
         dest: {value: 'phone', required: true},
-        timeout: {validate: RED.validators.regex(/^\d*$/) },
-        tag: {required: true},
+        timeout: {value: '' },
+        timeoutType: {value: 'num'},
+        tag: {value: '{}'},
         tagType: {value: 'json'},
         application: {value: ''},
         appName: {},
@@ -113,6 +114,11 @@
           default: $('#node-input-trunkType').val(),
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-trunkType')
+        });
+         $('#node-input-timeout').typedInput({
+          default: $('#node-input-timeoutType').val(),
+          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          typeField: $('#node-input-timeoutType')
         });
         var populateApplications = function() {
           var serverId = $('#node-input-server option:selected').val();
@@ -256,6 +262,7 @@
   <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)">
+    <input type="hidden" id="node-input-timeoutType">
   </div>
   <div class="form-row">
     <label for="node-input-tag">Tag data</label>

package/src/nodes/create_call.js

@@ -22,6 +22,7 @@ module.exports = function(RED) {
       var from = await new_resolve(RED, config.from, config.fromType, node, msg);
       var to = await new_resolve(RED, config.to, config.toType, node, msg);
       var tag = await new_resolve(RED, config.tag, config.tagType, node, msg);
+      var timeout = await new_resolve(RED, config.timeout, config.timeoutType, node, msg);
 
       const opts = {
         from,
@@ -64,8 +65,8 @@ module.exports = function(RED) {
           break;
       }
 
-      if (config.timeout) {
-        const timeout = parseInt(config.timeout);
+      if (timeout) {
+        timeout = parseInt(timeout);
         if (timeout > 0) opts.timeout = timeout;
       }
 

package/src/nodes/dial.html

@@ -17,6 +17,7 @@
         actionhookType: {value: 'str'},
         answeronbridge: {value: false},
         anchormedia: {value: false},
+        exitmediapath: {value: false},
         callerid: {value: ''},
         calleridType: {value: ''},
         callername: {value: ''},
@@ -33,8 +34,14 @@
         dtmfhookType: {value: 'str'},
         onholdhook: {value: ''},
         onholdhookType: {value: 'str'},
-        timelimit: {validate:RED.validators.regex(/^\d*$/) },
-        timeout: {validate:RED.validators.regex(/^\d*$/) },
+        timelimit: {},
+        timelimitType: {value: 'num'},
+        timeout: {},
+        timeoutType: {value: 'num'},
+        boostaudiosignal: { value: "" },
+        boostaudiosignalType: { value: "str" },
+        tag: {value: '{}'},
+        tagType: {value: 'json'},
         listenurl: {value: ''},
         listenurlType: {value: 'str'},
         transcriptionhook: {},
@@ -74,7 +81,8 @@
         amd_timers_decisionTimeoutMs: {},
         amd_timers_greetingCompletionTimeoutMs:{},
         amd_timers_noSpeechTimeoutMs: {},
-        amd_timers_toneTimeoutMs: {}
+        amd_timers_toneTimeoutMs: {},
+        amd_digitCount: {},
       },
       inputs:1,
       outputs:1,
@@ -122,6 +130,15 @@
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-onholdhookType')
         });
+        $('#node-input-boostaudiosignal').typedInput({
+          types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-boostaudiosignalType')
+        });
+        $('#node-input-tag').typedInput({
+          default: $('#node-input-tagType').val(),
+          types: ['json', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
+          typeField: $('#node-input-tagType')
+        });
         $('#node-input-transcribeurl').typedInput({
           types: ['str', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-transcribeurlType')
@@ -154,6 +171,14 @@
           types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env', mustacheType],
           typeField: $('#node-input-naicsType')
         });
+        $('#node-input-timeout').typedInput({
+          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          typeField: $('#node-input-timeoutType')
+        });
+        $('#node-input-timelimit').typedInput({
+          types: ['num', 'msg', 'flow', 'global', 'jsonata', 'env'],
+          typeField: $('#node-input-timelimitType')
+        });
 
         prepareSttControls(node);
         prepareSttControls(node, '#node-input-amd_recognizer_vendor', '#node-input-amd_recognizer_lang');
@@ -474,6 +499,10 @@
       <label for="node-input-anchormedia">Anchor media</label>
       <input type="checkbox" id="node-input-anchormedia">
     </div>
+    <div class="form-row">
+      <label for="node-input-exitmediapath">Exit media path</label>
+      <input type="checkbox" id="node-input-exitmediapath">
+    </div>
     <div class="form-row">
       <label for="node-input-callerid">Caller ID</label>
       <input type="text" id="node-input-callerid" placeholder="caller id to place on outbound call">
@@ -517,10 +546,22 @@
     <div class="form-row">
       <label for="node-input-timelimit">Time limit</label>
       <input type="text" id="node-input-timelimit" placeholder="max duration of call in secs">
+      <input type="hidden" id="node-input-timelimitType">
     </div>
     <div class="form-row">
       <label for="node-input-timeout"><i class="icon-tag"></i> Timeout</label>
       <input type="text" id="node-input-timeout" placeholder="ring no answer timeout in secs (default: 60)">
+      <input type="hidden" id="node-input-timeoutType">
+    </div>
+    <div class="form-row">
+      <label for="node-input-boostaudiosignal">Boost audio signal</label>
+        <input type="text" id="node-input-boostaudiosignal" placeholder="boost audio volume in decibels">
+        <input type="hidden" id="node-input-boostaudiosignalType">
+    </div>
+    <div class="form-row">
+      <label for="node-input-tag">Tag data</label>
+      <input type="text" id="node-input-tag" placeholder="tag object">
+      <input type="hidden" id="node-input-tagType">
     </div>
     <fieldset>
       <legend>Live audio</legend>
@@ -690,6 +731,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

@@ -41,8 +41,8 @@ module.exports = function(RED) {
         verb: 'dial',
         target,
         answerOnBridge: config.answeronbridge,
-        timeLimit: config.timelimit ? parseInt(config.timelimit) : null,
-        timeout: config.timeout ? parseInt(config.timeout) : null,
+        timeLimit: await new_resolve(RED, config.timelimit, config.timelimitType, node, msg),
+        timeout: await new_resolve(RED, config.timeout, config.timeoutType, node, msg),
         callerId: await new_resolve(RED, config.callerid, config.calleridType, node, msg),
         callerName: await new_resolve(RED, config.callername, config.callernameType, node, msg),
         actionHook: await new_resolve(RED, config.actionhook, config.actionhookType, node, msg),
@@ -56,10 +56,22 @@ module.exports = function(RED) {
         data.anchorMedia = config.anchormedia;
       }
 
+      if (config.hasOwnProperty('exitmediapath')) {
+        data.exitMediaPath = config.exitmediapath;
+      }
+
       if (config.onholdhook) {
         data.onHoldHook = await new_resolve(RED, config.onholdhook, config.onholdhookType, node, msg);
       }
 
+      if (config.tag) {
+        data.tag = await new_resolve(RED, config.tag, config.tagType, node, msg);
+      }
+
+      if (config.boostaudiosignal) {
+        data.boostAudioSignal = await new_resolve(RED, config.boostaudiosignal, config.boostaudiosignalType, node, msg)
+      }
+
       // headers
       const headers = {};
       config.headers.forEach(function(h) {
@@ -138,6 +150,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

@@ -355,7 +355,8 @@
   <div class="form-row">
     <label for="node-input-action">Action</label>
     <select id="node-input-action">
-      <option value="hangup">hangup call</option>
+      <option value="hangup">hangup answered call</option>
+      <option value="cancel">cancel call</option>
       <option value="mute">mute caller</option>
       <option value="unmute">unmute caller</option>
       <option value="mute_conf">mute conference participants</option>
@@ -508,7 +509,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>

package/src/nodes/lcc.js

@@ -26,6 +26,9 @@ function lcc(config) {
         case 'hangup':
           opts.call_status = 'completed';
           break;
+        case 'cancel':
+          opts.call_status = 'no-answer';
+          break;
         case 'mute':
           opts.mute_status = 'mute';
           break;