Merge pull request #168 from watson-developer-cloud/master

Rebasing

Author: chughts

README.md

@@ -8,6 +8,10 @@ Node-RED Watson Nodes for IBM Cloud
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
 
+### New in version 0.9.2
+- Assistant V2 - Fix bug session expiry bug.
+
+
 ### New in version 0.9.1
 - Assistant V2 - Allow flow to assign a string session id. The node maps this user specified session id to the real session id. Additional param option allow session id to be reset.  
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "async": "^1.5.2",

services/assistant/v2.js

@@ -19,7 +19,8 @@ module.exports = function(RED) {
     OLD_SERVICE_IDENTIFIER = 'conversation',
     SERVICE_VERSION = '2018-11-08',
     AssistantV2 = require('ibm-watson/assistant/v2'),
-    { IamAuthenticator } = require('ibm-watson/auth');
+    { IamAuthenticator } = require('ibm-watson/auth'),
+    INVALID_SESSION = 'Invalid Session';
 
   var pkg = require('../../package.json'),
     serviceutils = require('../../utilities/service-utils'),
@@ -313,7 +314,16 @@ module.exports = function(RED) {
       });
     }
 
-    function messageTurn(params) {
+    function checkForInvalidSession(err) {
+      if (err &&
+            err.code && (404 === err.code) &&
+            err.message && (INVALID_SESSION === err.message)) {
+        return true;
+      }
+      return false;
+    }
+
+    function messageTurn(params, repeatedTurn) {
       return new Promise(function resolver(resolve, reject) {
         node.service.message(params)
           .then((response) => {
@@ -324,8 +334,37 @@ module.exports = function(RED) {
             }
           })
           .catch((err) => {
-            reject(err);
-          })
+            if ((!repeatedTurn) && checkForInvalidSession(err)) {
+              resolve({INVALID_SESSION : true});
+            } else {
+              reject(err);
+            }
+          });
+      });
+    }
+
+    function invalidSessionTurnCheck(body, msg, params) {
+      return new Promise(function resolver(resolve, reject) {
+        if (body && body.INVALID_SESSION) {
+          // Message Turn has returned an invalid session
+          // This time round force a new session, but ensure
+          // that the messageTurn sends a consequental invalid session
+          // as an error.
+          node.status({ fill: 'blue', shape: 'dot', text: 'Resetting Session ...'});
+          params.sessionId = null;
+          checkSession(msg, params)
+            .then (function(){
+              return messageTurn(params, true);
+            })
+            .then ((body) => {
+              return resolve(body);
+            })
+            .catch ((err) => {
+              reject(err);
+            })
+        } else {
+          resolve(body);
+        }
       });
     }
 
@@ -357,7 +396,10 @@ module.exports = function(RED) {
         })
         .then(function(){
           node.status({ fill: 'blue', shape: 'dot', text: 'Calling Assistant service ...'});
-          return messageTurn(params);
+          return messageTurn(params, false);
+        })
+        .then(function(body){
+          return invalidSessionTurnCheck(body, msg, params);
         })
         .then(function(body){
           body.session_id = params.sessionId;