Tests for create-server and new skill.lambda handler (#20)

* Adding tests for the create-server function

* Adding a helper for lambda

* Updating the lambda function

* Updating documentation and examples on the lambda handler

* Update create-server.spec.js

README.md

@@ -37,11 +37,7 @@ skill.onIntent('LaunchIntent', (event) => {
 });
 
 // lambda handler
-exports.handler = function handler(event, context, callback) {
-  return skill.execute(event, context)
-    .then(result => callback(null, result))
-    .catch(callback);
-}
+exports.handler = skill.lambda();
 
 ```
 

docs/index.rst

@@ -31,17 +31,13 @@ Instantiating a StateMachineSkill requires a configuration specifying your :ref:
 Responding to alexa events
 -----------------------------
 
-Once you have your skill configured responding to events is as simple as calling the :js:func:`skill.execute <Voxa.execute>` method
+Once you have your skill configured responding to events is as simple as calling the :js:func:`skill.lambda <Voxa.lambda>` method
 
 .. code-block:: javascript
 
   const skill = require('./MainStateMachine');
 
-  exports.handler = function handler(event, context) {
-    skill.execute(event, context)
-      .then(context.succeed)
-      .catch(context.fail);
-  };
+  exports.handler = skill.lambda();
 
 Using the development server
 -----------------------------

docs/statemachine-skill.rst

@@ -13,8 +13,17 @@ Voxa
 
     const skill = new Voxa({ Model, variables, views, appIds });
 
+.. js:function:: Voxa.lambda()
+
+
+  :returns: A lambda handler that will call your :js:func:`skill.execute <Voxa.execute>` method
+
+  .. code-block:: javascript
+
+      exports.handler = skill.lambda();
+
 .. js:function:: Voxa.execute(event)
-  
+
   The main entry point for the Skill execution
 
   :param event: The event sent by alexa.
@@ -24,8 +33,8 @@ Voxa
   .. code-block:: javascript
 
       skill.execute(event, context)
-        .then(context.succeed)
-        .catch(context.fail);
+        .then(result => callback(null, result))
+        .catch(callback);
 
 .. js:function:: Voxa.onState(stateName, handler)
 
@@ -50,7 +59,7 @@ Voxa
 
   A shortcut for definining state controllers that map directly to an intent
 
-  :param string intentName: The name of the intent 
+  :param string intentName: The name of the intent
   :param function/object handler: The controller to handle the state
   :returns: An object or a promise that resolves to an object that specifies a transition to another state and/or a view to render
 
@@ -136,7 +145,7 @@ Voxa
 .. js:function:: Voxa.onSessionEnded(callback, [atLast])
 
   Adds a callback to the ``onSessionEnded`` event, this is called for every ``SessionEndedRequest`` or when the skill returns a transition to a state where ``isTerminal === true``, normally this is a transition to the ``die`` state. You would normally use this to track analytics
-  
+
 
 
 .. js:function:: Voxa.onSystem.ExceptionEncountered(callback, [atLast])
@@ -193,7 +202,7 @@ Playback Controller handlers
 Handle events from the `AudioPlayer interface <https://developer.amazon.com/public/solutions/alexa/alexa-skills-kit/docs/custom-audioplayer-interface-reference#requests>`_
 
 .. js:function:: audioPlayerCallback(alexaEvent, reply)
-  
+
   All audio player middleware callbacks get a :ref:`alexa event <alexa-event>` and a :ref:`reply <reply>` object
 
   :param AlexaEvent alexaEvent: The :ref:`alexa event <alexa-event>` sent by Alexa

lib/AlexaSkill.js

@@ -7,7 +7,7 @@ const _ = require('lodash');
 const debug = require('debug')('voxa');
 const UnknownRequestType = require('./Errors').UnkownRequestType;
 const capitalize = require('capitalize');
-const startServer = require('./start-server');
+const createServer = require('./create-server');
 
 class AlexaSkill {
   constructor(config) {
@@ -28,7 +28,9 @@ class AlexaSkill {
   }
 
   startServer(port) {
-    startServer(this, port);
+    createServer(this).listen(port, () => {
+      console.log(`Listening on port ${port}`);
+    });
   }
 
   /*
@@ -74,6 +76,12 @@ class AlexaSkill {
       });
   }
 
+  lambda() {
+    return (event, context, callback) => this.execute(event, context)
+      .then(result => callback(null, result))
+      .catch(callback);
+  }
+
   execute(event) {
     debug('Received new event: %s', JSON.stringify(event));
     return Promise.try(() => {

lib/start-server.js → lib/create-server.js

@@ -2,10 +2,8 @@
 
 const http = require('http');
 
-function startServer(skill, port) {
-  port = port || 3000;
-
-  const server = http.createServer((req, res) => {
+function createServer(skill) {
+  return http.createServer((req, res) => {
     if (req.method !== 'POST') {
       res.writeHead(404);
       return res.end();
@@ -27,10 +25,6 @@ function startServer(skill, port) {
 
     return res.writeHead(200, { 'Content-Type': 'application/json' });
   });
-
-  server.listen(port, () => {
-    console.log(`Listening on port ${port}`);
-  });
 }
 
-module.exports = startServer;
+module.exports = createServer;

package.json

@@ -44,6 +44,7 @@
     "istanbul": "^0.4.5",
     "mocha": "3.2.0",
     "mocha-jenkins-reporter": "0.3.7",
+    "portfinder": "^1.0.13",
     "simple-mock": "^0.7.3"
   },
   "bugs": {

samples/accountLinking/package.json

@@ -39,13 +39,13 @@
     "voxa": "^2.0.0"
   },
   "devDependencies": {
+    "chai": "^3.5.0",
     "eslint": "^3.15.0",
     "eslint-config-airbnb-base": "^11.1.0",
     "eslint-plugin-import": "^2.2.0",
-    "chai": "^3.5.0",
     "gulp": "^3.9.1",
-    "gulp-s3-upload": "1.6.4",
     "gulp-nodemon": "^2.0.7",
+    "gulp-s3-upload": "1.6.4",
     "mocha": "^3.2.0"
   },
   "directories": {

samples/accountLinking/skill/MainStateMachine.js

@@ -8,4 +8,5 @@ const states = require('./states');
 
 const skill = new Voxa({ variables, views });
 states.register(skill);
+
 module.exports = skill;

samples/accountLinking/skill/index.js

@@ -3,10 +3,5 @@
 // Include the state machine module, the state machine,
 // the responses and variables to be used in this skill
 const skill = require('./MainStateMachine');
-require('./states');
 
-exports.handler = function handler(event, context, callback) {
-  skill.execute(event)
-    .then(response => callback(null, response))
-    .catch(error => callback(error));
-};
+exports.handler = skill.lambda();

samples/accountLinking/www/routes/index.js

@@ -3,7 +3,6 @@
 const uuidV4 = require('uuid/v4');
 const router = require('../infrastructure/mount.js')(__dirname);
 const Storage = require('../../services/userStorage.js');
-const MobileDetect = require('mobile-detect');
 
 exports.router = router;
 
@@ -14,7 +13,6 @@ router.get('/', (req, res) => {
 });
 
 router.post('/', (req, res, next) => {
-  const md = new MobileDetect(req.headers['user-agent']);
   const db = new Storage();
   const email = req.body.email;
   const code = uuidV4().replace(/-/g, '');
@@ -27,18 +25,7 @@ router.post('/', (req, res, next) => {
   return db.put(params)
     .then(() => {
       const redirect = `${req.query.redirect_uri}#state=${req.query.state}&access_token=${code}&token_type=Bearer`;
-
-      if (md.is('AndroidOS')) {
-        console.log(`redirecting android to: ${redirect}`);
-        res.redirect(redirect);
-      } else {
-        console.log(`redirecting web to: ${redirect}`);
-        res.render('auth/success', {
-          page: 'success',
-          title: 'Success',
-          redirectUrl: redirect,
-        });
-      }
+      res.redirect(redirect);
     })
     .catch(next);
 });