@jambonz/node-red-contrib-jambonz 2.3.1 → 2.3.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jambonz/node-red-contrib-jambonz",
-  "version": "2.3.1",
-  "description": "Node-RED nodes for jambonz",
+  "version": "2.3.4",
+  "description": "Node-RED nodes for jambonz platform",
   "keywords": [
     "node-red"
   ],
@@ -53,7 +53,7 @@
   "author": "Dave Horton",
   "license": "MIT",
   "dependencies": {
-    "aws-sdk": "^2.833.0",
+    "aws-sdk": "^2.1302.0",
     "bent": "^7.3.12",
     "body-parser": "^1.20.1",
     "cookie-parser": "^1.4.6",
@@ -66,6 +66,6 @@
     "on-headers": "^1.0.2",
     "raw-body": "^2.5.1",
     "s3-upload-stream": "^1.0.7",
-    "ws": "^8.11.0"
+    "ws": "^8.12.1"
   }
 }

package/src/nodes/auth.html

@@ -1,6 +1,5 @@
 <!-- Javascript -->
 <script type="text/javascript">
-
   RED.nodes.registerType('jambonz_auth',{
     category: 'config',
     defaults: {
@@ -20,13 +19,16 @@
                   {value: 'https://api.jambonz.us', label : 'jambonz.us', hasValue: false},
                   {value: 'https://api.jambonz.xyz', label : 'jambonz.xyz', hasValue: false}],
           typeField: $('#node-config-input-urlType')
-        });
+      });
+    },
+    oneditsave: function() {
+      const baseUrl = $('#node-config-input-url').val();
+      if (baseUrl.endsWith('/')) {
+        $('#node-config-input-url').val(baseUrl.slice(0, -1));
+      }
     }
   });
 
-
-
-
   RED.nodes.registerType('aws_auth',{
     category: 'config',
     credentials: {
@@ -43,12 +45,9 @@
   });
 </script>
 
-
 <!-- HTML -->
 
-
-
-  <!-- aws auth  -->
+<!-- aws auth  -->
 <script type="text/html" data-template-name="aws_auth">
   <div class="form-row">
     <label for="node-config-input-accessKey">AWS Access Key ID</label>
@@ -60,8 +59,6 @@
   </div>
 </script>
 
-
-
 <!-- jambonz auth -->
 <script type="text/html" data-template-name="jambonz_auth">
   <div class="form-row">
@@ -72,10 +69,9 @@
     <label for="node-config-input-url">Base URL</label>
     <input type="text" id="node-config-input-url" placeholder="http://localhost:3000">
     <input type="hidden" id="node-config-input-urlType">
-
 </div>
 <div class="form-row">
-  <label for="node-config-input-accountSid">AccountSid</label>
+  <label for="node-config-input-accountSid">Account SID</label>
   <input type="text" id="node-config-input-accountSid">
 </div>
 <div class="form-row">
@@ -88,8 +84,6 @@
 </div>
 </script>
 
-
-
 <!-- Help Text -->
 
 <!-- AWS auth-->
@@ -100,7 +94,6 @@
   </script>
 
 <!-- jambonz auth -->
-
 <script type="text/x-red" data-help-name="jambonz_auth">
   <p>Creates a new jambonz server credential </p>
   <h3>Properties</h3>

package/src/nodes/auth.js

@@ -1,11 +1,4 @@
-var {createHash} = require('crypto');
-const bent = require('bent');
-var mustache = require('mustache');
-mustache.escape = function(text) {return text;};
-var {v_resolve} = require('./libs')
-
 module.exports = function(RED) {
-
     function jambonz_auth(config) {
       RED.nodes.createNode(this, config);
       this.accountSid = config.accountSid;
@@ -18,6 +11,7 @@ module.exports = function(RED) {
         this.url = config.urlType;
       }
     }
+    
     RED.nodes.registerType('jambonz_auth', jambonz_auth, {
       credentials: {
         url: {type: 'text'},
@@ -39,5 +33,4 @@ module.exports = function(RED) {
         secretAccessKey: {type: 'text'}
       }
     });
-  
-  }
+}

package/src/nodes/conference.html

@@ -1,6 +1,6 @@
 <!-- Javascript -->
 <script type="text/javascript">
-RED.nodes.registerType('conference',{
+  RED.nodes.registerType('conference',{
     category: 'jambonz',
     color: '#bbabaa',
     defaults: {
@@ -43,10 +43,8 @@ RED.nodes.registerType('conference',{
       });
     }
   });
-
 </script>
 
-
 <!-- HTML -->
 <script type="text/html" data-template-name="conference">
     <div class="form-row">
@@ -95,25 +93,24 @@ RED.nodes.registerType('conference',{
 <script type="text/html" data-help-name="conference">
     <p>places a caller in a conference.</p>
     <h3>Properties</h3>
-       <p><code>Conference Name </code> - The name of the conference to join the caller to.</p>
-       <p><code>Enter hook </code> - A webhook to retrieve something to play or say to the caller just before they are put into a conference after waiting for it to start</p>
-       <p><code>Wait hook </code> - A webhook to retrieve commands to play or say while the caller is waiting for the conference to start</p>
-       <p><code>Beep on entry</code> - if checked, play a beep tone to the conference when caller enters </p>
-       <p><code>Start on entry</code> - if checked, start the conference only when this caller enters</p>
-       <p><code>End on exit</code> - if checked, end the conference when this caller hangs up</p>
-       <p><code>Max participants</code> - maximum number of participants that will be allowed in the conference</p>
- 
-      <h3>Outputs</h3>
+      <p><code>Conference Name </code> - The name of the conference to join the caller to.</p>
+      <p><code>Enter hook </code> - A webhook to retrieve something to play or say to the caller just before they are put into a conference after waiting for it to start</p>
+      <p><code>Wait hook </code> - A webhook to retrieve commands to play or say while the caller is waiting for the conference to start</p>
+      <p><code>Beep on entry</code> - if checked, play a beep tone to the conference when caller enters </p>
+      <p><code>Start on entry</code> - if checked, start the conference only when this caller enters</p>
+      <p><code>End on exit</code> - if checked, end the conference when this caller hangs up</p>
+      <p><code>Max participants</code> - maximum number of participants that will be allowed in the conference</p>
+    <h3>Outputs</h3>
 <dl class="message-properties">
-   <dt>jambonz<span class="property-type">object</span></dt>
-   <dd> <code>msg.jambonz</code> will contain any previous actions provided to the input with the new <code>conference</code> action appended  </dd>
+  <dt>jambonz<span class="property-type">object</span></dt>
+  <dd> <code>msg.jambonz</code> will contain any previous actions provided to the input with the new <code>conference</code> action appended  </dd>
 </dl>
 
 <h3>Details</h3>
 The conference verb places a call into a conference.
 <h3>References</h3>
   <ul>
-      <li><a href="https://docs.jambonz.org/jambonz/#conference">Jambonz conference reference</a></li>
+      <li><a href="https://www.jambonz.org/docs/webhooks/conference/">Jambonz conference reference</a></li>
   </ul>
 </script>
 

package/src/nodes/conference.js

@@ -1,7 +1,3 @@
-var {createHash} = require('crypto');
-const bent = require('bent');
-var mustache = require('mustache');
-mustache.escape = function(text) {return text;};
 var {appendVerb, v_resolve} = require('./libs')
 
 module.exports = function(RED) {

package/src/nodes/config.js

@@ -1,7 +1,3 @@
-var {createHash} = require('crypto');
-const bent = require('bent');
-var mustache = require('mustache');
-mustache.escape = function(text) {return text;};
 var {appendVerb} = require('./libs')
 
 module.exports = function(RED) {

package/src/nodes/create_call.html

@@ -1,6 +1,6 @@
 <!-- Javascript -->
 <script type="text/javascript">
- RED.nodes.registerType('create-call',{
+  RED.nodes.registerType('create-call',{
       category: 'jambonz',
       color: '#aebfb9',
       defaults: {
@@ -57,7 +57,6 @@
         prepareTtsControls(node);
         prepareSttControls(node);
 
-
         $('#node-input-from').typedInput({
           default: $('#node-input-fromType').val(),
           types: ['str','msg', 'flow', 'global', 'jsonata', 'env'],
@@ -125,7 +124,6 @@
   });
 </script>
 
-
 <!-- HTML -->
 <script type="text/html" data-template-name="create-call">
     <div class="form-row">
@@ -254,34 +252,30 @@
         </div>
     </fieldset>
   </div>
-  
-  
-  </script>
+</script>
 
 <!-- Help Text -->
-
 <script type="text/html" data-help-name="create-call">
   <p>Create an outbound call</p>
   <h3>Properties</h3>
-    <p><code>Server</code> -jambonz server to connect to</p>
+    <p><code>Server</code> - Jambonz server to connect to</p>
     <p><code>From</code> - Calling party phone number</p>
     <p><code>To</code> - Called party phone number, or other identifier</p>
     <p><code>Call type</code> - Type of destination: phone number, registered user, sip endpoint, or microsoft teams</p>
     <p><code>Application</code> - Application to execute when call is answered</p>
-  
+    <p><code>Webhooks</code> - Webhooks to execute when call is answered</p>
+
   <h3>Outputs</h3>
   <dl class="message-properties">
-   <dt>statusCode<span class="property-type">int</span></dt>
-   <dd> <code>msg.statusCode</code> will contain the response code from Jambomnz to the createCall request</dd>
-   <dt>callSid<span class="property-type">string</span></dt>
-   <dd> <code>msg.callSid</code> will contain the SID of the call that was created</dd>
+    <dt>statusCode<span class="property-type">int</span></dt>
+    <dd> <code>msg.statusCode</code> will contain the response code from Jambonz to the createCall request</dd>
+    <dt>callSid<span class="property-type">string</span></dt>
+    <dd> <code>msg.callSid</code> will contain the SID of the call that was created</dd>
+    <dt>callId<span class="property-type">string</span></dt>
+    <dd> <code>msg.callId</code> will contain the call id of the call that was created</dd>
   </dl>
   
   <h3>Details</h3>
   The create call command is used to generate a new outbound call.  
   When the call is answered the specified application's call hook will be invoked.
-  <h3>References</h3>
-    <ul>
-        <li><a href="https://docs.jambonz.org/rest/#create-a-call">Jambonz reference</a></li>
-    </ul>
-  </script>
+</script>

package/src/nodes/create_call.js

@@ -1,12 +1,8 @@
-var {createHash} = require('crypto');
-var mustache = require('mustache');
-const { toNamespacedPath } = require('path');
-mustache.escape = function(text) {return text;};
 var {v_resolve, doCreateCall, } = require('./libs')
 
 module.exports = function(RED) {
- /** Create call */
- function create_call(config) {
+  /** Create call */
+  function create_call(config) {
     RED.nodes.createNode(this, config);
     var node = this;
     const server = RED.nodes.getNode(config.server);
@@ -35,23 +31,23 @@ module.exports = function(RED) {
 
       switch (config.mode) {
         case 'app':
-          opts.application_sid =  config.application 
+          opts.application_sid = config.application;
           break
         case 'url':
           opts.call_hook = {
-            url: config.call_hook_url,
+            url: v_resolve(config.call_hook_url, config.call_hook_urlType, this.context(), msg),
             method: config.call_hook_method
-          }
+          };
           opts.call_status_hook = {
-            url: config.call_status_url,
+            url: v_resolve(config.call_status_url, config.call_status_urlType, this.context(), msg),
             method: config.call_status_method
-          }
-          opts.speech_synthesis_vendor = config.vendor
-          opts.speech_synthesis_language = config.lang
-          opts.speech_synthesis_voice = config.voice
-          opts.speech_recognizer_vendor = config.transcriptionvendor
-          opts.speech_recognizer_language = config.recognizerlang
-          break
+          };
+          opts.speech_synthesis_vendor = config.vendor;
+          opts.speech_synthesis_language = config.lang;
+          opts.speech_synthesis_voice = config.voice;
+          opts.speech_recognizer_vendor = config.transcriptionvendor;
+          opts.speech_recognizer_language = config.recognizerlang;
+          break;
       }
 
       if (config.timeout) {
@@ -77,19 +73,25 @@ module.exports = function(RED) {
           send(msg);
           return;
       }
-      node.log(JSON.stringify(opts))
       try {
+        node.log(`sending create call ${JSON.stringify(opts)}`);
         const res = await doCreateCall(url, accountSid, apiToken, opts);
-        msg.statusCode = 202;
+        msg.statusCode = 201;
         msg.callSid = res.sid;
+        msg.callId = res.callId;
       } catch (err) {
         if (err.statusCode) {
-          console.log(JSON.stringify(err))
-          node.error(`create-call failed with ${err.statusCode}`);
+          node.log(JSON.stringify(err));
+          try {
+            const responseBody = await err.json();
+            node.error(`create-call failed with ${err.statusCode}. Response ${JSON.stringify(responseBody)}`);
+          } catch (e) {
+            node.error(`create-call failed with ${err.statusCode}`);
+          }
           msg.statusCode = err.statusCode;
         }
         else {
-          node.error(`Error sending create all ${JSON.stringify(err)}`);
+          node.error(`Error sending create call ${JSON.stringify(err)}`);
           if (done) done(err);
           else node.error(err, msg);
           send(msg);

package/src/nodes/create_sms.html

@@ -1,6 +1,6 @@
 <!-- Javascript -->
 <script type="text/javascript">
- RED.nodes.registerType('create-sms',{
+  RED.nodes.registerType('create-sms',{
       category: 'jambonz',
       color: '#aebfb9',
       defaults: {
@@ -46,12 +46,9 @@
         });
       }
   });
-
 </script>
 
-
 <!-- HTML -->
-
 <script type="text/html" data-template-name="create-sms">
     <div class="form-row">
       <label for="node-input-name"><i class="icon-tag"></i> Name</label>
@@ -81,26 +78,26 @@
     <input type="text" id="node-input-provider">
     <input type="hidden" id="node-input-providerType">
   </div>
-  </script>
+</script>
   
-
 <!-- Help Text -->
-
 <script type="text/html" data-help-name="create-sms">
-    <p>Send an SMS</p>
-    <h3>Properties</h3>
-    <p><code>Server</code> -  jambonz server to connect to</p>
-    <p><code>From</code> -  Sending party phone number</p>
-    <p><code>To</code> -  Destination phone number</p>
+  <p>Create an outbound SMS message</p>
+  <h3>Properties</h3>
+    <p><code>Server</code> - Jambonz server to connect to</p>
+    <p><code>From</code> - Sending party phone number</p>
+    <p><code>To</code> - Destination phone number</p>
     <p><code>Text</code> - Text message</p>
 
-  
+  <h3>Outputs</h3>
+  <dl class="message-properties">
+    <dt>statusCode<span class="property-type">int</span></dt>
+    <dd> <code>msg.statusCode</code> will contain the response code from Jambonz to the createMessage request</dd>
+    <dt>messageSid<span class="property-type">string</span></dt>
+    <dd> <code>msg.messageSid</code> will contain the SID of the message that was created</dd>
+    <dt>providerResponse<span class="property-type">string</span></dt>
+    <dd> <code>msg.providerResponse</code> will contain the provider response of the call that was created</dd>
+  </dl>  
   <h3>Details</h3>
-  The create message command is used to send an SMS message.  
-  <!--
-  <h3>References</h3>
-    <ul>
-        <li><a href="https://docs.jambonz.org/rest/#create-a-call">Jambonz reference</a></li>
-    </ul>
-  -->
-  </script>
+  The create message command is used to send an outbound SMS message.  
+</script>

package/src/nodes/create_sms.js

@@ -1,10 +1,5 @@
-var {createHash} = require('crypto');
-const bent = require('bent');
-var mustache = require('mustache');
-mustache.escape = function(text) {return text;};
 var {v_resolve, doCreateMessage} = require('./libs')
 
-
 module.exports = function(RED) {
 /** Create sms */
 function create_sms(config) {
@@ -35,17 +30,21 @@ function create_sms(config) {
         text,
         provider
       };
-
       try {
         node.log(`sending create message ${JSON.stringify(opts)}`);
         const res = await doCreateMessage(url, accountSid, apiToken, opts);
-        msg.statusCode = 202;
+        msg.statusCode = 201;
         msg.messageSid = res.sid;
         msg.providerResponse = res.providerResponse;
-        node.log(`successfully launched call with messageSid ${msg.messageSid}`);
       } catch (err) {
         if (err.statusCode) {
-          node.log(`create_message failed with ${err.statusCode}`);
+          node.log(JSON.stringify(err));
+          try {
+            const responseBody = await err.json();
+            node.error(`create_sms failed with ${err.statusCode}. Response ${JSON.stringify(responseBody)}`);
+          } catch (e) {
+            node.error(`create_sms failed with ${err.statusCode}`);
+          }
           msg.statusCode = err.statusCode;
         }
         else {
@@ -61,5 +60,4 @@ function create_sms(config) {
     });
   }
   RED.nodes.registerType('create-sms', create_sms);
-
 }

package/src/nodes/dequeue.html

@@ -1,6 +1,6 @@
 <!-- Javascript -->
 <script type="text/javascript">
-RED.nodes.registerType('dequeue',{
+  RED.nodes.registerType('dequeue',{
       category: 'jambonz',
       color: '#bbabaa',
       defaults: {
@@ -42,7 +42,6 @@ RED.nodes.registerType('dequeue',{
   });
 </script>
 
-
 <!-- HTML -->
 <script type="text/html" data-template-name="dequeue">
     <div class="form-row">
@@ -73,9 +72,8 @@ RED.nodes.registerType('dequeue',{
       <input type="text" id="node-input-timeout" placeholder="seconds to wait if queue is empty">
       <input type="hidden" id="node-input-timeoutType">
     </div>
-  </script>
+</script>
   
-
 <!-- Help Text -->
 <script type="text/html" data-help-name="dequeue">
     <p>removes the a call from the front of a queue and bridges that call to the current caller.</p>
@@ -89,14 +87,14 @@ RED.nodes.registerType('dequeue',{
   
   <h3>Outputs</h3>
   <dl class="message-properties">
-     <dt>jambonz<span class="property-type">object</span></dt>
-     <dd> <code>msg.jambonz</code> will contain any previous actions provided to the input with the new <code>dequeue</code> action appended  </dd>
+    <dt>jambonz<span class="property-type">object</span></dt>
+    <dd> <code>msg.jambonz</code> will contain any previous actions provided to the input with the new <code>dequeue</code> action appended  </dd>
   </dl>
   
   <h3>Details</h3>
   The dequeue verb removes the a call from the front of a specified queue and bridges that call to the current caller.
   <h3>References</h3>
     <ul>
-        <li><a href="https://docs.jambonz.org/jambonz/#dequeue">Jambonz dequeue reference</a></li>
+        <li><a href="https://www.jambonz.org/docs/webhooks/dequeue/">Jambonz dequeue reference</a></li>
     </ul>
-  </script>
+</script>

package/src/nodes/dequeue.js

@@ -1,7 +1,3 @@
-var {createHash} = require('crypto');
-const bent = require('bent');
-var mustache = require('mustache');
-mustache.escape = function(text) {return text;};
 var {appendVerb, v_resolve} = require('./libs')
 
 module.exports = function(RED) {

package/src/nodes/dial.html

@@ -1,6 +1,6 @@
 <!-- Javascript -->
 <script type="text/javascript">
-RED.nodes.registerType('dial',{
+  RED.nodes.registerType('dial',{
       category: 'jambonz',
       color: '#bbabaa',
       defaults: {
@@ -363,13 +363,9 @@ RED.nodes.registerType('dial',{
         console.log(`saved headers ${JSON.stringify(node.headers)}`);
       },
     });
-
-
 </script>
 
-
 <!-- HTML -->
-
 <script type="text/html" data-template-name="dial">
     <style>
       ol#node-input-target-container .red-ui-typedInput-container {
@@ -569,7 +565,7 @@ RED.nodes.registerType('dial',{
       </div>
     </fieldset>
   </div>
-  </script>
+</script>
 
 <!-- Help Text -->
 <script type="text/html" data-help-name="dial">
@@ -614,7 +610,6 @@ RED.nodes.registerType('dial',{
       <p><code>Send interim transcriptions</code> - 
       <dd>if true interim transcriptions are sent.</p>
 
-  
     <h3>Outputs</h3>
     <dl class="message-properties">
       <dt>jambonz<span class="property-type">object</span></dt>
@@ -624,6 +619,6 @@ RED.nodes.registerType('dial',{
     <h3>Details</h3>
     The dial verb is used to create a new call by dialing out to a number, a registered sip user, or sip endpoint
       <ul>
-          <li><a href="https://docs.jambonz.org/jambonz/#dial">Jambonz dial reference</a></li>
+          <li><a href="https://www.jambonz.org/docs/webhooks/dial/">Jambonz dial reference</a></li>
       </ul>
   </script>

package/src/nodes/dial.js

@@ -1,5 +1,3 @@
-var {createHash} = require('crypto');
-const bent = require('bent');
 var {appendVerb, v_resolve} = require('./libs')
 
 module.exports = function(RED) {
@@ -8,7 +6,6 @@ module.exports = function(RED) {
     var node = this;
 
     node.on('input', function(msg) {
-
       node.log(`dial config: ${JSON.stringify(config)}, msg.call: ${JSON.stringify(msg.call)}`);
       var target = config.targets.map((t) => {
         const obj = Object.assign({}, t);
@@ -56,7 +53,6 @@ module.exports = function(RED) {
         dtmfHook: v_resolve(config.dtmfhook, config.dtmfhookType, this.context(), msg)
       };
 
-
       // headers
       var headers = {};
       config.headers.forEach(function(h) {
@@ -129,7 +125,6 @@ module.exports = function(RED) {
         delete data.dtmfHook;
       }
 
-
       node.log(`dial verb: ${JSON.stringify(data)}`);
 
       appendVerb(msg, data);

package/src/nodes/dialogflow.html

@@ -1,6 +1,6 @@
 <!-- Javascript -->
 <script type="text/javascript">
-RED.nodes.registerType('dialogflow',{
+  RED.nodes.registerType('dialogflow',{
       category: 'jambonz',
       color: '#bbabaa',
       defaults: {
@@ -107,10 +107,8 @@ RED.nodes.registerType('dialogflow',{
         recLangElem.val(node.recognizerlang);
       }
     });
-
 </script>
 
-
 <!-- HTML -->
 <script type="text/html" data-template-name="dialogflow">
     <div class="form-row">
@@ -215,9 +213,7 @@ RED.nodes.registerType('dialogflow',{
   </script>
 
 <!-- Help Text -->
-
-<script type="text/html" data-help-name="audio in">
-    <script type="text/html" data-help-name="dialogflow">
+<script type="text/html" data-help-name="dialogflow">
         <p>Run a Google dialogflow bot on the call</p>
         <h3>Properties</h3>
           <p><code>Dialogflow Project ID</code> - 
@@ -236,7 +232,6 @@ RED.nodes.registerType('dialogflow',{
             Webhook to call when an intent, transcription or other dialogflow event is received. Optional.</p>
           <p><code>Action Hook</code> - 
             Webhook to call when the dialogflow bot interaction concludes. Optional.</p>
-       
       
         <h3>Outputs</h3>
         <dl class="message-properties">
@@ -250,11 +245,6 @@ RED.nodes.registerType('dialogflow',{
       
         <h3>References</h3>
           <ul>
-              <li><a href="https://docs.jambonz.org/jambonz/#dialogflow">Jambonz dialogflow reference</a></li>
+              <li><a href="https://www.jambonz.org/docs/webhooks/dialogflow/">Jambonz dialogflow reference</a></li>
           </ul>
-      </script>
-      
-      
-  
-
 </script>

package/src/nodes/dialogflow.js

@@ -1,7 +1,3 @@
-var {createHash} = require('crypto');
-const bent = require('bent');
-var mustache = require('mustache');
-mustache.escape = function(text) {return text;};
 var {appendVerb, v_resolve} = require('./libs')
 
 module.exports = function(RED) {
@@ -44,7 +40,6 @@ function dialogflow(config) {
           voice: config.voice
         };
       }
-
       appendVerb(msg, obj);
       node.send(msg);
     });