Update twilio-node to 3.0.0-rc.16

Author: smendes

client/response-twiml-client/response-twiml-client.3.x.js

@@ -2,25 +2,24 @@
 const http = require('http');
 const express = require('express');
 const bodyParser = require('body-parser');
-const twilio = require('twilio');
+const VoiceResponse = require('twilio').twiml.VoiceResponse;
 
 const app = express();
 app.use(bodyParser.urlencoded({extended: false}));
 
 app.post('/voice', (req, res) => {
     // Create TwiML response
-    const twiml = new twilio.TwimlResponse();
+    const twiml = new VoiceResponse();
 
     if (req.body.To) {
-      twiml.dial({callerId: '+15017250604'}, function() {
-        // wrap the phone number or client name in the appropriate TwiML verb
-        // by checking if the number given has only digits and format symbols
-        if (/^[\d\+\-\(\) ]+$/.test(req.body.To)) {
-          this.number(req.body.To);
-        } else {
-          this.client(req.body.To);
-        }
-      });
+      const dial = twiml.dial({callerId: '+15017250604'});
+      // wrap the phone number or client name in the appropriate TwiML verb
+      // by checking if the number given has only digits and format symbols
+      if (/^[\d\+\-\(\) ]+$/.test(req.body.To)) {
+        dial.number(req.body.To);
+      } else {
+        dial.client(req.body.To);
+      }
     } else {
       twiml.say('Thanks for calling!');
     }

client/response-twiml-dial/response-twiml-dial.3.x.js

@@ -1,19 +1,18 @@
 const http = require('http');
 const express = require('express');
 const bodyParser = require('body-parser');
-const twilio = require('twilio');
+const VoiceResponse = require('twilio').twiml.VoiceResponse;
 
 const app = express();
 app.use(bodyParser.urlencoded({extended: false}));
 
 app.post('/voice', (req, res) => {
   // Create TwiML response
-  const twiml = new twilio.TwimlResponse();
+  const twiml = new VoiceResponse();
 
   if (req.body.To) {
-    twiml.dial({callerId: '+15017250604'}, function() {
-      this.number(req.body.To);
-    });
+    const dial = twiml.dial({callerId: '+15017250604'});
+    dial.number(req.body.To);
   } else {
     twiml.say('Thanks for calling!');
   }

client/response-twiml/response-twiml.3.x.js

@@ -1,12 +1,12 @@
 const http = require('http');
 const express = require('express');
-const twilio = require('twilio');
+const VoiceResponse = require('twilio').twiml.VoiceResponse;
 
 const app = express();
 
 app.post('/voice', (req, res) => {
   // Create TwiML response
-  const twiml = new twilio.TwimlResponse();  // FIXME: hows the class now?
+  const twiml = new VoiceResponse();
   twiml.say('Thanks for calling!');
 
   res.set('Content-Type', 'text/xml');

guides/request-validation-express/example-1/example-1.3.x.js

@@ -8,13 +8,14 @@
 const twilio = require('twilio');
 const app = require('express')();
 const bodyParser = require('body-parser');
-const TwimlResponse = twilio.TwimlResponse;
+const VoiceResponse = require('twilio').twiml.VoiceResponse;
+const MessagingResponse = require('twilio').twiml.MessagingResponse;
 
 app.use(bodyParser.urlencoded({extended: false}));
 
 app.post('/voice', twilio.webhook(), (req, res) => {
   // Twilio Voice URL - receives incoming calls from Twilio
-  const response = new TwimlResponse();
+  const response = new VoiceResponse();
 
   response.say(
     `Thanks for calling!
@@ -28,7 +29,7 @@ app.post('/voice', twilio.webhook(), (req, res) => {
 
 app.post('/message', twilio.webhook(), (req, res) => {
   // Twilio Messaging URL - receives incoming messages from Twilio
-  const response = new TwimlResponse();
+  const response = new MessagingResponse();
 
   response.message(`Your text to me was ${req.body.Body.length} characters long.
                     Webhooks are neat :)`);

guides/request-validation-express/example-2/example-2.3.x.js

@@ -8,15 +8,16 @@
 const twilio = require('twilio');
 const app = require('express')();
 const bodyParser = require('body-parser');
-const TwimlResponse = twilio.TwimlResponse;
+const VoiceResponse = require('twilio').twiml.VoiceResponse;
+const MessagingResponse = require('twilio').twiml.MessagingResponse;
 
 const shouldValidate = process.env.NODE_ENV !== 'test';
 
 app.use(bodyParser.urlencoded({extended: false}));
 
 app.post('/voice', twilio.webhook({validate: shouldValidate}), (req, res) => {
   // Twilio Voice URL - receives incoming calls from Twilio
-  const response = new TwimlResponse();
+  const response = new VoiceResponse();
 
   response.say(
     `Thanks for calling!
@@ -30,7 +31,7 @@ app.post('/voice', twilio.webhook({validate: shouldValidate}), (req, res) => {
 
 app.post('/message', twilio.webhook({validate: shouldValidate}), (req, res) => {
   // Twilio Messaging URL - receives incoming messages from Twilio
-  const response = new TwimlResponse();
+  const response = new MessagingResponse();
 
   response.message(`Your text to me was ${req.body.Body.length} characters long.
                     Webhooks are neat :)`);

guides/voice/conference-calls-guide/moderated-conference/moderated-conference.3.x.js

@@ -1,7 +1,6 @@
 
 const express = require('express');
-const twilio = require('twilio');
-const VoiceResponse = twilio.twiml.VoiceResponse;
+const VoiceResponse = require('twilio').twiml.VoiceResponse;
 const urlencoded = require('body-parser').urlencoded;
 
 // Update with your own phone number in E.164 format
@@ -19,21 +18,20 @@ app.post('/voice', (request, response) => {
   const twiml = new VoiceResponse();
 
   // Start with a <Dial> verb
-  twiml.dial((dialNode) => {
-    // If the caller is our MODERATOR, then start the conference when they
-    // join and end the conference when they leave
-    if(request.body.From == MODERATOR) {
-      dialNode.conference('My conference', {
-        startConferenceOnEnter: true,
-        endConferenceOnExit: true,
-      });
-    } else {
-      // Otherwise have the caller join as a regular participant
-      dialNode.conference('My conference', {
-        startConferenceOnEnter: false,
-      });
-    }
-  });
+  const dial = twiml.dial();
+  // If the caller is our MODERATOR, then start the conference when they
+  // join and end the conference when they leave
+  if(request.body.From == MODERATOR) {
+    dial.conference('My conference', {
+      startConferenceOnEnter: true,
+      endConferenceOnExit: true,
+    });
+  } else {
+    // Otherwise have the caller join as a regular participant
+    dial.conference('My conference', {
+      startConferenceOnEnter: false,
+    });
+  }
 
   // Render the response as XML in reply to the webhook request
   response.type('text/xml');

guides/voice/gather-dtmf-tones-guide/gather-example-step-0/example.3.x.js

@@ -1,6 +1,6 @@
 
 const express = require('express');
-const twilio = require('twilio');
+const VoiceResponse = require('twilio').twiml.VoiceResponse;
 const urlencoded = require('body-parser').urlencoded;
 
 const app = express();
@@ -12,12 +12,11 @@ app.use(urlencoded({extended: false}));
 // HTTP POST to /voice in our application
 app.post('/voice', (request, response) => {
   // Use the Twilio Node.js SDK to build an XML response
-  const twiml = new twilio.TwimlResponse();
+  const twiml = new VoiceResponse();
 
   // Use the <Gather> verb to collect user input
-  twiml.gather({numDigits: 1}, (gatherNode) => {
-    gatherNode.say('For sales, press 1. For support, press 2.');
-  });
+  const gather = twiml.gather({numDigits: 1});
+  gather.say('For sales, press 1. For support, press 2.');
 
   // If the user doesn't enter input, loop
   twiml.redirect('/voice');

guides/voice/gather-dtmf-tones-guide/gather-example-step-1/example.3.x.js

@@ -1,12 +1,11 @@
 app.post('/voice', (request, response) => {
   // Use the Twilio Node.js SDK to build an XML response
-  const twiml = new twilio.TwimlResponse();
+  const twiml = new VoiceResponse();
 
   /** helper function to set up a <Gather> */
   function gather() {
-    twiml.gather({numDigits: 1}, (gatherNode) => {
-      gatherNode.say('For sales, press 1. For support, press 2.');
-    });
+    const gatherNode = twiml.gather({numDigits: 1});
+    gatherNode.say('For sales, press 1. For support, press 2.');
 
     // If the user doesn't enter input, loop
     twiml.redirect('/voice');

guides/voice/gather-dtmf-tones-guide/gather-example-step-2/example.3.x.js

@@ -2,14 +2,13 @@
 // HTTP POST to /voice in our application
 app.post('/voice', (request, response) => {
   // Use the Twilio Node.js SDK to build an XML response
-  const twiml = new twilio.TwimlResponse();
+  const twiml = new VoiceResponse();
 
-  twiml.gather({
+  const gather = twiml.gather({
     numDigits: 1,
     action: '/gather',
-  }, (gatherNode) => {
-    gatherNode.say('For sales, press 1. For support, press 2.');
   });
+  gather.say('For sales, press 1. For support, press 2.');
 
   // If the user doesn't enter input, loop
   twiml.redirect('/voice');
@@ -22,7 +21,7 @@ app.post('/voice', (request, response) => {
 // Create a route that will handle <Gather> input
 app.post('/gather', (request, response) => {
   // Use the Twilio Node.js SDK to build an XML response
-  const twiml = new twilio.TwimlResponse();
+  const twiml = new VoiceResponse();
 
   // If the user entered digits, process their request
   if (request.body.Digits) {

guides/voice/record-calls-guide/record-twiml-transcribe/example.3.x.js

@@ -1,13 +1,13 @@
 
 const express = require('express');
-const twilio = require('twilio');
+const VoiceResponse = require('twilio').twiml.VoiceResponse;
 
 const app = express();
 
 // Returns TwiML which prompts the caller to record a message
 app.post('/record', (request, response) => {
   // Use the Twilio Node.js SDK to build an XML response
-  const twiml = new twilio.TwimlResponse();
+  const twiml = new VoiceResponse();
   twiml.say('Hello. Please leave a message after the beep.');
 
   // Use <Record> to record and transcribe the caller's message