Fixed a couple of bugs related to missing intents coming back from LUIS.

Author: Stevenic

Node/src/Session.ts

@@ -177,7 +177,15 @@ export class Session extends events.EventEmitter implements ISession {
     public endDialog(msg: IMessage): ISession;
     public endDialog(result?: dialog.IDialogResult<any>): ISession;
     public endDialog(result?: any, ...args: any[]): ISession {
+        // Validate callstack
+        // - Protect against too many calls to endDialog()
         var ss = this.sessionState;
+        if (!ss|| !ss.callstack || ss.callstack.length == 0) {
+            console.error('ERROR: Too many calls to session.endDialog().')
+            return this;
+        }
+        
+        // Pop dialog off the stack.
         var m: IMessage;
         var r = <dialog.IDialogResult<any>>{};
         if (result) {

Node/src/dialogs/IntentDialog.ts

@@ -206,9 +206,10 @@ export abstract class IntentDialog extends dialog.Dialog {
                 match = this.findHandler(topIntent);
             }
             if (!match) {
+                topIntent = { intent: consts.Intents.Default, score: 1.0 };
                 match = {
                     groupId: consts.Id.DefaultGroup,
-                    handler: this.getDefaultGroup()._intentHandler(consts.Intents.Default)
+                    handler: this.getDefaultGroup()._intentHandler(topIntent.intent)
                 };
             }
 
@@ -227,12 +228,14 @@ export abstract class IntentDialog extends dialog.Dialog {
 
     private findTopIntent(intents: IIntent[]): IIntent {
         var topIntent: IIntent;
-        for (var i = 0; i < intents.length; i++) {
-            var intent = intents[i];
-            if (!topIntent) {
-                topIntent = intent;
-            } else if (intent.score > topIntent.score) {
-                topIntent = intent;
+        if (intents) {
+            for (var i = 0; i < intents.length; i++) {
+                var intent = intents[i];
+                if (!topIntent) {
+                    topIntent = intent;
+                } else if (intent.score > topIntent.score) {
+                    topIntent = intent;
+                }
             }
         }
         return topIntent;

Node/src/dialogs/LuisDialog.ts

@@ -59,19 +59,26 @@ export class LuisDialog extends intent.IntentDialog {
         }
         uri += encodeURIComponent(utterance || '');
         request.get(uri, (err: Error, res: any, body: string) => {
+            var calledCallback = false;
             try {
                 if (!err) {
                     var result: ILuisResults = JSON.parse(body);
                     if (result.intents.length == 1 && typeof result.intents[0].score !== 'number') {
                         // Intents for the builtin Cortana app don't return a score.
                         result.intents[0].score = 1.0;
                     }
+                    calledCallback = true;
                     callback(null, result.intents, result.entities);
                 } else {
+                    calledCallback = true;
                     callback(err);
                 }
             } catch (e) {
-                callback(e);
+                if (!calledCallback) {
+                    callback(e);
+                } else {
+                    console.error(e.toString());
+                }
             }
         });
     }