Incremented package.json version and updated LKG build.

Author: Stevenic

Node/core/lib/DefaultLocalizer.js

@@ -6,9 +6,7 @@ var DefaultLocalizer = (function () {
     function DefaultLocalizer() {
     }
     DefaultLocalizer.prototype.initialize = function (settings) {
-        if (!settings) {
-            return;
-        }
+        if (settings === void 0) { settings = {}; }
         if (settings.botLocalePath) {
             this.botLocalePath = settings.botLocalePath.toLowerCase();
             if (this.botLocalePath.charAt(this.botLocalePath.length - 1) != '/') {

Node/core/lib/Session.js

@@ -66,8 +66,8 @@ var Session = (function (_super) {
         if (!this.message.type) {
             this.message.type = consts.messageType;
         }
-        logger.debug("loading localizer for: " + this.message.textLocale);
-        this.localizer.load(this.message.textLocale, function (err) {
+        var locale = this.preferredLocale();
+        this.localizer.load(locale, function (err) {
             if (err) {
                 _this.error(err);
             }
@@ -78,30 +78,41 @@ var Session = (function (_super) {
         return this;
     };
     Session.prototype.error = function (err) {
-        err = err instanceof Error ? err : new Error(err.toString());
         logger.info(this, 'session.error()');
-        this.endConversation(this.options.dialogErrorMessage || 'Oops. Something went wrong and we need to start over.');
+        if (this.options.dialogErrorMessage) {
+            this.endConversation(this.options.dialogErrorMessage);
+        }
+        else {
+            var locale = this.preferredLocale();
+            this.endConversation(this.localizer.gettext(locale, 'default_error', consts.Library.system));
+        }
+        var m = err.toString();
+        err = err instanceof Error ? err : new Error(m);
         this.emit('error', err);
         return this;
     };
     Session.prototype.preferredLocale = function (locale, callback) {
         if (locale) {
             this._locale = locale;
+            if (this.userData) {
+                this.userData[consts.Data.PreferredLocale] = locale;
+            }
             if (this.localizer) {
                 this.localizer.load(locale, callback);
             }
         }
-        else {
-            if (!this._locale) {
-                if (this.message && this.message.textLocale) {
-                    this._locale = this.message.textLocale;
-                }
-                else if (this.localizer) {
-                    this._locale = this.localizer.defaultLocale();
-                }
+        else if (!this._locale) {
+            if (this.userData && this.userData[consts.Data.PreferredLocale]) {
+                this._locale = this.userData[consts.Data.PreferredLocale];
+            }
+            else if (this.message && this.message.textLocale) {
+                this._locale = this.message.textLocale;
+            }
+            else if (this.localizer) {
+                this._locale = this.localizer.defaultLocale();
             }
-            return this._locale;
         }
+        return this._locale;
     };
     Session.prototype.gettext = function (messageid) {
         var args = [];
@@ -158,7 +169,7 @@ var Session = (function (_super) {
         this.prepareMessage(m);
         this.batch.push(m);
         logger.info(this, 'session.sendTyping()');
-        this.startBatch();
+        this.sendBatch();
         return this;
     };
     Session.prototype.messageSent = function () {
@@ -358,6 +369,9 @@ var Session = (function (_super) {
                     if (_this.batchStarted) {
                         _this.startBatch();
                     }
+                    if (callback) {
+                        callback(err);
+                    }
                 }
             }
             else {

Node/core/lib/botbuilder.d.ts

@@ -335,29 +335,29 @@ export interface ILocalizer {
 
     /**
      * Loads a localized string for the specified language.
-     * @param language Desired language of the string to return.
+     * @param locale Desired locale of the string to return.
      * @param msgid String to use as a key in the localized string table. Typically this will just be the english version of the string.
      * @param namespace (Optional) namespace for the msgid keys.
      */
-    trygettext(language: string, msgid: string, namespace?: string): string;
+    trygettext(locale: string, msgid: string, namespace?: string): string;
 
     /**
      * Loads a localized string for the specified language.
-     * @param language Desired language of the string to return.
+     * @param locale Desired locale of the string to return.
      * @param msgid String to use as a key in the localized string table. Typically this will just be the english version of the string.
      * @param namespace (Optional) namespace for the msgid keys.
      */
-    gettext(language: string, msgid: string, namespace?: string): string;
+    gettext(locale: string, msgid: string, namespace?: string): string;
 
     /**
      * Loads the plural form of a localized string for the specified language.
-     * @param language Desired language of the string to return.
+     * @param locale Desired locale of the string to return.
      * @param msgid Singular form of the string to use as a key in the localized string table.
      * @param msgid_plural Plural form of the string to use as a key in the localized string table.
      * @param count Count to use when determining whether the singular or plural form of the string should be used.
      * @param namespace (Optional) namespace for the msgid and msgid_plural keys.
      */
-    ngettext(language: string, msgid: string, msgid_plural: string, count: number, namespace?: string): string;
+    ngettext(locale: string, msgid: string, msgid_plural: string, count: number, namespace?: string): string;
 }
 
 /** Persisted session state used to track a conversations dialog stack. */
@@ -1435,7 +1435,7 @@ export class ThumbnailCard implements IIsAttachment {
     toAttachment(): IAttachment;
 }
 
-/** Card builder class that simplifies building hero cards. Hero cards contain the same information as a thumbnail card, just with a larger more pronounced layout for the cards imagess. */
+/** Card builder class that simplifies building hero cards. Hero cards contain the same information as a thumbnail card, just with a larger more pronounced layout for the cards images. */
 export class HeroCard extends ThumbnailCard {
 
     /** 
@@ -1964,6 +1964,12 @@ export class IntentDialog extends Dialog {
      * @param dialogArgs (Optional) arguments to pass the dialog that started when `dialogId` is a _{string}_.
      */
     onDefault(dialogId: string|IDialogWaterfallStep[]|IDialogWaterfallStep, dialogArgs?: any): IntentDialog;
+
+    /**
+     * Adds a new recognizer plugin to the intent dialog.
+     * @param plugin The recognizer to add. 
+     */
+    recognizer(plugin: IIntentRecognizer): IntentDialog;
 }
 
 /**
@@ -2370,4 +2376,4 @@ export class BotConnectorBot extends Dialog {
 /** __DEPRECATED__ use [UniversalBot](/en-us/node/builder/chat-reference/classes/_botbuilder_d_.universalbot) and a [ConsoleConnector](/en-us/node/builder/chat-reference/classes/_botbuilder_d_.consoleconnector) instead. */
 export class TextBot extends Dialog {
     replyReceived(session: Session, recognizeResult?: IRecognizeResult): void;
-}
+}

Node/core/lib/botbuilder.js

@@ -19,6 +19,7 @@ var img = require('./cards/CardImage');
 var rc = require('./cards/ReceiptCard');
 var signin = require('./cards/SigninCard');
 var thumb = require('./cards/ThumbnailCard');
+var kb = require('./cards/Keyboard');
 var middleware = require('./middleware/Middleware');
 exports.Session = ses.Session;
 exports.Message = msg.Message;
@@ -32,6 +33,7 @@ exports.ReceiptItem = rc.ReceiptItem;
 exports.Fact = rc.Fact;
 exports.SigninCard = signin.SigninCard;
 exports.ThumbnailCard = thumb.ThumbnailCard;
+exports.Keyboard = kb.Keyboard;
 exports.Dialog = dialog.Dialog;
 exports.ResumeReason = dialog.ResumeReason;
 exports.DialogAction = actions.DialogAction;

Node/core/lib/bots/ChatConnector.js

@@ -36,11 +36,12 @@ var ChatConnector = (function () {
                 _this.verifyBotFramework(req, res);
             }
             else {
-                var requestData = [];
+                var requestData = '';
                 req.on('data', function (chunk) {
-                    requestData.push(chunk)
-                }).on('end', function () {
-                    req.body = Buffer.concat(body).toString();
+                    requestData += chunk;
+                });
+                req.on('end', function () {
+                    req.body = JSON.parse(requestData);
                     _this.verifyBotFramework(req, res);
                 });
             }
@@ -243,7 +244,8 @@ var ChatConnector = (function () {
                     callback(null, data);
                 }
                 else {
-                    callback(err instanceof Error ? err : new Error(err.toString()), null);
+                    var m = err.toString();
+                    callback(err instanceof Error ? err : new Error(m), null);
                 }
             });
         }
@@ -322,7 +324,8 @@ var ChatConnector = (function () {
                         callback(null);
                     }
                     else {
-                        callback(err instanceof Error ? err : new Error(err.toString()));
+                        var m = err.toString();
+                        callback(err instanceof Error ? err : new Error(m));
                     }
                 }
             });

Node/core/lib/bots/ConsoleConnector.js

@@ -40,7 +40,7 @@ var ConsoleConnector = (function () {
     ConsoleConnector.prototype.onEvent = function (handler) {
         this.handler = handler;
     };
-    ConsoleConnector.prototype.send = function (messages, cb) {
+    ConsoleConnector.prototype.send = function (messages, done) {
         for (var i = 0; i < messages.length; i++) {
             if (this.replyCnt++ > 0) {
                 console.log();
@@ -58,6 +58,7 @@ var ConsoleConnector = (function () {
                 }
             }
         }
+        done(null);
     };
     ConsoleConnector.prototype.startConversation = function (address, cb) {
         var adr = utils.clone(address);

Node/core/lib/bots/Library.js

@@ -43,7 +43,7 @@ var Library = (function () {
                 l = this.libraries[lib];
             }
             else {
-                for (name in this.libraries) {
+                for (var name in this.libraries) {
                     l = this.libraries[name].library(lib);
                     if (l) {
                         break;

Node/core/lib/bots/UniversalBot.js

@@ -37,12 +37,6 @@ var UniversalBot = (function (_super) {
         }
         if (connector) {
             this.connector(consts.defaultConnector, connector);
-            var asStorage = connector;
-            if (!this.settings.storage &&
-                typeof asStorage.getData === 'function' &&
-                typeof asStorage.saveData === 'function') {
-                this.settings.storage = asStorage;
-            }
         }
     }
     UniversalBot.prototype.set = function (name, value) {
@@ -58,6 +52,12 @@ var UniversalBot = (function (_super) {
         if (connector) {
             this.connectors[channelId || consts.defaultConnector] = c = connector;
             c.onEvent(function (events, cb) { return _this.receive(events, cb); });
+            var asStorage = connector;
+            if (!this.settings.storage &&
+                typeof asStorage.getData === 'function' &&
+                typeof asStorage.saveData === 'function') {
+                this.settings.storage = asStorage;
+            }
         }
         else if (this.connectors.hasOwnProperty(channelId)) {
             c = this.connectors[channelId];
@@ -199,7 +199,7 @@ var UniversalBot = (function (_super) {
                 }, _this.errorLogger(done));
             }
             else if (done) {
-                done;
+                done(null);
             }
         }));
     };
@@ -393,7 +393,8 @@ var UniversalBot = (function (_super) {
         };
     };
     UniversalBot.prototype.emitError = function (err) {
-        var e = err instanceof Error ? err : new Error(err.toString());
+        var m = err.toString();
+        var e = err instanceof Error ? err : new Error(m);
         if (this.listenerCount('error') > 0) {
             this.emit('error', e);
         }

Node/core/lib/consts.js

@@ -20,7 +20,8 @@ exports.Data = {
     WaterfallStep: 'BotBuilder.Data.WaterfallStep',
     Form: 'BotBuilder.Data.Form',
     Field: 'BotBuilder.Data.Field',
-    FirstRunVersion: 'BotBuilder.Data.FirstRunVersion'
+    FirstRunVersion: 'BotBuilder.Data.FirstRunVersion',
+    PreferredLocale: 'BotBuilder.Data.PreferredLocale'
 };
 exports.DialogId = {
     Prompts: 'BotBuilder:Prompts',

Node/core/lib/dialogs/DialogAction.js

@@ -126,7 +126,7 @@ function waterfall(steps) {
         }
         else if (steps && steps.length > 0) {
             try {
-                logger.info(s, 'waterfall() step %d of %d', 0, steps.length);
+                logger.info(s, 'waterfall() step %d of %d', 1, steps.length);
                 s.dialogData[consts.Data.WaterfallStep] = 0;
                 steps[0](s, r, skip);
             }