Merge pull request #10 from conshus/review-2-2020

2/2020 Review

Author: Lorna Jane Mitchell

.gitignore

@@ -1,4 +1,5 @@
 private.key
 public.key
+.nexmo-app
 node_modules
 .env

README.md

@@ -53,13 +53,13 @@ npm start
 
 To indicate that a conversation between two users should be allowed navigate to the following replacing `FROM_NUMBER` and `TO_NUMBER` with e.164 formatting international numbers (e.g. 14155550123):
 
-http://localhost:5000/conversation/start/FROM_NUMBER/TO_NUMBER
+http://localhost:3000/conversation/start/FROM_NUMBER/TO_NUMBER
 
 In a real system this conversation would be set up by an automated process.
 
 To check the existing ongoing conversations navigate to:
 
-http://localhost:5000/conversations
+http://localhost:3000/conversations
 
 You should see a response such as the following:
 

config.js

@@ -2,7 +2,7 @@
 
 require('dotenv').config();
 
-var config = {
+const config = {
   NEXMO_API_KEY: process.env['NEXMO_API_KEY'],
   NEXMO_API_SECRET: process.env['NEXMO_API_SECRET'],
   NEXMO_DEBUG: process.env['NEXMO_DEBUG'],

lib/VoiceProxy.js

@@ -1,12 +1,11 @@
 "use strict";
 
-var Promise = require('bluebird');
-var Nexmo = require('nexmo');
+const Nexmo = require('nexmo');
 
 /**
  * Create a new VoiceProxy
  */
-var VoiceProxy = function(config) {
+const VoiceProxy = function(config) {
   this.config = config;
 
   this.nexmo = new Nexmo({
@@ -34,7 +33,7 @@ VoiceProxy.prototype.provisionVirtualNumbers = function() {
       console.error(err);
     }
     else {
-      var numbers = res.numbers;
+      const numbers = res.numbers;
 
       // For demo purposes:
       // - Assume that at least two numbers will be available
@@ -63,7 +62,7 @@ VoiceProxy.prototype.rentNumber = function(number) {
  * Configure the number to be associated with the Voice Proxy application.
  */
 VoiceProxy.prototype.configureNumber = function(number) {
-  var options = {
+  const options = {
     voiceCallbackType: 'app',
     voiceCallbackValue: this.config.NEXMO_APP_ID,
   };
@@ -104,34 +103,44 @@ VoiceProxy.prototype.createConversation = function(userANumber, userBNumber, cb)
 /**
  * Ensure the given numbers are valid and which country they are associated with.
  */
-VoiceProxy.prototype.checkNumbers = function(userANumber, userBNumber) {
-  var niGetPromise = Promise.promisify(this.nexmo.numberInsight.get, {context: this.nexmo.numberInsight});
-  var userAGet = niGetPromise({level: 'basic', number: userANumber});
-  var userBGet = niGetPromise({level: 'basic', number: userBNumber});
-  
+VoiceProxy.prototype.checkNumbers = function (userANumber, userBNumber) {
+  const niGetPromise = (number) => new Promise ((resolve) => {
+    this.nexmo.numberInsight.get(number, (error, result) => {
+      if(error) {
+        console.error('error',error);
+      }
+      else {
+        return resolve(result);
+      }
+    })
+  });
+
+  const userAGet = niGetPromise({level: 'basic', number: userANumber});
+  const userBGet = niGetPromise({level: 'basic', number: userBNumber});
+
   return Promise.all([userAGet, userBGet]);
 };
 
 /**
  * Store the conversation information.
  */
 VoiceProxy.prototype.saveConversation = function(results) {
-  var userAResult = results[0];
-  var userANumber = {
+  const userAResult = results[0];
+  const userANumber = {
     msisdn: userAResult.international_format_number,
     country: userAResult.country_code
   };
 
-  var userBResult = results[1];
-  var userBNumber = {
+  const userBResult = results[1];
+  const userBNumber = {
     msisdn: userBResult.international_format_number,
     country: userBResult.country_code
   };
 
   // Create conversation object - for demo purposes:
   // - Use first indexed LVN for user A
   // - Use second indexed LVN for user B
-  var conversation = {
+  const conversation = {
     userA: {
       realNumber: userANumber,
       virtualNumber: this.provisionedNumbers[0]
@@ -169,11 +178,11 @@ VoiceProxy.prototype.sendSMS = function(conversation) {
   return conversation;
 };
 
-var fromUserAToUserB = function(from, to, conversation) {
+const fromUserAToUserB = function(from, to, conversation) {
   return (from === conversation.userA.realNumber.msisdn &&
           to === conversation.userB.virtualNumber.msisdn);
 };
-var fromUserBToUserA = function(from, to, conversation) {
+const fromUserBToUserA = function(from, to, conversation) {
   return (from === conversation.userB.realNumber.msisdn &&
           to === conversation.userA.virtualNumber.msisdn);
 };
@@ -182,14 +191,14 @@ var fromUserBToUserA = function(from, to, conversation) {
  * Work out real number to virual number mapping between users.
  */
 VoiceProxy.prototype.getProxyRoute = function(from, to) { 
-  var proxyRoute = null;
-  var conversation;
-  for(var i = 0, l = this.conversations.length; i < l; ++i) {
+  let proxyRoute = null;
+  let conversation;
+  for(let i = 0, l = this.conversations.length; i < l; ++i) {
     conversation = this.conversations[i];
 
     // Use to and from to determine the conversation
-    var fromUserA = fromUserAToUserB(from, to, conversation);
-    var fromUserB = fromUserBToUserA(from, to, conversation);
+    const fromUserA = fromUserAToUserB(from, to, conversation);
+    const fromUserB = fromUserBToUserA(from, to, conversation);
 
     if(fromUserA || fromUserB) {
       proxyRoute = {
@@ -209,25 +218,25 @@ VoiceProxy.prototype.getProxyRoute = function(from, to) {
  */
 VoiceProxy.prototype.getProxyNCCO = function(from, to) {  
   // Determine how the call should be routed
-  var proxyRoute = this.getProxyRoute(from, to);
+  const proxyRoute = this.getProxyRoute(from, to);
 
   if(proxyRoute === null) {
-    var errorText = 'No conversation found' +
+    const errorText = 'No conversation found' +
                     ' from: ' + from +
                     ' to: ' + to;
     throw new Error(errorText);
   }
 
   // Build the NCCO
-  var ncco = [];
+  let ncco = [];
 
-  var textAction = {
+  const textAction = {
     action: 'talk',
     text: 'Please wait whilst we connect your call'
   };
   ncco.push(textAction);
 
-  var connectAction = {
+  const connectAction = {
     action: 'connect',
     from: proxyRoute.from.virtualNumber.msisdn,
     endpoint: [{

lib/server.js

@@ -1,26 +1,26 @@
 "use strict";
 
-var express = require('express');
-var bodyParser = require('body-parser');
+const express = require('express');
+const bodyParser = require('body-parser');
 
-var app = express();
-app.set('port', (process.env.PORT || 5000));
+const app = express();
+app.set('port', (process.env.PORT || 3000));
 app.use(bodyParser.urlencoded({ extended: false }));
 
-var config = require(__dirname + '/../config');
+const config = require(__dirname + '/../config');
 
-var VoiceProxy = require('./VoiceProxy');
-var voiceProxy = new VoiceProxy(config);
+const VoiceProxy = require('./VoiceProxy');
+const voiceProxy = new VoiceProxy(config);
 
 app.listen(app.get('port'), function() {
   console.log('Voice Proxy App listening on port', app.get('port'));
 });
 
 app.get('/proxy-call', function(req, res) {
-  var from = req.query.from;
-  var to = req.query.to;
+  const from = req.query.from;
+  const to = req.query.to;
 
-  var ncco = voiceProxy.getProxyNCCO(from, to);
+  const ncco = voiceProxy.getProxyNCCO(from, to);
   res.json(ncco);
 });
 
@@ -31,8 +31,8 @@ app.post('/event', function(req, res) {
 });
 
 app.get('/conversation/start/:userANumber/:userBNumber', function(req, res) {
-  var userANumber = req.params.userANumber;
-  var userBNumber = req.params.userBNumber;
+  const userANumber = req.params.userANumber;
+  const userBNumber = req.params.userBNumber;
 
   voiceProxy.createConversation(userANumber, userBNumber, function(err, result) {
     if(err) {
@@ -42,7 +42,7 @@ app.get('/conversation/start/:userANumber/:userBNumber', function(req, res) {
       res.json(result);
     }
   });
-})
+});
 
 // Useful functions for testing out the functionality and querying bookings
 app.get('/', function(req, res) {
@@ -59,7 +59,7 @@ app.get('/numbers/reconfigure', function(req, res) {
   voiceProxy.reconfigureNumbers();
 
   res.send('OK');
-})
+});
 
 app.get('/numbers', function(req, res) {
   res.json(voiceProxy.provisionedNumbers);

package.json

@@ -18,7 +18,6 @@
   "author": "Phil Leggetter <phil@leggetter.co.uk> (http://www.leggetter.co.uk)",
   "license": "MIT",
   "dependencies": {
-    "bluebird": "^3.4.1",
     "body-parser": "^1.15.2",
     "dotenv": "^2.0.0",
     "express": "^4.14.0",