Updates

* Update packages with per npm audit
* Update versions
* update libs and sdk version
* Some prep for making Redis optional (but not yet)
* Update to node.js 8
* Misc updates to readme
* travis update

Author: markstur

.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
 dist: trusty
-node_js: 6
+node_js:
+ - 8
+ - node
 script:
 - npm run test
 cache:

README.md

@@ -23,7 +23,7 @@ When the reader has completed this Code Pattern, they will understand how to:
 * Use the Weather Channel Data service to lookup locations and forecasts
 * Create an Alexa skill to reach tens of millions of customers
 
-![](doc/source/images/architecture.png)
+![architecture.png](doc/source/images/architecture.png)
 
 ## Flow
 
@@ -98,12 +98,12 @@ Create the service by following this link and hitting `Create`:
 Import the Assistant workspace.json:
 
 * Find the Assistant service in your IBM Cloud Dashboard.
-* Click on the service and then click on `Launch tool`.
+* Click on the service and then click on `Launch Watson Assistant`.
 * Go to the `Skills` tab.
-* Click `Create new`
+* Click `Create skill`
 * Click the `Import skill` tab.
 * Click `Choose JSON file`, go to your cloned repo dir, and `Open` the workspace.json file in [`data/conversation/workspaces/workspace.json`](data/conversation/workspaces/workspace.json).
-* Select `Everything` and click `Import`.
+* Select `Everything (Intents, Entities, and Dialog)` and click `Import`.
 
 To find the `WORKSPACE_ID` for Watson Assistant:
 
@@ -185,7 +185,7 @@ Databases for Redis, and Weather Company Data), can be found in the IBM Cloud UI
 
 ### 6. Create the OpenWhisk action
 
-As a prerequisite, [install the Cloud Functions (IBM Cloud OpenWhisk) CLI](https://cloud.ibm.com/docs/openwhisk/bluemix_cli.html#cloudfunctions_cli)
+As a prerequisite, [install the Cloud Functions (IBM Cloud OpenWhisk) CLI](https://cloud.ibm.com/docs/openwhisk?topic=cloud-functions-cli_install)
 
 #### Create the OpenWhisk action
 
@@ -198,12 +198,12 @@ to create a raw HTTP web action in OpenWhisk.
 npm install
 rm action.zip
 zip -r action.zip main.js package* node_modules
-ibmcloud wsk action update alexa-watson action.zip --kind nodejs:6 --web raw --param-file .params
+ibmcloud wsk action update alexa-watson action.zip --kind nodejs:8 --web raw --param-file .params
 ```
 
-#### Determine your IBM Cloud endpoint:
+#### Determine your IBM Cloud endpoint
 
-To find this URL, navigate to [IBM Cloud Functions - Actions](https://cloud.ibm.com/openwhisk/manage/actions), click on your
+To find this URL, navigate to [IBM Cloud Functions - Actions](https://cloud.ibm.com/openwhisk/actions), click on your
 `alexa-watson` action and use the sidebar to navigate to `Endpoints`.  The Web Action URL ends with `.json`.
 
 ![functions_endpoints](doc/source/images/functions_endpoints.png)
@@ -333,7 +333,6 @@ The next screenshot shows how the location is automatically used in the next 'we
 * [Alexa/Google Home infinite loop conversation](https://www.youtube.com/watch?v=LEz9AU9c2qQ): Check out how it works.
 * [Award winners](https://voicebot.ai/2017/03/01/amazon-alexa-ibm-watson-won-2016-voice-assistant-wars-already-winning-2017/): Amazon Alexa and IBM Watson won the 2016 Voice Assistant Wars.
 * [Bluemix Stirred](https://bluemixstirred.wordpress.com/2017/05/11/use-the-amazon-echo-dot-with-the-watson-conversation-service/): Learn how to use the Amazon Echo and Dot with the Watson Assistant Service.
-* [Old Demo on Youtube](https://www.youtube.com/watch?v=4cTSkX0wSV8): Watch the video.
 
 # Learn more
 

main.js

@@ -17,7 +17,7 @@
 'use strict';
 
 const alexaVerifier = require('alexa-verifier');
-const AssistantV1 = require('watson-developer-cloud/assistant/v1');
+const AssistantV1 = require('ibm-watson/assistant/v1');
 const redis = require('redis');
 const openwhisk = require('openwhisk');
 const request = require('request');
@@ -48,7 +48,7 @@ function verifyFromAlexa(args, rawBody) {
     alexaVerifier(certUrl, signature, rawBody, function(err) {
       if (err) {
         console.error('err? ' + JSON.stringify(err));
-        throw new Error('Alexa verification failed.');
+        throw Error('Alexa verification failed.');
       }
       resolve();
     });
@@ -59,52 +59,57 @@ function initClients(args) {
   // Connect a client to Watson Assistant
   if (args.ASSISTANT_IAM_APIKEY) {
     assistant = new AssistantV1({
-      version: '2018-02-16',
+      version: '2019-07-16',
       iam_apikey: args.ASSISTANT_IAM_APIKEY,
       url: args.ASSISTANT_IAM_URL
     });
   } else if (args.ASSISTANT_USERNAME) {
     assistant = new AssistantV1({
-      version: '2018-02-16',
+      version: '2019-07-16',
       username: args.ASSISTANT_USERNAME,
       password: args.ASSISTANT_PASSWORD
     });
   } else {
     console.error('err? ' + 'Invalid Credentials');
-    throw new Error('Invalid Credentials');
+    throw Error('Invalid Credentials');
   }
 
   console.log('Connected to Watson Assistant');
 
   // Connect a client to Redis
   const connectionString = args.REDIS_URI;
-  if (connectionString.startsWith('rediss://')) {
-    const convertedCert = Buffer.from(args.REDIS_CERT, 'base64').toString();
-    redisClient = redis.createClient(connectionString, {
-      tls: { servername: new Url(connectionString).hostname, ca: convertedCert }
+  if (args.REDIS_URI) {
+    if (connectionString.startsWith('rediss://')) {
+      const convertedCert = Buffer.from(args.REDIS_CERT, 'base64').toString();
+      redisClient = redis.createClient(connectionString, {
+        tls: { servername: new Url(connectionString).hostname, ca: convertedCert }
+      });
+    } else {
+      redisClient = redis.createClient(connectionString);
+    }
+    redisClient.on('error', function(err) {
+      console.log('Redis Error - ' + err);
     });
+
+    console.log('Connected to Redis');
   } else {
-    redisClient = redis.createClient(connectionString);
+    console.error('Missing REDIS_URI');
+    throw Error('Missing required configuration of REDIS_URI');
   }
-  redisClient.on('error', function(err) {
-    console.log('Redis Error - ' + err);
-  });
-
-  console.log('Connected to Redis');
 }
 
 function getSessionContext(sessionId) {
-  console.log('sessionId: ' + sessionId);
+  console.log('Alexa sessionId: ' + sessionId);
 
   return new Promise(function(resolve, reject) {
     redisClient.get(sessionId, function(err, value) {
       if (err) {
         console.error(err);
-        reject('Error getting context from Redis.');
+        reject(Error('Error getting context from Redis.'));
       }
       // set global context
       context = value ? JSON.parse(value) : {};
-      console.log('context:');
+      console.log('Watson context from Redis:');
       console.log(context);
       resolve();
     });
@@ -126,7 +131,7 @@ function assistantMessage(request, workspaceId) {
       function(err, watsonResponse) {
         if (err) {
           console.error(err);
-          reject('Error talking to Watson.');
+          reject(Error('Error talking to Watson.'));
         } else {
           console.log(watsonResponse);
           context = watsonResponse.context; // Update global context
@@ -159,7 +164,7 @@ function lookupGeocode(args, location) {
           // console.log('Locations from Weather location services');
           // console.log(body.location);
           if (body.location.length < 1) {
-            reject('Location not found');
+            reject(Error('Location not found'));
           }
           // Just take the first one.
           const latitude = body.location.latitude[0];
@@ -253,7 +258,8 @@ function sendResponse(response, resolve) {
         type: 'PlainText',
         text: output
       }
-    }
+    },
+    sessionAttributes: { watsonContext: context }
   });
 }
 
@@ -283,6 +289,12 @@ function main(args) {
     const rawBody = Buffer.from(args.__ow_body, 'base64').toString('ascii');
     const body = JSON.parse(rawBody);
     const sessionId = body.session.sessionId;
+
+    // Alexa attributes hold our context (for future use)
+    const alexaAttributes = body.session.attributes;
+    console.log('Alexa attributes:');
+    console.log(alexaAttributes);
+
     const request = body.request;
 
     verifyFromAlexa(args, rawBody)