botframework-webchat-core - npm Package Compare versions

Comparing version 4.2.1-master.b34fa87 to 4.2.1-master.bd3c22c

lib/actions/setSendTyping.js

@@ -8,2 +8,3 @@ "use strict";
 exports.SET_SEND_TYPING = void 0;
+// TODO: [P3] Take this deprecation code out when releasing on or after 2020 January 13
 var SET_SEND_TYPING = 'WEB_CHAT/SET_SEND_TYPING';
@@ -13,2 +14,3 @@ exports.SET_SEND_TYPING = SET_SEND_TYPING;
 function _default(value) {
+  // Deprecation notes added to reducer
   return {
@@ -21,2 +23,2 @@ type: SET_SEND_TYPING,
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3NldFNlbmRUeXBpbmcuanMiXSwibmFtZXMiOlsiU0VUX1NFTkRfVFlQSU5HIiwidmFsdWUiLCJ0eXBlIiwicGF5bG9hZCIsInNlbmRUeXBpbmciXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQSxJQUFNQSxlQUFlLEdBQUcsMEJBQXhCOzs7QUFFZSxrQkFBVUMsS0FBVixFQUFpQjtBQUM5QixTQUFPO0FBQ0xDLElBQUFBLElBQUksRUFBRUYsZUFERDtBQUVMRyxJQUFBQSxPQUFPLEVBQUU7QUFBRUMsTUFBQUEsVUFBVSxFQUFFLENBQUMsQ0FBQ0g7QUFBaEI7QUFGSixHQUFQO0FBSUQiLCJzb3VyY2VzQ29udGVudCI6WyJjb25zdCBTRVRfU0VORF9UWVBJTkcgPSAnV0VCX0NIQVQvU0VUX1NFTkRfVFlQSU5HJztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gKHZhbHVlKSB7XG4gIHJldHVybiB7XG4gICAgdHlwZTogU0VUX1NFTkRfVFlQSU5HLFxuICAgIHBheWxvYWQ6IHsgc2VuZFR5cGluZzogISF2YWx1ZSB9XG4gIH07XG59XG5cbmV4cG9ydCB7IFNFVF9TRU5EX1RZUElORyB9XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3NldFNlbmRUeXBpbmcuanMiXSwibmFtZXMiOlsiU0VUX1NFTkRfVFlQSU5HIiwidmFsdWUiLCJ0eXBlIiwicGF5bG9hZCIsInNlbmRUeXBpbmciXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQTtBQUNBLElBQU1BLGVBQWUsR0FBRywwQkFBeEI7OztBQUVlLGtCQUFVQyxLQUFWLEVBQWlCO0FBQzlCO0FBQ0EsU0FBTztBQUNMQyxJQUFBQSxJQUFJLEVBQUVGLGVBREQ7QUFFTEcsSUFBQUEsT0FBTyxFQUFFO0FBQUVDLE1BQUFBLFVBQVUsRUFBRSxDQUFDLENBQUNIO0FBQWhCO0FBRkosR0FBUDtBQUlEIiwic291cmNlc0NvbnRlbnQiOlsiLy8gVE9ETzogW1AzXSBUYWtlIHRoaXMgZGVwcmVjYXRpb24gY29kZSBvdXQgd2hlbiByZWxlYXNpbmcgb24gb3IgYWZ0ZXIgMjAyMCBKYW51YXJ5IDEzXG5jb25zdCBTRVRfU0VORF9UWVBJTkcgPSAnV0VCX0NIQVQvU0VUX1NFTkRfVFlQSU5HJztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gKHZhbHVlKSB7XG4gIC8vIERlcHJlY2F0aW9uIG5vdGVzIGFkZGVkIHRvIHJlZHVjZXJcbiAgcmV0dXJuIHtcbiAgICB0eXBlOiBTRVRfU0VORF9UWVBJTkcsXG4gICAgcGF5bG9hZDogeyBzZW5kVHlwaW5nOiAhIXZhbHVlIH1cbiAgfTtcbn1cblxuZXhwb3J0IHsgU0VUX1NFTkRfVFlQSU5HIH1cbiJdfQ==

lib/index.js

@@ -106,2 +106,8 @@ "use strict";
 });
+Object.defineProperty(exports, "setSendTypingIndicator", {
+  enumerable: true,
+  get: function get() {
+    return _setSendTypingIndicator.default;
+  }
+});
 Object.defineProperty(exports, "startDictate", {
@@ -171,2 +177,4 @@ enumerable: true,
 
+var _setSendTypingIndicator = _interopRequireDefault(require("./actions/setSendTypingIndicator"));
+
 var _startDictate = _interopRequireDefault(require("./actions/startDictate"));
@@ -191,4 +199,4 @@
 exports.Constants = Constants;
-var version = "4.2.1-master.b34fa87";
+var version = "4.2.1-master.bd3c22c";
 exports.version = version;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJuYW1lcyI6WyJDb25zdGFudHMiLCJBY3Rpdml0eUNsaWVudFN0YXRlIiwiRGljdGF0ZVN0YXRlIiwidmVyc2lvbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFFQTs7QUFDQTs7QUFFQSxJQUFNQSxTQUFTLEdBQUc7QUFBRUMsRUFBQUEsbUJBQW1CLEVBQW5CQSxtQkFBRjtBQUF1QkMsRUFBQUEsWUFBWSxFQUFaQTtBQUF2QixDQUFsQjs7QUFDQSxJQUFNQyxPQUFPLHlCQUFiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IGNvbm5lY3QgZnJvbSAnLi9hY3Rpb25zL2Nvbm5lY3QnO1xuaW1wb3J0IGNyZWF0ZVN0b3JlIGZyb20gJy4vY3JlYXRlU3RvcmUnO1xuaW1wb3J0IGRpc2Nvbm5lY3QgZnJvbSAnLi9hY3Rpb25zL2Rpc2Nvbm5lY3QnO1xuaW1wb3J0IG1hcmtBY3Rpdml0eSBmcm9tICcuL2FjdGlvbnMvbWFya0FjdGl2aXR5JztcbmltcG9ydCBwb3N0QWN0aXZpdHkgZnJvbSAnLi9hY3Rpb25zL3Bvc3RBY3Rpdml0eSc7XG5pbXBvcnQgc2VuZEV2ZW50IGZyb20gJy4vYWN0aW9ucy9zZW5kRXZlbnQnO1xuaW1wb3J0IHNlbmRGaWxlcyBmcm9tICcuL2FjdGlvbnMvc2VuZEZpbGVzJztcbmltcG9ydCBzZW5kTWVzc2FnZSBmcm9tICcuL2FjdGlvbnMvc2VuZE1lc3NhZ2UnO1xuaW1wb3J0IHNlbmRNZXNzYWdlQmFjayBmcm9tICcuL2FjdGlvbnMvc2VuZE1lc3NhZ2VCYWNrJztcbmltcG9ydCBzZW5kUG9zdEJhY2sgZnJvbSAnLi9hY3Rpb25zL3NlbmRQb3N0QmFjayc7XG5pbXBvcnQgc2V0RGljdGF0ZUludGVyaW1zIGZyb20gJy4vYWN0aW9ucy9zZXREaWN0YXRlSW50ZXJpbXMnO1xuaW1wb3J0IHNldERpY3RhdGVTdGF0ZSBmcm9tICcuL2FjdGlvbnMvc2V0RGljdGF0ZVN0YXRlJztcbmltcG9ydCBzZXRMYW5ndWFnZSBmcm9tICcuL2FjdGlvbnMvc2V0TGFuZ3VhZ2UnO1xuaW1wb3J0IHNldFNlbmRCb3ggZnJvbSAnLi9hY3Rpb25zL3NldFNlbmRCb3gnO1xuaW1wb3J0IHNldFNlbmRUaW1lb3V0IGZyb20gJy4vYWN0aW9ucy9zZXRTZW5kVGltZW91dCc7XG5pbXBvcnQgc2V0U2VuZFR5cGluZyBmcm9tICcuL2FjdGlvbnMvc2V0U2VuZFR5cGluZyc7XG5pbXBvcnQgc3RhcnREaWN0YXRlIGZyb20gJy4vYWN0aW9ucy9zdGFydERpY3RhdGUnO1xuaW1wb3J0IHN0YXJ0U3BlYWtpbmdBY3Rpdml0eSBmcm9tICcuL2FjdGlvbnMvc3RhcnRTcGVha2luZ0FjdGl2aXR5JztcbmltcG9ydCBzdG9wRGljdGF0ZSBmcm9tICcuL2FjdGlvbnMvc3RvcERpY3RhdGUnO1xuaW1wb3J0IHN0b3BTcGVha2luZ0FjdGl2aXR5IGZyb20gJy4vYWN0aW9ucy9zdG9wU3BlYWtpbmdBY3Rpdml0eSc7XG5pbXBvcnQgc3VibWl0U2VuZEJveCBmcm9tICcuL2FjdGlvbnMvc3VibWl0U2VuZEJveCc7XG5cbmltcG9ydCAqIGFzIEFjdGl2aXR5Q2xpZW50U3RhdGUgZnJvbSAnLi9jb25zdGFudHMvQWN0aXZpdHlDbGllbnRTdGF0ZSc7XG5pbXBvcnQgKiBhcyBEaWN0YXRlU3RhdGUgZnJvbSAnLi9jb25zdGFudHMvRGljdGF0ZVN0YXRlJztcblxuY29uc3QgQ29uc3RhbnRzID0geyBBY3Rpdml0eUNsaWVudFN0YXRlLCBEaWN0YXRlU3RhdGUgfTtcbmNvbnN0IHZlcnNpb24gPSBWRVJTSU9OO1xuXG5leHBvcnQge1xuICBjb25uZWN0LFxuICBDb25zdGFudHMsXG4gIGNyZWF0ZVN0b3JlLFxuICBkaXNjb25uZWN0LFxuICBtYXJrQWN0aXZpdHksXG4gIHBvc3RBY3Rpdml0eSxcbiAgc2VuZEV2ZW50LFxuICBzZW5kRmlsZXMsXG4gIHNlbmRNZXNzYWdlLFxuICBzZW5kTWVzc2FnZUJhY2ssXG4gIHNlbmRQb3N0QmFjayxcbiAgc2V0RGljdGF0ZUludGVyaW1zLFxuICBzZXREaWN0YXRlU3RhdGUsXG4gIHNldExhbmd1YWdlLFxuICBzZXRTZW5kQm94LFxuICBzZXRTZW5kVGltZW91dCxcbiAgc2V0U2VuZFR5cGluZyxcbiAgc3RhcnREaWN0YXRlLFxuICBzdGFydFNwZWFraW5nQWN0aXZpdHksXG4gIHN0b3BEaWN0YXRlLFxuICBzdG9wU3BlYWtpbmdBY3Rpdml0eSxcbiAgc3VibWl0U2VuZEJveCxcbiAgdmVyc2lvblxufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJuYW1lcyI6WyJDb25zdGFudHMiLCJBY3Rpdml0eUNsaWVudFN0YXRlIiwiRGljdGF0ZVN0YXRlIiwidmVyc2lvbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFFQTs7QUFDQTs7QUFFQSxJQUFNQSxTQUFTLEdBQUc7QUFBRUMsRUFBQUEsbUJBQW1CLEVBQW5CQSxtQkFBRjtBQUF1QkMsRUFBQUEsWUFBWSxFQUFaQTtBQUF2QixDQUFsQjs7QUFDQSxJQUFNQyxPQUFPLHlCQUFiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IGNvbm5lY3QgZnJvbSAnLi9hY3Rpb25zL2Nvbm5lY3QnO1xuaW1wb3J0IGNyZWF0ZVN0b3JlIGZyb20gJy4vY3JlYXRlU3RvcmUnO1xuaW1wb3J0IGRpc2Nvbm5lY3QgZnJvbSAnLi9hY3Rpb25zL2Rpc2Nvbm5lY3QnO1xuaW1wb3J0IG1hcmtBY3Rpdml0eSBmcm9tICcuL2FjdGlvbnMvbWFya0FjdGl2aXR5JztcbmltcG9ydCBwb3N0QWN0aXZpdHkgZnJvbSAnLi9hY3Rpb25zL3Bvc3RBY3Rpdml0eSc7XG5pbXBvcnQgc2VuZEV2ZW50IGZyb20gJy4vYWN0aW9ucy9zZW5kRXZlbnQnO1xuaW1wb3J0IHNlbmRGaWxlcyBmcm9tICcuL2FjdGlvbnMvc2VuZEZpbGVzJztcbmltcG9ydCBzZW5kTWVzc2FnZSBmcm9tICcuL2FjdGlvbnMvc2VuZE1lc3NhZ2UnO1xuaW1wb3J0IHNlbmRNZXNzYWdlQmFjayBmcm9tICcuL2FjdGlvbnMvc2VuZE1lc3NhZ2VCYWNrJztcbmltcG9ydCBzZW5kUG9zdEJhY2sgZnJvbSAnLi9hY3Rpb25zL3NlbmRQb3N0QmFjayc7XG5pbXBvcnQgc2V0RGljdGF0ZUludGVyaW1zIGZyb20gJy4vYWN0aW9ucy9zZXREaWN0YXRlSW50ZXJpbXMnO1xuaW1wb3J0IHNldERpY3RhdGVTdGF0ZSBmcm9tICcuL2FjdGlvbnMvc2V0RGljdGF0ZVN0YXRlJztcbmltcG9ydCBzZXRMYW5ndWFnZSBmcm9tICcuL2FjdGlvbnMvc2V0TGFuZ3VhZ2UnO1xuaW1wb3J0IHNldFNlbmRCb3ggZnJvbSAnLi9hY3Rpb25zL3NldFNlbmRCb3gnO1xuaW1wb3J0IHNldFNlbmRUaW1lb3V0IGZyb20gJy4vYWN0aW9ucy9zZXRTZW5kVGltZW91dCc7XG5pbXBvcnQgc2V0U2VuZFR5cGluZyBmcm9tICcuL2FjdGlvbnMvc2V0U2VuZFR5cGluZyc7XG5pbXBvcnQgc2V0U2VuZFR5cGluZ0luZGljYXRvciBmcm9tICcuL2FjdGlvbnMvc2V0U2VuZFR5cGluZ0luZGljYXRvcic7XG5pbXBvcnQgc3RhcnREaWN0YXRlIGZyb20gJy4vYWN0aW9ucy9zdGFydERpY3RhdGUnO1xuaW1wb3J0IHN0YXJ0U3BlYWtpbmdBY3Rpdml0eSBmcm9tICcuL2FjdGlvbnMvc3RhcnRTcGVha2luZ0FjdGl2aXR5JztcbmltcG9ydCBzdG9wRGljdGF0ZSBmcm9tICcuL2FjdGlvbnMvc3RvcERpY3RhdGUnO1xuaW1wb3J0IHN0b3BTcGVha2luZ0FjdGl2aXR5IGZyb20gJy4vYWN0aW9ucy9zdG9wU3BlYWtpbmdBY3Rpdml0eSc7XG5pbXBvcnQgc3VibWl0U2VuZEJveCBmcm9tICcuL2FjdGlvbnMvc3VibWl0U2VuZEJveCc7XG5cbmltcG9ydCAqIGFzIEFjdGl2aXR5Q2xpZW50U3RhdGUgZnJvbSAnLi9jb25zdGFudHMvQWN0aXZpdHlDbGllbnRTdGF0ZSc7XG5pbXBvcnQgKiBhcyBEaWN0YXRlU3RhdGUgZnJvbSAnLi9jb25zdGFudHMvRGljdGF0ZVN0YXRlJztcblxuY29uc3QgQ29uc3RhbnRzID0geyBBY3Rpdml0eUNsaWVudFN0YXRlLCBEaWN0YXRlU3RhdGUgfTtcbmNvbnN0IHZlcnNpb24gPSBWRVJTSU9OO1xuXG5leHBvcnQge1xuICBjb25uZWN0LFxuICBDb25zdGFudHMsXG4gIGNyZWF0ZVN0b3JlLFxuICBkaXNjb25uZWN0LFxuICBtYXJrQWN0aXZpdHksXG4gIHBvc3RBY3Rpdml0eSxcbiAgc2VuZEV2ZW50LFxuICBzZW5kRmlsZXMsXG4gIHNlbmRNZXNzYWdlLFxuICBzZW5kTWVzc2FnZUJhY2ssXG4gIHNlbmRQb3N0QmFjayxcbiAgc2V0RGljdGF0ZUludGVyaW1zLFxuICBzZXREaWN0YXRlU3RhdGUsXG4gIHNldExhbmd1YWdlLFxuICBzZXRTZW5kQm94LFxuICBzZXRTZW5kVGltZW91dCxcbiAgc2V0U2VuZFR5cGluZ0luZGljYXRvcixcbiAgc3RhcnREaWN0YXRlLFxuICBzdGFydFNwZWFraW5nQWN0aXZpdHksXG4gIHN0b3BEaWN0YXRlLFxuICBzdG9wU3BlYWtpbmdBY3Rpdml0eSxcbiAgc3VibWl0U2VuZEJveCxcbiAgdmVyc2lvbixcblxuICAvLyBUT0RPOiBbUDNdIFRha2UgdGhpcyBkZXByZWNhdGlvbiBjb2RlIG91dCB3aGVuIHJlbGVhc2luZyBvbiBvciBhZnRlciBKYW51YXJ5IDEzIDIwMjAgXG4gIHNldFNlbmRUeXBpbmdcbn1cbiJdfQ==

lib/reducer.d.ts

@@ -10,5 +10,6 @@ declare const _default: import("redux").Reducer<{
     sendTimeout: {};
+    sendTypingIndicator: {};
+    suggestedActions: {};
     sendTyping: {};
-    suggestedActions: {};
 }, import("redux").AnyAction>;
 export default _default;

lib/reducer.js

@@ -28,3 +28,3 @@ "use strict";
 
-var _sendTyping = _interopRequireDefault(require("./reducers/sendTyping"));
+var _sendTypingIndicator = _interopRequireDefault(require("./reducers/sendTypingIndicator"));
 
@@ -42,7 +42,9 @@ var _suggestedActions = _interopRequireDefault(require("./reducers/suggestedActions"));
   sendTimeout: _sendTimeout.default,
-  sendTyping: _sendTyping.default,
-  suggestedActions: _suggestedActions.default
+  sendTypingIndicator: _sendTypingIndicator.default,
+  suggestedActions: _suggestedActions.default,
+  // TODO: [P3] Take this deprecation code out when releasing on or after January 13 2020
+  sendTyping: _sendTypingIndicator.default
 });
 
 exports.default = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZWR1Y2VyLnRzIl0sIm5hbWVzIjpbImFjdGl2aXRpZXMiLCJkaWN0YXRlSW50ZXJpbXMiLCJkaWN0YXRlU3RhdGUiLCJsYW5ndWFnZSIsInJlYWR5U3RhdGUiLCJyZWZlcmVuY2VHcmFtbWFySUQiLCJzZW5kQm94VmFsdWUiLCJzZW5kVGltZW91dCIsInNlbmRUeXBpbmciLCJzdWdnZXN0ZWRBY3Rpb25zIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFFQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7ZUFFZSw0QkFBZ0I7QUFDN0JBLEVBQUFBLFVBQVUsRUFBVkEsbUJBRDZCO0FBRTdCQyxFQUFBQSxlQUFlLEVBQWZBLHdCQUY2QjtBQUc3QkMsRUFBQUEsWUFBWSxFQUFaQSxxQkFINkI7QUFJN0JDLEVBQUFBLFFBQVEsRUFBUkEsaUJBSjZCO0FBSzdCQyxFQUFBQSxVQUFVLEVBQVZBLG1CQUw2QjtBQU03QkMsRUFBQUEsa0JBQWtCLEVBQWxCQSwyQkFONkI7QUFPN0JDLEVBQUFBLFlBQVksRUFBWkEscUJBUDZCO0FBUTdCQyxFQUFBQSxXQUFXLEVBQVhBLG9CQVI2QjtBQVM3QkMsRUFBQUEsVUFBVSxFQUFWQSxtQkFUNkI7QUFVN0JDLEVBQUFBLGdCQUFnQixFQUFoQkE7QUFWNkIsQ0FBaEIsQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGNvbWJpbmVSZWR1Y2VycyB9IGZyb20gJ3JlZHV4JztcblxuaW1wb3J0IGFjdGl2aXRpZXMgZnJvbSAnLi9yZWR1Y2Vycy9hY3Rpdml0aWVzJztcbmltcG9ydCBkaWN0YXRlSW50ZXJpbXMgZnJvbSAnLi9yZWR1Y2Vycy9kaWN0YXRlSW50ZXJpbXMnO1xuaW1wb3J0IGRpY3RhdGVTdGF0ZSBmcm9tICcuL3JlZHVjZXJzL2RpY3RhdGVTdGF0ZSc7XG5pbXBvcnQgbGFuZ3VhZ2UgZnJvbSAnLi9yZWR1Y2Vycy9sYW5ndWFnZSc7XG5pbXBvcnQgcmVhZHlTdGF0ZSBmcm9tICcuL3JlZHVjZXJzL3JlYWR5U3RhdGUnO1xuaW1wb3J0IHJlZmVyZW5jZUdyYW1tYXJJRCBmcm9tICcuL3JlZHVjZXJzL3JlZmVyZW5jZUdyYW1tYXJJRCc7XG5pbXBvcnQgc2VuZEJveFZhbHVlIGZyb20gJy4vcmVkdWNlcnMvc2VuZEJveFZhbHVlJztcbmltcG9ydCBzZW5kVGltZW91dCBmcm9tICcuL3JlZHVjZXJzL3NlbmRUaW1lb3V0JztcbmltcG9ydCBzZW5kVHlwaW5nIGZyb20gJy4vcmVkdWNlcnMvc2VuZFR5cGluZyc7XG5pbXBvcnQgc3VnZ2VzdGVkQWN0aW9ucyBmcm9tICcuL3JlZHVjZXJzL3N1Z2dlc3RlZEFjdGlvbnMnO1xuXG5leHBvcnQgZGVmYXVsdCBjb21iaW5lUmVkdWNlcnMoe1xuICBhY3Rpdml0aWVzLFxuICBkaWN0YXRlSW50ZXJpbXMsXG4gIGRpY3RhdGVTdGF0ZSxcbiAgbGFuZ3VhZ2UsXG4gIHJlYWR5U3RhdGUsXG4gIHJlZmVyZW5jZUdyYW1tYXJJRCxcbiAgc2VuZEJveFZhbHVlLFxuICBzZW5kVGltZW91dCxcbiAgc2VuZFR5cGluZyxcbiAgc3VnZ2VzdGVkQWN0aW9uc1xufSlcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZWR1Y2VyLnRzIl0sIm5hbWVzIjpbImFjdGl2aXRpZXMiLCJkaWN0YXRlSW50ZXJpbXMiLCJkaWN0YXRlU3RhdGUiLCJsYW5ndWFnZSIsInJlYWR5U3RhdGUiLCJyZWZlcmVuY2VHcmFtbWFySUQiLCJzZW5kQm94VmFsdWUiLCJzZW5kVGltZW91dCIsInNlbmRUeXBpbmdJbmRpY2F0b3IiLCJzdWdnZXN0ZWRBY3Rpb25zIiwic2VuZFR5cGluZyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUE7O0FBRUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O2VBRWUsNEJBQWdCO0FBQzdCQSxFQUFBQSxVQUFVLEVBQVZBLG1CQUQ2QjtBQUU3QkMsRUFBQUEsZUFBZSxFQUFmQSx3QkFGNkI7QUFHN0JDLEVBQUFBLFlBQVksRUFBWkEscUJBSDZCO0FBSTdCQyxFQUFBQSxRQUFRLEVBQVJBLGlCQUo2QjtBQUs3QkMsRUFBQUEsVUFBVSxFQUFWQSxtQkFMNkI7QUFNN0JDLEVBQUFBLGtCQUFrQixFQUFsQkEsMkJBTjZCO0FBTzdCQyxFQUFBQSxZQUFZLEVBQVpBLHFCQVA2QjtBQVE3QkMsRUFBQUEsV0FBVyxFQUFYQSxvQkFSNkI7QUFTN0JDLEVBQUFBLG1CQUFtQixFQUFuQkEsNEJBVDZCO0FBVTdCQyxFQUFBQSxnQkFBZ0IsRUFBaEJBLHlCQVY2QjtBQVk3QjtBQUNBQyxFQUFBQSxVQUFVLEVBQUVGO0FBYmlCLENBQWhCLEMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjb21iaW5lUmVkdWNlcnMgfSBmcm9tICdyZWR1eCc7XG5cbmltcG9ydCBhY3Rpdml0aWVzIGZyb20gJy4vcmVkdWNlcnMvYWN0aXZpdGllcyc7XG5pbXBvcnQgZGljdGF0ZUludGVyaW1zIGZyb20gJy4vcmVkdWNlcnMvZGljdGF0ZUludGVyaW1zJztcbmltcG9ydCBkaWN0YXRlU3RhdGUgZnJvbSAnLi9yZWR1Y2Vycy9kaWN0YXRlU3RhdGUnO1xuaW1wb3J0IGxhbmd1YWdlIGZyb20gJy4vcmVkdWNlcnMvbGFuZ3VhZ2UnO1xuaW1wb3J0IHJlYWR5U3RhdGUgZnJvbSAnLi9yZWR1Y2Vycy9yZWFkeVN0YXRlJztcbmltcG9ydCByZWZlcmVuY2VHcmFtbWFySUQgZnJvbSAnLi9yZWR1Y2Vycy9yZWZlcmVuY2VHcmFtbWFySUQnO1xuaW1wb3J0IHNlbmRCb3hWYWx1ZSBmcm9tICcuL3JlZHVjZXJzL3NlbmRCb3hWYWx1ZSc7XG5pbXBvcnQgc2VuZFRpbWVvdXQgZnJvbSAnLi9yZWR1Y2Vycy9zZW5kVGltZW91dCc7XG5pbXBvcnQgc2VuZFR5cGluZ0luZGljYXRvciBmcm9tICcuL3JlZHVjZXJzL3NlbmRUeXBpbmdJbmRpY2F0b3InO1xuaW1wb3J0IHN1Z2dlc3RlZEFjdGlvbnMgZnJvbSAnLi9yZWR1Y2Vycy9zdWdnZXN0ZWRBY3Rpb25zJztcblxuZXhwb3J0IGRlZmF1bHQgY29tYmluZVJlZHVjZXJzKHtcbiAgYWN0aXZpdGllcyxcbiAgZGljdGF0ZUludGVyaW1zLFxuICBkaWN0YXRlU3RhdGUsXG4gIGxhbmd1YWdlLFxuICByZWFkeVN0YXRlLFxuICByZWZlcmVuY2VHcmFtbWFySUQsXG4gIHNlbmRCb3hWYWx1ZSxcbiAgc2VuZFRpbWVvdXQsXG4gIHNlbmRUeXBpbmdJbmRpY2F0b3IsXG4gIHN1Z2dlc3RlZEFjdGlvbnMsXG5cbiAgLy8gVE9ETzogW1AzXSBUYWtlIHRoaXMgZGVwcmVjYXRpb24gY29kZSBvdXQgd2hlbiByZWxlYXNpbmcgb24gb3IgYWZ0ZXIgSmFudWFyeSAxMyAyMDIwXG4gIHNlbmRUeXBpbmc6IHNlbmRUeXBpbmdJbmRpY2F0b3Jcbn0pXG4iXX0=

lib/sagas.js

@@ -30,2 +30,4 @@ "use strict";
 
+var _sendConversationUpdateOnConnectSaga = _interopRequireDefault(require("./sagas/sendConversationUpdateOnConnectSaga"));
+
 var _sendEventToPostActivitySaga = _interopRequireDefault(require("./sagas/sendEventToPostActivitySaga"));
@@ -41,3 +43,3 @@
 
-var _sendTypingOnSetSendBoxSaga = _interopRequireDefault(require("./sagas/sendTypingOnSetSendBoxSaga"));
+var _sendTypingIndicatorOnSetSendBoxSaga = _interopRequireDefault(require("./sagas/sendTypingIndicatorOnSetSendBoxSaga"));
 
@@ -96,45 +98,49 @@ var _startDictateAfterSpeakActivitySaga = _interopRequireDefault(require("./sagas/startDictateAfterSpeakActivitySaga"));
           _context.next = 18;
-          return (0, _effects.fork)(_sendEventToPostActivitySaga.default);
+          return (0, _effects.fork)(_sendConversationUpdateOnConnectSaga.default);
 
         case 18:
           _context.next = 20;
-          return (0, _effects.fork)(_sendFilesToPostActivitySaga.default);
+          return (0, _effects.fork)(_sendEventToPostActivitySaga.default);
 
         case 20:
           _context.next = 22;
-          return (0, _effects.fork)(_sendMessageToPostActivitySaga.default);
+          return (0, _effects.fork)(_sendFilesToPostActivitySaga.default);
 
         case 22:
           _context.next = 24;
-          return (0, _effects.fork)(_sendMessageBackToPostActivitySaga.default);
+          return (0, _effects.fork)(_sendMessageToPostActivitySaga.default);
 
         case 24:
           _context.next = 26;
-          return (0, _effects.fork)(_sendPostBackToPostActivitySaga.default);
+          return (0, _effects.fork)(_sendMessageBackToPostActivitySaga.default);
 
         case 26:
           _context.next = 28;
-          return (0, _effects.fork)(_sendTypingOnSetSendBoxSaga.default);
+          return (0, _effects.fork)(_sendPostBackToPostActivitySaga.default);
 
         case 28:
           _context.next = 30;
-          return (0, _effects.fork)(_startDictateAfterSpeakActivitySaga.default);
+          return (0, _effects.fork)(_sendTypingIndicatorOnSetSendBoxSaga.default);
 
         case 30:
           _context.next = 32;
-          return (0, _effects.fork)(_startSpeakActivityOnPostActivitySaga.default);
+          return (0, _effects.fork)(_startDictateAfterSpeakActivitySaga.default);
 
         case 32:
           _context.next = 34;
-          return (0, _effects.fork)(_stopDictateOnCardActionSaga.default);
+          return (0, _effects.fork)(_startSpeakActivityOnPostActivitySaga.default);
 
         case 34:
           _context.next = 36;
-          return (0, _effects.fork)(_stopSpeakingActivityOnInputSaga.default);
+          return (0, _effects.fork)(_stopDictateOnCardActionSaga.default);
 
         case 36:
           _context.next = 38;
+          return (0, _effects.fork)(_stopSpeakingActivityOnInputSaga.default);
+
+        case 38:
+          _context.next = 40;
           return (0, _effects.fork)(_submitSendBoxSaga.default);
 
-        case 38:
+        case 40:
         case "end":
@@ -146,2 +152,2 @@ return _context.stop();
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9zYWdhcy5qcyJdLCJuYW1lcyI6WyJjbGVhclN1Z2dlc3RlZEFjdGlvbnNPblBvc3RBY3Rpdml0eVNhZ2EiLCJjb25uZWN0aW9uU3RhdHVzVXBkYXRlU2FnYSIsImNvbm5lY3RTYWdhIiwiaW5jb21pbmdBY3Rpdml0eVNhZ2EiLCJtYXJrQWN0aXZpdHlGb3JTcGVha09uSW5jb21pbmdBY3Rpdml0eUZyb21PdGhlcnNTYWdhIiwibWFya0FsbEFzU3Bva2VuT25TdG9wU3BlYWtBY3Rpdml0eVNhZ2EiLCJwb3N0QWN0aXZpdHlTYWdhIiwicmVtb3ZlSW5jb21pbmdUeXBpbmdBZnRlckludGVydmFsU2FnYSIsInNlbmRFdmVudFRvUG9zdEFjdGl2aXR5U2FnYSIsInNlbmRGaWxlc1RvUG9zdEFjdGl2aXR5U2FnYSIsInNlbmRNZXNzYWdlVG9Qb3N0QWN0aXZpdHlTYWdhIiwic2VuZE1lc3NhZ2VCYWNrVG9Qb3N0QWN0aXZpdHlTYWdhIiwic2VuZFBvc3RCYWNrVG9Qb3N0QWN0aXZpdHlTYWdhIiwic2VuZFR5cGluZ09uU2V0U2VuZEJveFNhZ2EiLCJzdGFydERpY3RhdGVBZnRlclNwZWFrQWN0aXZpdHlTYWdhIiwic3RhcnRTcGVha0FjdGl2aXR5T25Qb3N0QWN0aXZpdHlTYWdhIiwic3RvcERpY3RhdGVPbkNhcmRBY3Rpb25TYWdhIiwic3RvcFNwZWFraW5nQWN0aXZpdHlPbklucHV0U2FnYSIsInN1Ym1pdFNlbmRCb3hTYWdhIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUVBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOzs7Ozs7QUFFZTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDYixpQkFBTSxtQkFBS0EsZ0RBQUwsQ0FBTjs7QUFEYTtBQUFBO0FBRWIsaUJBQU0sbUJBQUtDLG1DQUFMLENBQU47O0FBRmE7QUFBQTtBQUdiLGlCQUFNLG1CQUFLQyxvQkFBTCxDQUFOOztBQUhhO0FBQUE7QUFJYixpQkFBTSxtQkFBS0MsNkJBQUwsQ0FBTjs7QUFKYTtBQUFBO0FBS2IsaUJBQU0sbUJBQUtDLDZEQUFMLENBQU47O0FBTGE7QUFBQTtBQU1iLGlCQUFNLG1CQUFLQywrQ0FBTCxDQUFOOztBQU5hO0FBQUE7QUFPYixpQkFBTSxtQkFBS0MseUJBQUwsQ0FBTjs7QUFQYTtBQUFBO0FBUWIsaUJBQU0sbUJBQUtDLDhDQUFMLENBQU47O0FBUmE7QUFBQTtBQVNiLGlCQUFNLG1CQUFLQyxvQ0FBTCxDQUFOOztBQVRhO0FBQUE7QUFVYixpQkFBTSxtQkFBS0Msb0NBQUwsQ0FBTjs7QUFWYTtBQUFBO0FBV2IsaUJBQU0sbUJBQUtDLHNDQUFMLENBQU47O0FBWGE7QUFBQTtBQVliLGlCQUFNLG1CQUFLQywwQ0FBTCxDQUFOOztBQVphO0FBQUE7QUFhYixpQkFBTSxtQkFBS0MsdUNBQUwsQ0FBTjs7QUFiYTtBQUFBO0FBY2IsaUJBQU0sbUJBQUtDLG1DQUFMLENBQU47O0FBZGE7QUFBQTtBQWViLGlCQUFNLG1CQUFLQywyQ0FBTCxDQUFOOztBQWZhO0FBQUE7QUFnQmIsaUJBQU0sbUJBQUtDLDZDQUFMLENBQU47O0FBaEJhO0FBQUE7QUFpQmIsaUJBQU0sbUJBQUtDLG9DQUFMLENBQU47O0FBakJhO0FBQUE7QUFrQmIsaUJBQU0sbUJBQUtDLHdDQUFMLENBQU47O0FBbEJhO0FBQUE7QUFtQmIsaUJBQU0sbUJBQUtDLDBCQUFMLENBQU47O0FBbkJhO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZm9yayB9IGZyb20gJ3JlZHV4LXNhZ2EvZWZmZWN0cyc7XG5cbmltcG9ydCBjbGVhclN1Z2dlc3RlZEFjdGlvbnNPblBvc3RBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9jbGVhclN1Z2dlc3RlZEFjdGlvbnNPblBvc3RBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IGNvbm5lY3Rpb25TdGF0dXNVcGRhdGVTYWdhIGZyb20gJy4vc2FnYXMvY29ubmVjdGlvblN0YXR1c1VwZGF0ZVNhZ2EnO1xuaW1wb3J0IGNvbm5lY3RTYWdhIGZyb20gJy4vc2FnYXMvY29ubmVjdFNhZ2EnO1xuaW1wb3J0IGluY29taW5nQWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvaW5jb21pbmdBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IG1hcmtBY3Rpdml0eUZvclNwZWFrT25JbmNvbWluZ0FjdGl2aXR5RnJvbU90aGVyc1NhZ2EgZnJvbSAnLi9zYWdhcy9tYXJrQWN0aXZpdHlGb3JTcGVha09uSW5jb21pbmdBY3Rpdml0eUZyb21PdGhlcnNTYWdhJztcbmltcG9ydCBtYXJrQWxsQXNTcG9rZW5PblN0b3BTcGVha0FjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL21hcmtBbGxBc1Nwb2tlbk9uU3RvcFNwZWFrQWN0aXZpdHlTYWdhJztcbmltcG9ydCBwb3N0QWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvcG9zdEFjdGl2aXR5U2FnYSc7XG5pbXBvcnQgcmVtb3ZlSW5jb21pbmdUeXBpbmdBZnRlckludGVydmFsU2FnYSBmcm9tICcuL3NhZ2FzL3JlbW92ZUluY29taW5nVHlwaW5nQWZ0ZXJJbnRlcnZhbFNhZ2EnO1xuaW1wb3J0IHNlbmRFdmVudFRvUG9zdEFjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL3NlbmRFdmVudFRvUG9zdEFjdGl2aXR5U2FnYSc7XG5pbXBvcnQgc2VuZEZpbGVzVG9Qb3N0QWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvc2VuZEZpbGVzVG9Qb3N0QWN0aXZpdHlTYWdhJztcbmltcG9ydCBzZW5kTWVzc2FnZVRvUG9zdEFjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL3NlbmRNZXNzYWdlVG9Qb3N0QWN0aXZpdHlTYWdhJztcbmltcG9ydCBzZW5kTWVzc2FnZUJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9zZW5kTWVzc2FnZUJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IHNlbmRQb3N0QmFja1RvUG9zdEFjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL3NlbmRQb3N0QmFja1RvUG9zdEFjdGl2aXR5U2FnYSc7XG5pbXBvcnQgc2VuZFR5cGluZ09uU2V0U2VuZEJveFNhZ2EgZnJvbSAnLi9zYWdhcy9zZW5kVHlwaW5nT25TZXRTZW5kQm94U2FnYSc7XG5pbXBvcnQgc3RhcnREaWN0YXRlQWZ0ZXJTcGVha0FjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL3N0YXJ0RGljdGF0ZUFmdGVyU3BlYWtBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IHN0YXJ0U3BlYWtBY3Rpdml0eU9uUG9zdEFjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL3N0YXJ0U3BlYWtBY3Rpdml0eU9uUG9zdEFjdGl2aXR5U2FnYSc7XG5pbXBvcnQgc3RvcERpY3RhdGVPbkNhcmRBY3Rpb25TYWdhIGZyb20gJy4vc2FnYXMvc3RvcERpY3RhdGVPbkNhcmRBY3Rpb25TYWdhJztcbmltcG9ydCBzdG9wU3BlYWtpbmdBY3Rpdml0eU9uSW5wdXRTYWdhIGZyb20gJy4vc2FnYXMvc3RvcFNwZWFraW5nQWN0aXZpdHlPbklucHV0U2FnYSc7XG5pbXBvcnQgc3VibWl0U2VuZEJveFNhZ2EgZnJvbSAnLi9zYWdhcy9zdWJtaXRTZW5kQm94U2FnYSc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKiAoKSB7XG4gIHlpZWxkIGZvcmsoY2xlYXJTdWdnZXN0ZWRBY3Rpb25zT25Qb3N0QWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhjb25uZWN0aW9uU3RhdHVzVXBkYXRlU2FnYSk7XG4gIHlpZWxkIGZvcmsoY29ubmVjdFNhZ2EpO1xuICB5aWVsZCBmb3JrKGluY29taW5nQWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhtYXJrQWN0aXZpdHlGb3JTcGVha09uSW5jb21pbmdBY3Rpdml0eUZyb21PdGhlcnNTYWdhKTtcbiAgeWllbGQgZm9yayhtYXJrQWxsQXNTcG9rZW5PblN0b3BTcGVha0FjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsocG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsocmVtb3ZlSW5jb21pbmdUeXBpbmdBZnRlckludGVydmFsU2FnYSk7XG4gIHlpZWxkIGZvcmsoc2VuZEV2ZW50VG9Qb3N0QWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhzZW5kRmlsZXNUb1Bvc3RBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKHNlbmRNZXNzYWdlVG9Qb3N0QWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhzZW5kTWVzc2FnZUJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKHNlbmRQb3N0QmFja1RvUG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsoc2VuZFR5cGluZ09uU2V0U2VuZEJveFNhZ2EpO1xuICB5aWVsZCBmb3JrKHN0YXJ0RGljdGF0ZUFmdGVyU3BlYWtBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKHN0YXJ0U3BlYWtBY3Rpdml0eU9uUG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsoc3RvcERpY3RhdGVPbkNhcmRBY3Rpb25TYWdhKTtcbiAgeWllbGQgZm9yayhzdG9wU3BlYWtpbmdBY3Rpdml0eU9uSW5wdXRTYWdhKTtcbiAgeWllbGQgZm9yayhzdWJtaXRTZW5kQm94U2FnYSk7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9zYWdhcy5qcyJdLCJuYW1lcyI6WyJjbGVhclN1Z2dlc3RlZEFjdGlvbnNPblBvc3RBY3Rpdml0eVNhZ2EiLCJjb25uZWN0aW9uU3RhdHVzVXBkYXRlU2FnYSIsImNvbm5lY3RTYWdhIiwiaW5jb21pbmdBY3Rpdml0eVNhZ2EiLCJtYXJrQWN0aXZpdHlGb3JTcGVha09uSW5jb21pbmdBY3Rpdml0eUZyb21PdGhlcnNTYWdhIiwibWFya0FsbEFzU3Bva2VuT25TdG9wU3BlYWtBY3Rpdml0eVNhZ2EiLCJwb3N0QWN0aXZpdHlTYWdhIiwicmVtb3ZlSW5jb21pbmdUeXBpbmdBZnRlckludGVydmFsU2FnYSIsInNlbmRDb252ZXJzYXRpb25VcGRhdGVPbkNvbm5lY3RTYWdhIiwic2VuZEV2ZW50VG9Qb3N0QWN0aXZpdHlTYWdhIiwic2VuZEZpbGVzVG9Qb3N0QWN0aXZpdHlTYWdhIiwic2VuZE1lc3NhZ2VUb1Bvc3RBY3Rpdml0eVNhZ2EiLCJzZW5kTWVzc2FnZUJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EiLCJzZW5kUG9zdEJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EiLCJzZW5kVHlwaW5nSW5kaWNhdG9yT25TZXRTZW5kQm94U2FnYSIsInN0YXJ0RGljdGF0ZUFmdGVyU3BlYWtBY3Rpdml0eVNhZ2EiLCJzdGFydFNwZWFrQWN0aXZpdHlPblBvc3RBY3Rpdml0eVNhZ2EiLCJzdG9wRGljdGF0ZU9uQ2FyZEFjdGlvblNhZ2EiLCJzdG9wU3BlYWtpbmdBY3Rpdml0eU9uSW5wdXRTYWdhIiwic3VibWl0U2VuZEJveFNhZ2EiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBRUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7Ozs7OztBQUVlO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNiLGlCQUFNLG1CQUFLQSxnREFBTCxDQUFOOztBQURhO0FBQUE7QUFFYixpQkFBTSxtQkFBS0MsbUNBQUwsQ0FBTjs7QUFGYTtBQUFBO0FBR2IsaUJBQU0sbUJBQUtDLG9CQUFMLENBQU47O0FBSGE7QUFBQTtBQUliLGlCQUFNLG1CQUFLQyw2QkFBTCxDQUFOOztBQUphO0FBQUE7QUFLYixpQkFBTSxtQkFBS0MsNkRBQUwsQ0FBTjs7QUFMYTtBQUFBO0FBTWIsaUJBQU0sbUJBQUtDLCtDQUFMLENBQU47O0FBTmE7QUFBQTtBQU9iLGlCQUFNLG1CQUFLQyx5QkFBTCxDQUFOOztBQVBhO0FBQUE7QUFRYixpQkFBTSxtQkFBS0MsOENBQUwsQ0FBTjs7QUFSYTtBQUFBO0FBU2IsaUJBQU0sbUJBQUtDLDRDQUFMLENBQU47O0FBVGE7QUFBQTtBQVViLGlCQUFNLG1CQUFLQyxvQ0FBTCxDQUFOOztBQVZhO0FBQUE7QUFXYixpQkFBTSxtQkFBS0Msb0NBQUwsQ0FBTjs7QUFYYTtBQUFBO0FBWWIsaUJBQU0sbUJBQUtDLHNDQUFMLENBQU47O0FBWmE7QUFBQTtBQWFiLGlCQUFNLG1CQUFLQywwQ0FBTCxDQUFOOztBQWJhO0FBQUE7QUFjYixpQkFBTSxtQkFBS0MsdUNBQUwsQ0FBTjs7QUFkYTtBQUFBO0FBZWIsaUJBQU0sbUJBQUtDLDRDQUFMLENBQU47O0FBZmE7QUFBQTtBQWdCYixpQkFBTSxtQkFBS0MsMkNBQUwsQ0FBTjs7QUFoQmE7QUFBQTtBQWlCYixpQkFBTSxtQkFBS0MsNkNBQUwsQ0FBTjs7QUFqQmE7QUFBQTtBQWtCYixpQkFBTSxtQkFBS0Msb0NBQUwsQ0FBTjs7QUFsQmE7QUFBQTtBQW1CYixpQkFBTSxtQkFBS0Msd0NBQUwsQ0FBTjs7QUFuQmE7QUFBQTtBQW9CYixpQkFBTSxtQkFBS0MsMEJBQUwsQ0FBTjs7QUFwQmE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmb3JrIH0gZnJvbSAncmVkdXgtc2FnYS9lZmZlY3RzJztcblxuaW1wb3J0IGNsZWFyU3VnZ2VzdGVkQWN0aW9uc09uUG9zdEFjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL2NsZWFyU3VnZ2VzdGVkQWN0aW9uc09uUG9zdEFjdGl2aXR5U2FnYSc7XG5pbXBvcnQgY29ubmVjdGlvblN0YXR1c1VwZGF0ZVNhZ2EgZnJvbSAnLi9zYWdhcy9jb25uZWN0aW9uU3RhdHVzVXBkYXRlU2FnYSc7XG5pbXBvcnQgY29ubmVjdFNhZ2EgZnJvbSAnLi9zYWdhcy9jb25uZWN0U2FnYSc7XG5pbXBvcnQgaW5jb21pbmdBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9pbmNvbWluZ0FjdGl2aXR5U2FnYSc7XG5pbXBvcnQgbWFya0FjdGl2aXR5Rm9yU3BlYWtPbkluY29taW5nQWN0aXZpdHlGcm9tT3RoZXJzU2FnYSBmcm9tICcuL3NhZ2FzL21hcmtBY3Rpdml0eUZvclNwZWFrT25JbmNvbWluZ0FjdGl2aXR5RnJvbU90aGVyc1NhZ2EnO1xuaW1wb3J0IG1hcmtBbGxBc1Nwb2tlbk9uU3RvcFNwZWFrQWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvbWFya0FsbEFzU3Bva2VuT25TdG9wU3BlYWtBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IHBvc3RBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9wb3N0QWN0aXZpdHlTYWdhJztcbmltcG9ydCByZW1vdmVJbmNvbWluZ1R5cGluZ0FmdGVySW50ZXJ2YWxTYWdhIGZyb20gJy4vc2FnYXMvcmVtb3ZlSW5jb21pbmdUeXBpbmdBZnRlckludGVydmFsU2FnYSc7XG5pbXBvcnQgc2VuZENvbnZlcnNhdGlvblVwZGF0ZU9uQ29ubmVjdFNhZ2EgZnJvbSAnLi9zYWdhcy9zZW5kQ29udmVyc2F0aW9uVXBkYXRlT25Db25uZWN0U2FnYSc7XG5pbXBvcnQgc2VuZEV2ZW50VG9Qb3N0QWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvc2VuZEV2ZW50VG9Qb3N0QWN0aXZpdHlTYWdhJztcbmltcG9ydCBzZW5kRmlsZXNUb1Bvc3RBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9zZW5kRmlsZXNUb1Bvc3RBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IHNlbmRNZXNzYWdlVG9Qb3N0QWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvc2VuZE1lc3NhZ2VUb1Bvc3RBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IHNlbmRNZXNzYWdlQmFja1RvUG9zdEFjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL3NlbmRNZXNzYWdlQmFja1RvUG9zdEFjdGl2aXR5U2FnYSc7XG5pbXBvcnQgc2VuZFBvc3RCYWNrVG9Qb3N0QWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvc2VuZFBvc3RCYWNrVG9Qb3N0QWN0aXZpdHlTYWdhJztcbmltcG9ydCBzZW5kVHlwaW5nSW5kaWNhdG9yT25TZXRTZW5kQm94U2FnYSBmcm9tICcuL3NhZ2FzL3NlbmRUeXBpbmdJbmRpY2F0b3JPblNldFNlbmRCb3hTYWdhJztcbmltcG9ydCBzdGFydERpY3RhdGVBZnRlclNwZWFrQWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvc3RhcnREaWN0YXRlQWZ0ZXJTcGVha0FjdGl2aXR5U2FnYSc7XG5pbXBvcnQgc3RhcnRTcGVha0FjdGl2aXR5T25Qb3N0QWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvc3RhcnRTcGVha0FjdGl2aXR5T25Qb3N0QWN0aXZpdHlTYWdhJztcbmltcG9ydCBzdG9wRGljdGF0ZU9uQ2FyZEFjdGlvblNhZ2EgZnJvbSAnLi9zYWdhcy9zdG9wRGljdGF0ZU9uQ2FyZEFjdGlvblNhZ2EnO1xuaW1wb3J0IHN0b3BTcGVha2luZ0FjdGl2aXR5T25JbnB1dFNhZ2EgZnJvbSAnLi9zYWdhcy9zdG9wU3BlYWtpbmdBY3Rpdml0eU9uSW5wdXRTYWdhJztcbmltcG9ydCBzdWJtaXRTZW5kQm94U2FnYSBmcm9tICcuL3NhZ2FzL3N1Ym1pdFNlbmRCb3hTYWdhJztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24qICgpIHtcbiAgeWllbGQgZm9yayhjbGVhclN1Z2dlc3RlZEFjdGlvbnNPblBvc3RBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKGNvbm5lY3Rpb25TdGF0dXNVcGRhdGVTYWdhKTtcbiAgeWllbGQgZm9yayhjb25uZWN0U2FnYSk7XG4gIHlpZWxkIGZvcmsoaW5jb21pbmdBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKG1hcmtBY3Rpdml0eUZvclNwZWFrT25JbmNvbWluZ0FjdGl2aXR5RnJvbU90aGVyc1NhZ2EpO1xuICB5aWVsZCBmb3JrKG1hcmtBbGxBc1Nwb2tlbk9uU3RvcFNwZWFrQWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhwb3N0QWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhyZW1vdmVJbmNvbWluZ1R5cGluZ0FmdGVySW50ZXJ2YWxTYWdhKTtcbiAgeWllbGQgZm9yayhzZW5kQ29udmVyc2F0aW9uVXBkYXRlT25Db25uZWN0U2FnYSk7XG4gIHlpZWxkIGZvcmsoc2VuZEV2ZW50VG9Qb3N0QWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhzZW5kRmlsZXNUb1Bvc3RBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKHNlbmRNZXNzYWdlVG9Qb3N0QWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhzZW5kTWVzc2FnZUJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKHNlbmRQb3N0QmFja1RvUG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsoc2VuZFR5cGluZ0luZGljYXRvck9uU2V0U2VuZEJveFNhZ2EpO1xuICB5aWVsZCBmb3JrKHN0YXJ0RGljdGF0ZUFmdGVyU3BlYWtBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKHN0YXJ0U3BlYWtBY3Rpdml0eU9uUG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsoc3RvcERpY3RhdGVPbkNhcmRBY3Rpb25TYWdhKTtcbiAgeWllbGQgZm9yayhzdG9wU3BlYWtpbmdBY3Rpdml0eU9uSW5wdXRTYWdhKTtcbiAgeWllbGQgZm9yayhzdWJtaXRTZW5kQm94U2FnYSk7XG59XG4iXX0=

lib/sagas/connectSaga.js

 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -18,8 +20,8 @@
 
-var _callUntil = _interopRequireDefault(require("./effects/callUntil"));
+var _updateConnectionStatus = _interopRequireWildcard(require("../actions/updateConnectionStatus"));
 
-var _forever = _interopRequireDefault(require("./effects/forever"));
-
 var _createPromiseQueue = _interopRequireDefault(require("../createPromiseQueue"));
 
+var _botframeworkDirectlinejs = require("botframework-directlinejs");
+
 var _connect = require("../actions/connect");
@@ -31,3 +33,3 @@
 /*#__PURE__*/
-_regenerator.default.mark(_callee),
+_regenerator.default.mark(observeAndPutConnectionStatusUpdate),
     _marked2 =
@@ -38,11 +40,10 @@ /*#__PURE__*/
 /*#__PURE__*/
-_regenerator.default.mark(disconnectSaga);
+_regenerator.default.mark(_callee);
 
-// const UNINITIALIZED = 0;
-// const CONNECTING = 1;
-var ONLINE = 2; // const EXPIRED_TOKEN = 3;
-// const FAILED_TO_CONNECT = 4;
+var CONNECTING = _botframeworkDirectlinejs.ConnectionStatus.Connecting,
+    ONLINE = _botframeworkDirectlinejs.ConnectionStatus.Online,
+    EXPIRED_TOKEN = _botframeworkDirectlinejs.ConnectionStatus.ExpiredToken,
+    FAILED_TO_CONNECT = _botframeworkDirectlinejs.ConnectionStatus.FailedToConnect,
+    ENDED = _botframeworkDirectlinejs.ConnectionStatus.Ended;
 
-var ENDED = 5;
-
 function randomUserID() {
@@ -52,56 +53,33 @@ return "r_".concat((0, _mathRandom.default)().toString(36).substr(2, 10));
 
-function _callee() {
-  var _ref, _ref$payload, directLine, userID, token, _ref2, userIDFromToken, connectTask;
-
-  return _regenerator.default.wrap(function _callee$(_context) {
+function observeAndPutConnectionStatusUpdate(directLine) {
+  var connectionStatusQueue, connectionStatusSubscription, connectionStatus;
+  return _regenerator.default.wrap(function observeAndPutConnectionStatusUpdate$(_context) {
     while (1) {
       switch (_context.prev = _context.next) {
         case 0:
-          _context.next = 2;
-          return (0, _effects.take)(_connect.CONNECT);
+          connectionStatusQueue = (0, _createPromiseQueue.default)();
+          connectionStatusSubscription = directLine.connectionStatus$.subscribe({
+            next: connectionStatusQueue.push
+          });
+          _context.prev = 2;
 
-        case 2:
-          _ref = _context.sent;
-          _ref$payload = _ref.payload;
-          directLine = _ref$payload.directLine;
-          userID = _ref$payload.userID;
-          token = directLine.token;
-          _ref2 = (0, _jsonwebtoken.decode)(token) || {}, userIDFromToken = _ref2.user;
+        case 3:
+          _context.next = 5;
+          return (0, _effects.call)(connectionStatusQueue.shift);
 
-          if (userIDFromToken) {
-            if (userID && userID !== userIDFromToken) {
-              console.warn('Web Chat: user ID is both specified in the Direct Line token and passed in, will use the user ID from the token.');
-            }
+        case 5:
+          connectionStatus = _context.sent;
+          _context.next = 8;
+          return (0, _effects.put)((0, _updateConnectionStatus.default)(connectionStatus));
 
-            userID = userIDFromToken;
-          } else if (userID) {
-            if (typeof userID !== 'string') {
-              console.warn('Web Chat: user ID must be a string.');
-              userID = randomUserID();
-            } else if (/^dl_/.test(userID)) {
-              console.warn('Web Chat: user ID prefixed with "dl_" is reserved and must be embedded into the Direct Line token to prevent forgery.');
-              userID = randomUserID();
-            }
-          } else {
-            // Only specify "default-user" if not found from token and not passed in
-            userID = randomUserID();
-          }
+        case 8:
+          _context.next = 3;
+          break;
 
-          _context.next = 11;
-          return (0, _effects.fork)(connectSaga, directLine, userID);
+        case 10:
+          _context.prev = 10;
+          connectionStatusSubscription.unsubscribe();
+          return _context.finish(10);
 
-        case 11:
-          connectTask = _context.sent;
-          _context.next = 14;
-          return (0, _effects.take)(_disconnect.DISCONNECT);
-
-        case 14:
-          _context.next = 16;
-          return (0, _effects.call)(disconnectSaga, connectTask, directLine);
-
-        case 16:
-          _context.next = 0;
-          break;
-
-        case 18:
+        case 13:
         case "end":
@@ -111,7 +89,45 @@ return _context.stop();
     }
-  }, _marked, this);
+  }, _marked, this, [[2,, 10, 13]]);
 }
 
-function connectSaga(directLine, userID) {
-  var meta, connectionStatusQueue, connectionStatusSubscription, activitySubscription;
+function negativeUpdateConnectionStatusAction(_ref) {
+  var payload = _ref.payload,
+      type = _ref.type;
+
+  if (type === _updateConnectionStatus.UPDATE_CONNECTION_STATUS) {
+    var connectionStatus = payload.connectionStatus;
+    return connectionStatus !== CONNECTING && connectionStatus !== ONLINE;
+  }
+}
+
+function rectifyUserID(directLine, userIDFromAction) {
+  var token = directLine.token;
+
+  var _ref2 = (0, _jsonwebtoken.decode)(token) || {},
+      userIDFromToken = _ref2.user;
+
+  if (userIDFromToken) {
+    if (userIDFromAction && userIDFromAction !== userIDFromToken) {
+      console.warn('Web Chat: user ID is both specified in the Direct Line token and passed in, will use the user ID from the token.');
+    }
+
+    return userIDFromToken;
+  } else if (userIDFromAction) {
+    if (typeof userIDFromAction !== 'string') {
+      console.warn('Web Chat: user ID must be a string.');
+      return randomUserID();
+    } else if (/^dl_/.test(userIDFromAction)) {
+      console.warn('Web Chat: user ID prefixed with "dl_" is reserved and must be embedded into the Direct Line token to prevent forgery.');
+      return randomUserID();
+    }
+  } else {
+    return randomUserID();
+  }
+
+  return userIDFromAction;
+}
+
+function connectSaga(directLine) {
+  var activitySubscription, _ref3, connectionStatus;
+
   return _regenerator.default.wrap(function connectSaga$(_context2) {
@@ -121,17 +137,3 @@ while (1) {
         case 0:
-          meta = {
-            userID: userID
-          };
-          _context2.next = 3;
-          return (0, _effects.put)({
-            type: _connect.CONNECT_PENDING,
-            meta: meta
-          });
-
-        case 3:
-          connectionStatusQueue = (0, _createPromiseQueue.default)();
-          connectionStatusSubscription = directLine.connectionStatus$.subscribe({
-            next: connectionStatusQueue.push
-          }); // DirectLineJS start the connection only after the first subscriber for activity$, but not connectionStatus$
-
+          // DirectLineJS start the connection only after the first subscriber for activity$, but not connectionStatus$
           activitySubscription = directLine.activity$.subscribe({
@@ -142,81 +144,52 @@ next: function next() {
           });
-          _context2.prev = 6;
-          _context2.prev = 7;
-          _context2.next = 10;
-          return (0, _callUntil.default)(connectionStatusQueue.shift, [], function (connectionStatus) {
-            return connectionStatus === ONLINE;
+          _context2.prev = 1;
+
+        case 2:
+          _context2.next = 4;
+          return (0, _effects.take)(_updateConnectionStatus.UPDATE_CONNECTION_STATUS);
+
+        case 4:
+          _ref3 = _context2.sent;
+          connectionStatus = _ref3.payload.connectionStatus;
+
+          if (!(connectionStatus === ONLINE)) {
+            _context2.next = 10;
+            break;
+          }
+
+          return _context2.abrupt("return", function () {
+            activitySubscription.unsubscribe();
+            directLine.end();
           });
 
         case 10:
-          _context2.next = 12;
-          return (0, _effects.put)({
-            type: _connect.CONNECT_FULFILLING,
-            meta: meta,
-            payload: {
-              directLine: directLine
-            }
-          });
+          if (!(connectionStatus === ENDED || connectionStatus === EXPIRED_TOKEN || connectionStatus === FAILED_TO_CONNECT)) {
+            _context2.next = 12;
+            break;
+          }
 
+          throw new Error('Failed to connect');
+
         case 12:
-          _context2.next = 14;
-          return (0, _effects.put)({
-            type: _connect.CONNECT_FULFILLED,
-            meta: meta,
-            payload: {
-              directLine: directLine
-            }
-          });
+          _context2.next = 2;
+          break;
 
         case 14:
-          _context2.next = 20;
-          break;
-
-        case 16:
-          _context2.prev = 16;
-          _context2.t0 = _context2["catch"](7);
-          _context2.next = 20;
-          return (0, _effects.put)({
-            type: _connect.CONNECT_REJECTED,
-            error: true,
-            meta: meta,
-            payload: _context2.t0
-          });
-
-        case 20:
-          _context2.prev = 20;
-          _context2.next = 23;
+          _context2.prev = 14;
+          _context2.next = 17;
           return (0, _effects.cancelled)();
 
-        case 23:
+        case 17:
           if (!_context2.sent) {
-            _context2.next = 26;
+            _context2.next = 20;
             break;
           }
 
-          _context2.next = 26;
-          return (0, _effects.put)({
-            type: _connect.CONNECT_REJECTED,
-            error: true,
-            meta: meta,
-            payload: new Error('cancelled')
-          });
+          activitySubscription.unsubscribe();
+          throw new Error('Cancelled');
 
-        case 26:
-          return _context2.finish(20);
+        case 20:
+          return _context2.finish(14);
 
-        case 27:
-          _context2.next = 29;
-          return (0, _forever.default)();
-
-        case 29:
-          _context2.prev = 29;
-          // TODO: [P2] DirectLineJS should kill the connection when we unsubscribe
-          //       But currently in v3, DirectLineJS does not have this functionality
-          //       Thus, we need to call "end()" explicitly
-          directLine.end();
-          activitySubscription.unsubscribe();
-          connectionStatusSubscription.unsubscribe();
-          return _context2.finish(29);
-
-        case 34:
+        case 21:
         case "end":
@@ -226,8 +199,9 @@ return _context2.stop();
     }
-  }, _marked2, this, [[6,, 29, 34], [7, 16, 20, 27]]);
+  }, _marked2, this, [[1,, 14, 21]]);
 }
 
-function disconnectSaga(connectTask, directLine) {
-  var connectionStatusQueue, unsubscribe;
-  return _regenerator.default.wrap(function disconnectSaga$(_context3) {
+function _callee() {
+  var _ref4, _ref4$payload, directLine, userIDFromAction, updateConnectionStatusTask, meta, endDirectLine, terminateAction;
+
+  return _regenerator.default.wrap(function _callee$(_context3) {
     while (1) {
@@ -237,66 +211,116 @@ switch (_context3.prev = _context3.next) {
           _context3.next = 2;
-          return (0, _effects.put)({
-            type: _disconnect.DISCONNECT_PENDING
-          });
+          return (0, _effects.take)(_connect.CONNECT);
 
         case 2:
-          connectionStatusQueue = (0, _createPromiseQueue.default)();
-          unsubscribe = directLine.connectionStatus$.subscribe({
-            next: connectionStatusQueue.push
-          }); // DirectLineJS should cancel underlying REST/WS when we cancel
-          // the connect task, which subsequently unsubscribe connectionStatus$
+          _ref4 = _context3.sent;
+          _ref4$payload = _ref4.payload;
+          directLine = _ref4$payload.directLine;
+          userIDFromAction = _ref4$payload.userID;
+          _context3.next = 8;
+          return (0, _effects.fork)(observeAndPutConnectionStatusUpdate, directLine);
 
-          _context3.next = 6;
-          return (0, _effects.cancel)(connectTask);
-
-        case 6:
-          _context3.prev = 6;
-          _context3.next = 9;
-          return (0, _callUntil.default)(connectionStatusQueue.shift, [], function (connectionStatus) {
-            return connectionStatus === ENDED;
-          });
-
-        case 9:
-          _context3.next = 11;
+        case 8:
+          updateConnectionStatusTask = _context3.sent;
+          _context3.prev = 9;
+          meta = {
+            userID: rectifyUserID(directLine, userIDFromAction)
+          };
+          endDirectLine = void 0;
+          _context3.next = 14;
           return (0, _effects.put)({
-            type: _disconnect.DISCONNECT_FULFILLED
+            type: _connect.CONNECT_PENDING,
+            meta: meta
           });
 
-        case 11:
+        case 14:
+          _context3.prev = 14;
           _context3.next = 17;
+          return (0, _effects.call)(connectSaga, directLine);
+
+        case 17:
+          endDirectLine = _context3.sent;
+          _context3.next = 25;
           break;
 
-        case 13:
-          _context3.prev = 13;
-          _context3.t0 = _context3["catch"](6);
-          _context3.next = 17;
+        case 20:
+          _context3.prev = 20;
+          _context3.t0 = _context3["catch"](14);
+          _context3.next = 24;
           return (0, _effects.put)({
-            type: _disconnect.DISCONNECT_REJECTED,
+            type: _connect.CONNECT_REJECTED,
             error: true,
+            meta: meta,
             payload: _context3.t0
           });
 
-        case 17:
-          _context3.prev = 17;
-          _context3.next = 20;
-          return (0, _effects.cancelled)();
+        case 24:
+          return _context3.abrupt("continue", 48);
 
-        case 20:
-          if (!_context3.sent) {
-            _context3.next = 23;
+        case 25:
+          _context3.prev = 25;
+          _context3.next = 28;
+          return (0, _effects.put)({
+            type: _connect.CONNECT_FULFILLING,
+            meta: meta,
+            payload: {
+              directLine: directLine
+            }
+          });
+
+        case 28:
+          _context3.next = 30;
+          return (0, _effects.put)({
+            type: _connect.CONNECT_FULFILLED,
+            meta: meta,
+            payload: {
+              directLine: directLine
+            }
+          });
+
+        case 30:
+          _context3.next = 32;
+          return (0, _effects.take)([_disconnect.DISCONNECT, negativeUpdateConnectionStatusAction]);
+
+        case 32:
+          terminateAction = _context3.sent;
+          _context3.next = 35;
+          return (0, _effects.put)({
+            type: _disconnect.DISCONNECT_PENDING
+          });
+
+        case 35:
+          endDirectLine();
+
+          if (!(terminateAction.type === _disconnect.DISCONNECT)) {
+            _context3.next = 39;
             break;
           }
 
-          _context3.next = 23;
+          _context3.next = 39;
+          return (0, _effects.take)(negativeUpdateConnectionStatusAction);
+
+        case 39:
+          _context3.prev = 39;
+          _context3.next = 42;
           return (0, _effects.put)({
-            type: _disconnect.DISCONNECT_REJECTED,
-            error: true,
-            payload: new Error('cancelled')
+            type: _disconnect.DISCONNECT_FULFILLED
           });
 
-        case 23:
-          unsubscribe();
-          return _context3.finish(17);
+        case 42:
+          endDirectLine();
+          return _context3.finish(39);
 
-        case 25:
+        case 44:
+          _context3.prev = 44;
+          _context3.next = 47;
+          return (0, _effects.cancel)(updateConnectionStatusTask);
+
+        case 47:
+          return _context3.finish(44);
+
+        case 48:
+          _context3.next = 0;
+          break;
+
+        case 50:
         case "end":
@@ -306,4 +330,4 @@ return _context3.stop();
     }
-  }, _marked3, this, [[6, 13, 17, 25]]);
+  }, _marked3, this, [[9,, 44, 48], [14, 20], [25,, 39, 44]]);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/sagas/connectSaga.js"],"names":["connectSaga","disconnectSaga","ONLINE","ENDED","randomUserID","toString","substr","CONNECT","payload","directLine","userID","token","userIDFromToken","user","console","warn","test","connectTask","DISCONNECT","meta","type","CONNECT_PENDING","connectionStatusQueue","connectionStatusSubscription","connectionStatus$","subscribe","next","push","activitySubscription","activity$","shift","connectionStatus","CONNECT_FULFILLING","CONNECT_FULFILLED","CONNECT_REJECTED","error","Error","end","unsubscribe","DISCONNECT_PENDING","DISCONNECT_FULFILLED","DISCONNECT_REJECTED"],"mappings":"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","sourcesContent":["import {\n  call,\n  cancel,\n  cancelled,\n  fork,\n  put,\n  take,\n} from 'redux-saga/effects';\n\nimport { decode } from 'jsonwebtoken';\nimport random from 'math-random';\n\nimport callUntil from './effects/callUntil';\nimport forever from './effects/forever';\n\nimport createPromiseQueue from '../createPromiseQueue';\n\nimport {\n  CONNECT,\n  CONNECT_PENDING,\n  CONNECT_REJECTED,\n  CONNECT_FULFILLING,\n  CONNECT_FULFILLED\n} from '../actions/connect';\n\nimport {\n  DISCONNECT,\n  DISCONNECT_PENDING,\n  DISCONNECT_REJECTED,\n  DISCONNECT_FULFILLED\n} from '../actions/disconnect';\n\n// const UNINITIALIZED = 0;\n// const CONNECTING = 1;\nconst ONLINE = 2;\n// const EXPIRED_TOKEN = 3;\n// const FAILED_TO_CONNECT = 4;\nconst ENDED = 5;\n\nfunction randomUserID() {\n  return `r_${ random().toString(36).substr(2, 10) }`;\n}\n\nexport default function* () {\n  for (;;) {\n    const { payload: { directLine, userID } } = yield take(CONNECT);\n    const { token } = directLine;\n    const { user: userIDFromToken } = decode(token) || {};\n\n    if (userIDFromToken) {\n      if (userID && userID !== userIDFromToken) {\n        console.warn('Web Chat: user ID is both specified in the Direct Line token and passed in, will use the user ID from the token.');\n      }\n\n      userID = userIDFromToken;\n    } else if (userID) {\n      if (typeof userID !== 'string') {\n        console.warn('Web Chat: user ID must be a string.');\n        userID = randomUserID();\n      } else if (/^dl_/.test(userID)) {\n        console.warn('Web Chat: user ID prefixed with \"dl_\" is reserved and must be embedded into the Direct Line token to prevent forgery.');\n        userID = randomUserID();\n      }\n    } else {\n      // Only specify \"default-user\" if not found from token and not passed in\n      userID = randomUserID();\n    }\n\n    const connectTask = yield fork(connectSaga, directLine, userID);\n\n    yield take(DISCONNECT);\n    yield call(disconnectSaga, connectTask, directLine);\n  }\n}\n\nfunction* connectSaga(directLine, userID) {\n  const meta = { userID };\n\n  yield put({ type: CONNECT_PENDING, meta });\n\n  const connectionStatusQueue = createPromiseQueue();\n  const connectionStatusSubscription = directLine.connectionStatus$.subscribe({ next: connectionStatusQueue.push });\n\n  // DirectLineJS start the connection only after the first subscriber for activity$, but not connectionStatus$\n  const activitySubscription = directLine.activity$.subscribe({ next: () => 0 });\n\n  try {\n    try {\n      yield callUntil(connectionStatusQueue.shift, [], connectionStatus => connectionStatus === ONLINE);\n      yield put({ type: CONNECT_FULFILLING, meta, payload: { directLine } });\n      yield put({ type: CONNECT_FULFILLED, meta, payload: { directLine } });\n    } catch (err) {\n      yield put({ type: CONNECT_REJECTED, error: true, meta, payload: err });\n    } finally {\n      if (yield cancelled()) {\n        yield put({ type: CONNECT_REJECTED, error: true, meta, payload: new Error('cancelled') });\n      }\n    }\n\n    yield forever();\n  } finally {\n    // TODO: [P2] DirectLineJS should kill the connection when we unsubscribe\n    //       But currently in v3, DirectLineJS does not have this functionality\n    //       Thus, we need to call \"end()\" explicitly\n    directLine.end();\n    activitySubscription.unsubscribe();\n    connectionStatusSubscription.unsubscribe();\n  }\n}\n\nfunction* disconnectSaga(connectTask, directLine) {\n  yield put({ type: DISCONNECT_PENDING });\n\n  const connectionStatusQueue = createPromiseQueue();\n  const unsubscribe = directLine.connectionStatus$.subscribe({ next: connectionStatusQueue.push });\n\n  // DirectLineJS should cancel underlying REST/WS when we cancel\n  // the connect task, which subsequently unsubscribe connectionStatus$\n  yield cancel(connectTask);\n\n  try {\n    yield callUntil(connectionStatusQueue.shift, [], connectionStatus => connectionStatus === ENDED);\n    yield put({ type: DISCONNECT_FULFILLED });\n  } catch (err) {\n    yield put({ type: DISCONNECT_REJECTED, error: true, payload: err });\n  } finally {\n    if (yield cancelled()) {\n      yield put({ type: DISCONNECT_REJECTED, error: true, payload: new Error('cancelled') });\n    }\n\n    unsubscribe();\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/sagas/connectSaga.js"],"names":["observeAndPutConnectionStatusUpdate","connectSaga","CONNECTING","ConnectionStatus","Connecting","ONLINE","Online","EXPIRED_TOKEN","ExpiredToken","FAILED_TO_CONNECT","FailedToConnect","ENDED","Ended","randomUserID","toString","substr","directLine","connectionStatusQueue","connectionStatusSubscription","connectionStatus$","subscribe","next","push","shift","connectionStatus","unsubscribe","negativeUpdateConnectionStatusAction","payload","type","UPDATE_CONNECTION_STATUS","rectifyUserID","userIDFromAction","token","userIDFromToken","user","console","warn","test","activitySubscription","activity$","end","Error","CONNECT","userID","updateConnectionStatusTask","meta","endDirectLine","CONNECT_PENDING","CONNECT_REJECTED","error","CONNECT_FULFILLING","CONNECT_FULFILLED","DISCONNECT","terminateAction","DISCONNECT_PENDING","DISCONNECT_FULFILLED"],"mappings":"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","sourcesContent":["import {\n  call,\n  cancel,\n  cancelled,\n  fork,\n  put,\n  take,\n} from 'redux-saga/effects';\n\nimport { decode } from 'jsonwebtoken';\nimport random from 'math-random';\n\nimport updateConnectionStatus, { UPDATE_CONNECTION_STATUS } from '../actions/updateConnectionStatus';\n\nimport createPromiseQueue from '../createPromiseQueue';\n\nimport { ConnectionStatus } from 'botframework-directlinejs';\n\nimport {\n  CONNECT,\n  CONNECT_PENDING,\n  CONNECT_REJECTED,\n  CONNECT_FULFILLING,\n  CONNECT_FULFILLED\n} from '../actions/connect';\n\nimport {\n  DISCONNECT,\n  DISCONNECT_PENDING,\n  DISCONNECT_FULFILLED\n} from '../actions/disconnect';\n\nconst {\n  Connecting: CONNECTING,\n  Online: ONLINE,\n  ExpiredToken: EXPIRED_TOKEN,\n  FailedToConnect: FAILED_TO_CONNECT,\n  Ended: ENDED\n} = ConnectionStatus;\n\nfunction randomUserID() {\n  return `r_${ random().toString(36).substr(2, 10) }`;\n}\n\nfunction* observeAndPutConnectionStatusUpdate(directLine) {\n  const connectionStatusQueue = createPromiseQueue();\n  const connectionStatusSubscription = directLine.connectionStatus$.subscribe({\n    next: connectionStatusQueue.push\n  });\n\n  try {\n    for (;;) {\n      const connectionStatus = yield call(connectionStatusQueue.shift);\n\n      yield put(updateConnectionStatus(connectionStatus));\n    }\n  } finally {\n    connectionStatusSubscription.unsubscribe();\n  }\n}\n\nfunction negativeUpdateConnectionStatusAction({ payload, type }) {\n  if (type === UPDATE_CONNECTION_STATUS) {\n    const { connectionStatus } = payload;\n\n    return (\n      connectionStatus !== CONNECTING\n      && connectionStatus !== ONLINE\n    );\n  }\n}\n\nfunction rectifyUserID(directLine, userIDFromAction) {\n  const { token } = directLine;\n  const { user: userIDFromToken } = decode(token) || {};\n\n  if (userIDFromToken) {\n    if (userIDFromAction && userIDFromAction !== userIDFromToken) {\n      console.warn('Web Chat: user ID is both specified in the Direct Line token and passed in, will use the user ID from the token.');\n    }\n\n    return userIDFromToken;\n  } else if (userIDFromAction) {\n    if (typeof userIDFromAction !== 'string') {\n      console.warn('Web Chat: user ID must be a string.');\n\n      return randomUserID();\n    } else if (/^dl_/.test(userIDFromAction)) {\n      console.warn('Web Chat: user ID prefixed with \"dl_\" is reserved and must be embedded into the Direct Line token to prevent forgery.');\n\n      return randomUserID();\n    }\n  } else {\n    return randomUserID();\n  }\n\n  return userIDFromAction;\n}\n\nfunction* connectSaga(directLine) {\n  // DirectLineJS start the connection only after the first subscriber for activity$, but not connectionStatus$\n  const activitySubscription = directLine.activity$.subscribe({ next: () => 0 });\n\n  try {\n    for (;;) {\n      const { payload: { connectionStatus } } = yield take(UPDATE_CONNECTION_STATUS);\n\n      // We will ignore DISCONNECT actions until we connect\n\n      if (connectionStatus === ONLINE) {\n        // TODO: [P2] DirectLineJS should kill the connection when we unsubscribe\n        //       But currently in v3, DirectLineJS does not have this functionality\n        //       Thus, we need to call \"end()\" explicitly\n\n        return () => {\n          activitySubscription.unsubscribe();\n          directLine.end();\n        };\n      } else if (\n        connectionStatus === ENDED\n        || connectionStatus === EXPIRED_TOKEN\n        || connectionStatus === FAILED_TO_CONNECT\n      ) {\n        // If we receive anything negative, we will assume the connection is errored out\n        throw new Error('Failed to connect');\n      }\n    }\n  } finally {\n    if (yield cancelled()) {\n      activitySubscription.unsubscribe();\n\n      throw new Error('Cancelled');\n    }\n  }\n}\n\nexport default function* () {\n  for (;;) {\n    const { payload: { directLine, userID: userIDFromAction } } = yield take(CONNECT);\n    const updateConnectionStatusTask = yield fork(observeAndPutConnectionStatusUpdate, directLine);\n\n    try {\n      const meta = { userID: rectifyUserID(directLine, userIDFromAction) };\n      let endDirectLine;\n\n      yield put({ type: CONNECT_PENDING, meta });\n\n      try {\n        endDirectLine = yield call(connectSaga, directLine);\n      } catch (err) {\n        yield put({ type: CONNECT_REJECTED, error: true, meta, payload: err });\n\n        continue;\n      }\n\n      // At this point, we established connection to Direct Line.\n      // Any errors from this point, we need to make sure we call endDirectLine() to release resources.\n      try {\n        yield put({ type: CONNECT_FULFILLING, meta, payload: { directLine } });\n        yield put({ type: CONNECT_FULFILLED, meta, payload: { directLine } });\n\n        const terminateAction = yield take([DISCONNECT, negativeUpdateConnectionStatusAction]);\n\n        // Even if the connection is interrupted, we will still emitting DISCONNECT_PENDING.\n        // This will makes handling logic easier. If CONNECT_FULFILLED, we guarantee DISCONNECT_PENDING.\n        yield put({ type: DISCONNECT_PENDING });\n\n        endDirectLine();\n\n        if (terminateAction.type === DISCONNECT) {\n          // For graceful disconnect, we wait until Direct Line say it is ended\n          yield take(negativeUpdateConnectionStatusAction);\n        }\n      } finally {\n        // It is meaningless to continue to use the Direct Line object even disconnect failed.\n        // We will still unsubscribe to incoming activities and consider Direct Line object abandoned.\n        yield put({ type: DISCONNECT_FULFILLED });\n\n        endDirectLine();\n      }\n    } finally {\n      yield cancel(updateConnectionStatusTask);\n    }\n  }\n}\n"]}

lib/sagas/effects/whileConnected.js

@@ -41,3 +41,3 @@ "use strict";
             _context.next = 10;
-            return (0, _effects.take)(_disconnect.DISCONNECT_FULFILLED);
+            return (0, _effects.take)(_disconnect.DISCONNECT_PENDING);
 
@@ -60,2 +60,2 @@ case 10:
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zYWdhcy9lZmZlY3RzL3doaWxlQ29ubmVjdGVkLmpzIl0sIm5hbWVzIjpbImZuIiwiQ09OTkVDVF9GVUxGSUxMSU5HIiwidXNlcklEIiwibWV0YSIsImRpcmVjdExpbmUiLCJwYXlsb2FkIiwidGFzayIsIkRJU0NPTk5FQ1RfRlVMRklMTEVEIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQU9BOztBQUNBOztBQUVlLGtCQUFVQSxFQUFWLEVBQWM7QUFDM0IsU0FBTztBQUFBO0FBQUEsNEJBQUs7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRThDLG1CQUFNLG1CQUFLQywyQkFBTCxDQUFOOztBQUY5QztBQUFBO0FBRVFDLFlBQUFBLE1BRlIsUUFFQUMsSUFGQSxDQUVRRCxNQUZSO0FBRTZCRSxZQUFBQSxVQUY3QixRQUVrQkMsT0FGbEIsQ0FFNkJELFVBRjdCO0FBQUE7QUFHSyxtQkFBTSxtQkFBS0osRUFBTCxFQUFTSSxVQUFULEVBQXFCRixNQUFyQixDQUFOOztBQUhMO0FBR0ZJLFlBQUFBLElBSEU7QUFBQTtBQUtSLG1CQUFNLG1CQUFLQyxnQ0FBTCxDQUFOOztBQUxRO0FBQUE7QUFNUixtQkFBTSxxQkFBT0QsSUFBUCxDQUFOOztBQU5RO0FBQUE7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxHQUFMLEVBQVA7QUFTRCIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIGNhbGwsXG4gIGNhbmNlbCxcbiAgZm9yayxcbiAgdGFrZVxufSBmcm9tICdyZWR1eC1zYWdhL2VmZmVjdHMnO1xuXG5pbXBvcnQgeyBDT05ORUNUX0ZVTEZJTExJTkcgfSBmcm9tICcuLi8uLi9hY3Rpb25zL2Nvbm5lY3QnO1xuaW1wb3J0IHsgRElTQ09OTkVDVF9GVUxGSUxMRUQgfSBmcm9tICcuLi8uLi9hY3Rpb25zL2Rpc2Nvbm5lY3QnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiAoZm4pIHtcbiAgcmV0dXJuIGNhbGwoZnVuY3Rpb24qICgpIHtcbiAgICBmb3IgKDs7KSB7XG4gICAgICBjb25zdCB7IG1ldGE6IHsgdXNlcklEIH0sIHBheWxvYWQ6IHsgZGlyZWN0TGluZSB9IH0gPSB5aWVsZCB0YWtlKENPTk5FQ1RfRlVMRklMTElORyk7XG4gICAgICBjb25zdCB0YXNrID0geWllbGQgZm9yayhmbiwgZGlyZWN0TGluZSwgdXNlcklEKTtcblxuICAgICAgeWllbGQgdGFrZShESVNDT05ORUNUX0ZVTEZJTExFRCk7XG4gICAgICB5aWVsZCBjYW5jZWwodGFzayk7XG4gICAgfVxuICB9KTtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zYWdhcy9lZmZlY3RzL3doaWxlQ29ubmVjdGVkLmpzIl0sIm5hbWVzIjpbImZuIiwiQ09OTkVDVF9GVUxGSUxMSU5HIiwidXNlcklEIiwibWV0YSIsImRpcmVjdExpbmUiLCJwYXlsb2FkIiwidGFzayIsIkRJU0NPTk5FQ1RfUEVORElORyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQTs7QUFPQTs7QUFDQTs7QUFFZSxrQkFBVUEsRUFBVixFQUFjO0FBQzNCLFNBQU87QUFBQTtBQUFBLDRCQUFLO0FBQUE7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUU4QyxtQkFBTSxtQkFBS0MsMkJBQUwsQ0FBTjs7QUFGOUM7QUFBQTtBQUVRQyxZQUFBQSxNQUZSLFFBRUFDLElBRkEsQ0FFUUQsTUFGUjtBQUU2QkUsWUFBQUEsVUFGN0IsUUFFa0JDLE9BRmxCLENBRTZCRCxVQUY3QjtBQUFBO0FBR0ssbUJBQU0sbUJBQUtKLEVBQUwsRUFBU0ksVUFBVCxFQUFxQkYsTUFBckIsQ0FBTjs7QUFITDtBQUdGSSxZQUFBQSxJQUhFO0FBQUE7QUFNUixtQkFBTSxtQkFBS0MsOEJBQUwsQ0FBTjs7QUFOUTtBQUFBO0FBT1IsbUJBQU0scUJBQU9ELElBQVAsQ0FBTjs7QUFQUTtBQUFBO0FBQUE7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEsR0FBTCxFQUFQO0FBVUQiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBjYWxsLFxuICBjYW5jZWwsXG4gIGZvcmssXG4gIHRha2Vcbn0gZnJvbSAncmVkdXgtc2FnYS9lZmZlY3RzJztcblxuaW1wb3J0IHsgQ09OTkVDVF9GVUxGSUxMSU5HIH0gZnJvbSAnLi4vLi4vYWN0aW9ucy9jb25uZWN0JztcbmltcG9ydCB7IERJU0NPTk5FQ1RfUEVORElORyB9IGZyb20gJy4uLy4uL2FjdGlvbnMvZGlzY29ubmVjdCc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIChmbikge1xuICByZXR1cm4gY2FsbChmdW5jdGlvbiogKCkge1xuICAgIGZvciAoOzspIHtcbiAgICAgIGNvbnN0IHsgbWV0YTogeyB1c2VySUQgfSwgcGF5bG9hZDogeyBkaXJlY3RMaW5lIH0gfSA9IHlpZWxkIHRha2UoQ09OTkVDVF9GVUxGSUxMSU5HKTtcbiAgICAgIGNvbnN0IHRhc2sgPSB5aWVsZCBmb3JrKGZuLCBkaXJlY3RMaW5lLCB1c2VySUQpO1xuXG4gICAgICAvLyBXaGVuIHdlIHJlY2VpdmUgRElTQ09OTkVDVF9QRU5ESU5HLCB0aGUgRGlyZWN0IExpbmUgY29ubmVjdGlvbiBpcyB0ZWFyaW5nIGRvd24gYW5kIHNob3VsZCBub3QgYmUgdXNlZC5cbiAgICAgIHlpZWxkIHRha2UoRElTQ09OTkVDVF9QRU5ESU5HKTtcbiAgICAgIHlpZWxkIGNhbmNlbCh0YXNrKTtcbiAgICB9XG4gIH0pO1xufVxuIl19

package.json

 {
   "name": "botframework-webchat-core",
-  "version": "4.2.1-master.b34fa87",
+  "version": "4.2.1-master.bd3c22c",
   "description": "Core of botframework-webchat",
@@ -53,3 +53,3 @@ "main": "lib/index.js",
     "babel-plugin-version-transform": "^1.0.0",
-    "botframework-directlinejs": "^0.10.2",
+    "botframework-directlinejs": "^0.11.1",
     "concurrently": "^4.0.1",
@@ -56,0 +56,0 @@ "jest": "^23.6.0",

src/actions/setSendTyping.js

@@ -0,4 +1,6 @@
+// TODO: [P3] Take this deprecation code out when releasing on or after 2020 January 13
 const SET_SEND_TYPING = 'WEB_CHAT/SET_SEND_TYPING';
 
 export default function (value) {
+  // Deprecation notes added to reducer
   return {
@@ -5,0 +7,0 @@ type: SET_SEND_TYPING,

src/index.js

@@ -17,2 +17,3 @@ import connect from './actions/connect';
 import setSendTyping from './actions/setSendTyping';
+import setSendTypingIndicator from './actions/setSendTypingIndicator';
 import startDictate from './actions/startDictate';
@@ -47,3 +48,3 @@ import startSpeakingActivity from './actions/startSpeakingActivity';
   setSendTimeout,
-  setSendTyping,
+  setSendTypingIndicator,
   startDictate,
@@ -54,3 +55,6 @@ startSpeakingActivity,
   submitSendBox,
-  version
+  version,
+
+  // TODO: [P3] Take this deprecation code out when releasing on or after January 13 2020 
+  setSendTyping
 }

src/reducer.ts

@@ -11,3 +11,3 @@ import { combineReducers } from 'redux';
 import sendTimeout from './reducers/sendTimeout';
-import sendTyping from './reducers/sendTyping';
+import sendTypingIndicator from './reducers/sendTypingIndicator';
 import suggestedActions from './reducers/suggestedActions';
@@ -24,4 +24,7 @@
   sendTimeout,
-  sendTyping,
-  suggestedActions
+  sendTypingIndicator,
+  suggestedActions,
+
+  // TODO: [P3] Take this deprecation code out when releasing on or after January 13 2020
+  sendTyping: sendTypingIndicator
 })

src/sagas.js

@@ -11,2 +11,3 @@ import { fork } from 'redux-saga/effects';
 import removeIncomingTypingAfterIntervalSaga from './sagas/removeIncomingTypingAfterIntervalSaga';
+import sendConversationUpdateOnConnectSaga from './sagas/sendConversationUpdateOnConnectSaga';
 import sendEventToPostActivitySaga from './sagas/sendEventToPostActivitySaga';
@@ -17,3 +18,3 @@ import sendFilesToPostActivitySaga from './sagas/sendFilesToPostActivitySaga';
 import sendPostBackToPostActivitySaga from './sagas/sendPostBackToPostActivitySaga';
-import sendTypingOnSetSendBoxSaga from './sagas/sendTypingOnSetSendBoxSaga';
+import sendTypingIndicatorOnSetSendBoxSaga from './sagas/sendTypingIndicatorOnSetSendBoxSaga';
 import startDictateAfterSpeakActivitySaga from './sagas/startDictateAfterSpeakActivitySaga';
@@ -34,2 +35,3 @@ import startSpeakActivityOnPostActivitySaga from './sagas/startSpeakActivityOnPostActivitySaga';
   yield fork(removeIncomingTypingAfterIntervalSaga);
+  yield fork(sendConversationUpdateOnConnectSaga);
   yield fork(sendEventToPostActivitySaga);
@@ -40,3 +42,3 @@ yield fork(sendFilesToPostActivitySaga);
   yield fork(sendPostBackToPostActivitySaga);
-  yield fork(sendTypingOnSetSendBoxSaga);
+  yield fork(sendTypingIndicatorOnSetSendBoxSaga);
   yield fork(startDictateAfterSpeakActivitySaga);
@@ -43,0 +45,0 @@ yield fork(startSpeakActivityOnPostActivitySaga);

src/sagas/connectSaga.js

@@ -13,7 +13,8 @@ import {
 
-import callUntil from './effects/callUntil';
-import forever from './effects/forever';
+import updateConnectionStatus, { UPDATE_CONNECTION_STATUS } from '../actions/updateConnectionStatus';
 
 import createPromiseQueue from '../createPromiseQueue';
 
+import { ConnectionStatus } from 'botframework-directlinejs';
+
 import {
@@ -30,12 +31,12 @@ CONNECT,
   DISCONNECT_PENDING,
-  DISCONNECT_REJECTED,
   DISCONNECT_FULFILLED
 } from '../actions/disconnect';
 
-// const UNINITIALIZED = 0;
-// const CONNECTING = 1;
-const ONLINE = 2;
-// const EXPIRED_TOKEN = 3;
-// const FAILED_TO_CONNECT = 4;
-const ENDED = 5;
+const {
+  Connecting: CONNECTING,
+  Online: ONLINE,
+  ExpiredToken: EXPIRED_TOKEN,
+  FailedToConnect: FAILED_TO_CONNECT,
+  Ended: ENDED
+} = ConnectionStatus;
 
@@ -46,42 +47,58 @@ function randomUserID() {
 
-export default function* () {
-  for (;;) {
-    const { payload: { directLine, userID } } = yield take(CONNECT);
-    const { token } = directLine;
-    const { user: userIDFromToken } = decode(token) || {};
+function* observeAndPutConnectionStatusUpdate(directLine) {
+  const connectionStatusQueue = createPromiseQueue();
+  const connectionStatusSubscription = directLine.connectionStatus$.subscribe({
+    next: connectionStatusQueue.push
+  });
 
-    if (userIDFromToken) {
-      if (userID && userID !== userIDFromToken) {
-        console.warn('Web Chat: user ID is both specified in the Direct Line token and passed in, will use the user ID from the token.');
-      }
+  try {
+    for (;;) {
+      const connectionStatus = yield call(connectionStatusQueue.shift);
 
-      userID = userIDFromToken;
-    } else if (userID) {
-      if (typeof userID !== 'string') {
-        console.warn('Web Chat: user ID must be a string.');
-        userID = randomUserID();
-      } else if (/^dl_/.test(userID)) {
-        console.warn('Web Chat: user ID prefixed with "dl_" is reserved and must be embedded into the Direct Line token to prevent forgery.');
-        userID = randomUserID();
-      }
-    } else {
-      // Only specify "default-user" if not found from token and not passed in
-      userID = randomUserID();
+      yield put(updateConnectionStatus(connectionStatus));
     }
+  } finally {
+    connectionStatusSubscription.unsubscribe();
+  }
+}
 
-    const connectTask = yield fork(connectSaga, directLine, userID);
+function negativeUpdateConnectionStatusAction({ payload, type }) {
+  if (type === UPDATE_CONNECTION_STATUS) {
+    const { connectionStatus } = payload;
 
-    yield take(DISCONNECT);
-    yield call(disconnectSaga, connectTask, directLine);
+    return (
+      connectionStatus !== CONNECTING
+      && connectionStatus !== ONLINE
+    );
   }
 }
 
-function* connectSaga(directLine, userID) {
-  const meta = { userID };
+function rectifyUserID(directLine, userIDFromAction) {
+  const { token } = directLine;
+  const { user: userIDFromToken } = decode(token) || {};
 
-  yield put({ type: CONNECT_PENDING, meta });
+  if (userIDFromToken) {
+    if (userIDFromAction && userIDFromAction !== userIDFromToken) {
+      console.warn('Web Chat: user ID is both specified in the Direct Line token and passed in, will use the user ID from the token.');
+    }
 
-  const connectionStatusQueue = createPromiseQueue();
-  const connectionStatusSubscription = directLine.connectionStatus$.subscribe({ next: connectionStatusQueue.push });
+    return userIDFromToken;
+  } else if (userIDFromAction) {
+    if (typeof userIDFromAction !== 'string') {
+      console.warn('Web Chat: user ID must be a string.');
 
+      return randomUserID();
+    } else if (/^dl_/.test(userIDFromAction)) {
+      console.warn('Web Chat: user ID prefixed with "dl_" is reserved and must be embedded into the Direct Line token to prevent forgery.');
+
+      return randomUserID();
+    }
+  } else {
+    return randomUserID();
+  }
+
+  return userIDFromAction;
+}
+
+function* connectSaga(directLine) {
   // DirectLineJS start the connection only after the first subscriber for activity$, but not connectionStatus$
@@ -91,47 +108,82 @@ const activitySubscription = directLine.activity$.subscribe({ next: () => 0 });
   try {
-    try {
-      yield callUntil(connectionStatusQueue.shift, [], connectionStatus => connectionStatus === ONLINE);
-      yield put({ type: CONNECT_FULFILLING, meta, payload: { directLine } });
-      yield put({ type: CONNECT_FULFILLED, meta, payload: { directLine } });
-    } catch (err) {
-      yield put({ type: CONNECT_REJECTED, error: true, meta, payload: err });
-    } finally {
-      if (yield cancelled()) {
-        yield put({ type: CONNECT_REJECTED, error: true, meta, payload: new Error('cancelled') });
+    for (;;) {
+      const { payload: { connectionStatus } } = yield take(UPDATE_CONNECTION_STATUS);
+
+      // We will ignore DISCONNECT actions until we connect
+
+      if (connectionStatus === ONLINE) {
+        // TODO: [P2] DirectLineJS should kill the connection when we unsubscribe
+        //       But currently in v3, DirectLineJS does not have this functionality
+        //       Thus, we need to call "end()" explicitly
+
+        return () => {
+          activitySubscription.unsubscribe();
+          directLine.end();
+        };
+      } else if (
+        connectionStatus === ENDED
+        || connectionStatus === EXPIRED_TOKEN
+        || connectionStatus === FAILED_TO_CONNECT
+      ) {
+        // If we receive anything negative, we will assume the connection is errored out
+        throw new Error('Failed to connect');
       }
     }
+  } finally {
+    if (yield cancelled()) {
+      activitySubscription.unsubscribe();
 
-    yield forever();
-  } finally {
-    // TODO: [P2] DirectLineJS should kill the connection when we unsubscribe
-    //       But currently in v3, DirectLineJS does not have this functionality
-    //       Thus, we need to call "end()" explicitly
-    directLine.end();
-    activitySubscription.unsubscribe();
-    connectionStatusSubscription.unsubscribe();
+      throw new Error('Cancelled');
+    }
   }
 }
 
-function* disconnectSaga(connectTask, directLine) {
-  yield put({ type: DISCONNECT_PENDING });
+export default function* () {
+  for (;;) {
+    const { payload: { directLine, userID: userIDFromAction } } = yield take(CONNECT);
+    const updateConnectionStatusTask = yield fork(observeAndPutConnectionStatusUpdate, directLine);
 
-  const connectionStatusQueue = createPromiseQueue();
-  const unsubscribe = directLine.connectionStatus$.subscribe({ next: connectionStatusQueue.push });
+    try {
+      const meta = { userID: rectifyUserID(directLine, userIDFromAction) };
+      let endDirectLine;
 
-  // DirectLineJS should cancel underlying REST/WS when we cancel
-  // the connect task, which subsequently unsubscribe connectionStatus$
-  yield cancel(connectTask);
+      yield put({ type: CONNECT_PENDING, meta });
 
-  try {
-    yield callUntil(connectionStatusQueue.shift, [], connectionStatus => connectionStatus === ENDED);
-    yield put({ type: DISCONNECT_FULFILLED });
-  } catch (err) {
-    yield put({ type: DISCONNECT_REJECTED, error: true, payload: err });
-  } finally {
-    if (yield cancelled()) {
-      yield put({ type: DISCONNECT_REJECTED, error: true, payload: new Error('cancelled') });
+      try {
+        endDirectLine = yield call(connectSaga, directLine);
+      } catch (err) {
+        yield put({ type: CONNECT_REJECTED, error: true, meta, payload: err });
+
+        continue;
+      }
+
+      // At this point, we established connection to Direct Line.
+      // Any errors from this point, we need to make sure we call endDirectLine() to release resources.
+      try {
+        yield put({ type: CONNECT_FULFILLING, meta, payload: { directLine } });
+        yield put({ type: CONNECT_FULFILLED, meta, payload: { directLine } });
+
+        const terminateAction = yield take([DISCONNECT, negativeUpdateConnectionStatusAction]);
+
+        // Even if the connection is interrupted, we will still emitting DISCONNECT_PENDING.
+        // This will makes handling logic easier. If CONNECT_FULFILLED, we guarantee DISCONNECT_PENDING.
+        yield put({ type: DISCONNECT_PENDING });
+
+        endDirectLine();
+
+        if (terminateAction.type === DISCONNECT) {
+          // For graceful disconnect, we wait until Direct Line say it is ended
+          yield take(negativeUpdateConnectionStatusAction);
+        }
+      } finally {
+        // It is meaningless to continue to use the Direct Line object even disconnect failed.
+        // We will still unsubscribe to incoming activities and consider Direct Line object abandoned.
+        yield put({ type: DISCONNECT_FULFILLED });
+
+        endDirectLine();
+      }
+    } finally {
+      yield cancel(updateConnectionStatusTask);
     }
-
-    unsubscribe();
   }
 }

src/sagas/effects/whileConnected.js

@@ -9,3 +9,3 @@ import {
 import { CONNECT_FULFILLING } from '../../actions/connect';
-import { DISCONNECT_FULFILLED } from '../../actions/disconnect';
+import { DISCONNECT_PENDING } from '../../actions/disconnect';
 
@@ -18,3 +18,4 @@ export default function (fn) {
 
-      yield take(DISCONNECT_FULFILLED);
+      // When we receive DISCONNECT_PENDING, the Direct Line connection is tearing down and should not be used.
+      yield take(DISCONNECT_PENDING);
       yield cancel(task);
@@ -21,0 +22,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

344427

increased by5.38%

Number of package files

184

increased by3.37%

Lines of code

5241

increased by4.15%

No dependency changes