botframework-webchat-core - npm Package Compare versions

Comparing version 4.2.1-master.d9808ca to 4.2.1-master.da98602

lib/actions/connect.js

@@ -7,5 +7,9 @@ "use strict";
 exports.default = _default;
-exports.CONNECT_FULFILLED = exports.CONNECT_REJECTED = exports.CONNECT_PENDING = exports.CONNECT = void 0;
+exports.CONNECT_STILL_PENDING = exports.CONNECT_REJECTED = exports.CONNECT_PENDING = exports.CONNECT_FULFILLING = exports.CONNECT_FULFILLED = exports.CONNECT = void 0;
 var CONNECT = 'DIRECT_LINE/CONNECT';
 exports.CONNECT = CONNECT;
+var CONNECT_FULFILLED = "".concat(CONNECT, "_FULFILLED");
+exports.CONNECT_FULFILLED = CONNECT_FULFILLED;
+var CONNECT_FULFILLING = "".concat(CONNECT, "_FULFILLING");
+exports.CONNECT_FULFILLING = CONNECT_FULFILLING;
 var CONNECT_PENDING = "".concat(CONNECT, "_PENDING");
@@ -15,8 +19,9 @@ exports.CONNECT_PENDING = CONNECT_PENDING;
 exports.CONNECT_REJECTED = CONNECT_REJECTED;
-var CONNECT_FULFILLED = "".concat(CONNECT, "_FULFILLED");
-exports.CONNECT_FULFILLED = CONNECT_FULFILLED;
+var CONNECT_STILL_PENDING = "".concat(CONNECT, "_STILL_PENDING");
+exports.CONNECT_STILL_PENDING = CONNECT_STILL_PENDING;
 
 function _default(_ref) {
   var directLine = _ref.directLine,
-      userID = _ref.userID;
+      userID = _ref.userID,
+      username = _ref.username;
   return {
@@ -26,6 +31,7 @@ type: CONNECT,
       directLine: directLine,
-      userID: userID
+      userID: userID,
+      username: username
     }
   };
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2Nvbm5lY3QuanMiXSwibmFtZXMiOlsiQ09OTkVDVCIsIkNPTk5FQ1RfUEVORElORyIsIkNPTk5FQ1RfUkVKRUNURUQiLCJDT05ORUNUX0ZVTEZJTExFRCIsImRpcmVjdExpbmUiLCJ1c2VySUQiLCJ0eXBlIiwicGF5bG9hZCJdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBLElBQU1BLE9BQU8sR0FBRyxxQkFBaEI7O0FBQ0EsSUFBTUMsZUFBZSxhQUFPRCxPQUFQLGFBQXJCOztBQUNBLElBQU1FLGdCQUFnQixhQUFPRixPQUFQLGNBQXRCOztBQUNBLElBQU1HLGlCQUFpQixhQUFPSCxPQUFQLGVBQXZCOzs7QUFFZSx3QkFBa0M7QUFBQSxNQUF0QkksVUFBc0IsUUFBdEJBLFVBQXNCO0FBQUEsTUFBVkMsTUFBVSxRQUFWQSxNQUFVO0FBQy9DLFNBQU87QUFDTEMsSUFBQUEsSUFBSSxFQUFFTixPQUREO0FBRUxPLElBQUFBLE9BQU8sRUFBRTtBQUFFSCxNQUFBQSxVQUFVLEVBQVZBLFVBQUY7QUFBY0MsTUFBQUEsTUFBTSxFQUFOQTtBQUFkO0FBRkosR0FBUDtBQUlEIiwic291cmNlc0NvbnRlbnQiOlsiY29uc3QgQ09OTkVDVCA9ICdESVJFQ1RfTElORS9DT05ORUNUJztcbmNvbnN0IENPTk5FQ1RfUEVORElORyA9IGAkeyBDT05ORUNUIH1fUEVORElOR2A7XG5jb25zdCBDT05ORUNUX1JFSkVDVEVEID0gYCR7IENPTk5FQ1QgfV9SRUpFQ1RFRGA7XG5jb25zdCBDT05ORUNUX0ZVTEZJTExFRCA9IGAkeyBDT05ORUNUIH1fRlVMRklMTEVEYDtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gKHsgZGlyZWN0TGluZSwgdXNlcklEIH0pIHtcbiAgcmV0dXJuIHtcbiAgICB0eXBlOiBDT05ORUNULFxuICAgIHBheWxvYWQ6IHsgZGlyZWN0TGluZSwgdXNlcklEIH1cbiAgfTtcbn1cblxuZXhwb3J0IHtcbiAgQ09OTkVDVCxcbiAgQ09OTkVDVF9QRU5ESU5HLFxuICBDT05ORUNUX1JFSkVDVEVELFxuICBDT05ORUNUX0ZVTEZJTExFRFxufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL2Nvbm5lY3QuanMiXSwibmFtZXMiOlsiQ09OTkVDVCIsIkNPTk5FQ1RfRlVMRklMTEVEIiwiQ09OTkVDVF9GVUxGSUxMSU5HIiwiQ09OTkVDVF9QRU5ESU5HIiwiQ09OTkVDVF9SRUpFQ1RFRCIsIkNPTk5FQ1RfU1RJTExfUEVORElORyIsImRpcmVjdExpbmUiLCJ1c2VySUQiLCJ1c2VybmFtZSIsInR5cGUiLCJwYXlsb2FkIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUEsSUFBTUEsT0FBTyxHQUFHLHFCQUFoQjs7QUFDQSxJQUFNQyxpQkFBaUIsYUFBT0QsT0FBUCxlQUF2Qjs7QUFDQSxJQUFNRSxrQkFBa0IsYUFBT0YsT0FBUCxnQkFBeEI7O0FBQ0EsSUFBTUcsZUFBZSxhQUFPSCxPQUFQLGFBQXJCOztBQUNBLElBQU1JLGdCQUFnQixhQUFPSixPQUFQLGNBQXRCOztBQUNBLElBQU1LLHFCQUFxQixhQUFPTCxPQUFQLG1CQUEzQjs7O0FBRWUsd0JBQTRDO0FBQUEsTUFBaENNLFVBQWdDLFFBQWhDQSxVQUFnQztBQUFBLE1BQXBCQyxNQUFvQixRQUFwQkEsTUFBb0I7QUFBQSxNQUFaQyxRQUFZLFFBQVpBLFFBQVk7QUFDekQsU0FBTztBQUNMQyxJQUFBQSxJQUFJLEVBQUVULE9BREQ7QUFFTFUsSUFBQUEsT0FBTyxFQUFFO0FBQ1BKLE1BQUFBLFVBQVUsRUFBVkEsVUFETztBQUVQQyxNQUFBQSxNQUFNLEVBQU5BLE1BRk87QUFHUEMsTUFBQUEsUUFBUSxFQUFSQTtBQUhPO0FBRkosR0FBUDtBQVFEIiwic291cmNlc0NvbnRlbnQiOlsiY29uc3QgQ09OTkVDVCA9ICdESVJFQ1RfTElORS9DT05ORUNUJztcbmNvbnN0IENPTk5FQ1RfRlVMRklMTEVEID0gYCR7IENPTk5FQ1QgfV9GVUxGSUxMRURgO1xuY29uc3QgQ09OTkVDVF9GVUxGSUxMSU5HID0gYCR7IENPTk5FQ1QgfV9GVUxGSUxMSU5HYDtcbmNvbnN0IENPTk5FQ1RfUEVORElORyA9IGAkeyBDT05ORUNUIH1fUEVORElOR2A7XG5jb25zdCBDT05ORUNUX1JFSkVDVEVEID0gYCR7IENPTk5FQ1QgfV9SRUpFQ1RFRGA7XG5jb25zdCBDT05ORUNUX1NUSUxMX1BFTkRJTkcgPSBgJHsgQ09OTkVDVCB9X1NUSUxMX1BFTkRJTkdgO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiAoeyBkaXJlY3RMaW5lLCB1c2VySUQsIHVzZXJuYW1lIH0pIHtcbiAgcmV0dXJuIHtcbiAgICB0eXBlOiBDT05ORUNULFxuICAgIHBheWxvYWQ6IHtcbiAgICAgIGRpcmVjdExpbmUsXG4gICAgICB1c2VySUQsXG4gICAgICB1c2VybmFtZVxuICAgIH1cbiAgfTtcbn1cblxuZXhwb3J0IHtcbiAgQ09OTkVDVCxcbiAgQ09OTkVDVF9GVUxGSUxMRUQsXG4gIENPTk5FQ1RfRlVMRklMTElORyxcbiAgQ09OTkVDVF9QRU5ESU5HLFxuICBDT05ORUNUX1JFSkVDVEVELFxuICBDT05ORUNUX1NUSUxMX1BFTkRJTkdcbn1cbiJdfQ==

lib/actions/postActivity.js

@@ -21,4 +21,8 @@ "use strict";
 function _default(activity) {
+  var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'keyboard';
   return {
     type: POST_ACTIVITY,
+    meta: {
+      method: method
+    },
     payload: {
@@ -29,2 +33,2 @@ activity: activity
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3Bvc3RBY3Rpdml0eS5qcyJdLCJuYW1lcyI6WyJQT1NUX0FDVElWSVRZIiwiUE9TVF9BQ1RJVklUWV9GVUxGSUxMRUQiLCJGVUxGSUxMRUQiLCJQT1NUX0FDVElWSVRZX1BFTkRJTkciLCJQRU5ESU5HIiwiUE9TVF9BQ1RJVklUWV9SRUpFQ1RFRCIsIlJFSkVDVEVEIiwiYWN0aXZpdHkiLCJ0eXBlIiwicGF5bG9hZCJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7QUFBQTs7QUFFQSxJQUFNQSxhQUFhLEdBQUcsMkJBQXRCOztBQUNPLElBQU1DLHVCQUF1QixhQUFPRCxhQUFQLGNBQTBCRSxpQ0FBMUIsQ0FBN0I7O0FBQ0EsSUFBTUMscUJBQXFCLGFBQU9ILGFBQVAsY0FBMEJJLCtCQUExQixDQUEzQjs7QUFDQSxJQUFNQyxzQkFBc0IsYUFBT0wsYUFBUCxjQUEwQk0sZ0NBQTFCLENBQTVCOzs7QUFFUSxrQkFBVUMsUUFBVixFQUFvQjtBQUNqQyxTQUFPO0FBQ0xDLElBQUFBLElBQUksRUFBRVIsYUFERDtBQUVMUyxJQUFBQSxPQUFPLEVBQUU7QUFBRUYsTUFBQUEsUUFBUSxFQUFSQTtBQUFGO0FBRkosR0FBUDtBQUlEIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRlVMRklMTEVELCBQRU5ESU5HLCBSRUpFQ1RFRCB9IGZyb20gJ3JlZHV4LXByb21pc2UtbWlkZGxld2FyZSc7XG5cbmNvbnN0IFBPU1RfQUNUSVZJVFkgPSAnRElSRUNUX0xJTkUvUE9TVF9BQ1RJVklUWSc7XG5leHBvcnQgY29uc3QgUE9TVF9BQ1RJVklUWV9GVUxGSUxMRUQgPSBgJHsgUE9TVF9BQ1RJVklUWSB9XyR7IEZVTEZJTExFRCB9YDtcbmV4cG9ydCBjb25zdCBQT1NUX0FDVElWSVRZX1BFTkRJTkcgPSBgJHsgUE9TVF9BQ1RJVklUWSB9XyR7IFBFTkRJTkcgfWA7XG5leHBvcnQgY29uc3QgUE9TVF9BQ1RJVklUWV9SRUpFQ1RFRCA9IGAkeyBQT1NUX0FDVElWSVRZIH1fJHsgUkVKRUNURUQgfWA7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIChhY3Rpdml0eSkge1xuICByZXR1cm4ge1xuICAgIHR5cGU6IFBPU1RfQUNUSVZJVFksXG4gICAgcGF5bG9hZDogeyBhY3Rpdml0eSB9XG4gIH07XG59XG5cbmV4cG9ydCB7XG4gIFBPU1RfQUNUSVZJVFlcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3Bvc3RBY3Rpdml0eS5qcyJdLCJuYW1lcyI6WyJQT1NUX0FDVElWSVRZIiwiUE9TVF9BQ1RJVklUWV9GVUxGSUxMRUQiLCJGVUxGSUxMRUQiLCJQT1NUX0FDVElWSVRZX1BFTkRJTkciLCJQRU5ESU5HIiwiUE9TVF9BQ1RJVklUWV9SRUpFQ1RFRCIsIlJFSkVDVEVEIiwiYWN0aXZpdHkiLCJtZXRob2QiLCJ0eXBlIiwibWV0YSIsInBheWxvYWQiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUE7O0FBRUEsSUFBTUEsYUFBYSxHQUFHLDJCQUF0Qjs7QUFDTyxJQUFNQyx1QkFBdUIsYUFBT0QsYUFBUCxjQUEwQkUsaUNBQTFCLENBQTdCOztBQUNBLElBQU1DLHFCQUFxQixhQUFPSCxhQUFQLGNBQTBCSSwrQkFBMUIsQ0FBM0I7O0FBQ0EsSUFBTUMsc0JBQXNCLGFBQU9MLGFBQVAsY0FBMEJNLGdDQUExQixDQUE1Qjs7O0FBRVEsa0JBQVVDLFFBQVYsRUFBeUM7QUFBQSxNQUFyQkMsTUFBcUIsdUVBQVosVUFBWTtBQUN0RCxTQUFPO0FBQ0xDLElBQUFBLElBQUksRUFBRVQsYUFERDtBQUVMVSxJQUFBQSxJQUFJLEVBQUU7QUFBRUYsTUFBQUEsTUFBTSxFQUFOQTtBQUFGLEtBRkQ7QUFHTEcsSUFBQUEsT0FBTyxFQUFFO0FBQUVKLE1BQUFBLFFBQVEsRUFBUkE7QUFBRjtBQUhKLEdBQVA7QUFLRCIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEZVTEZJTExFRCwgUEVORElORywgUkVKRUNURUQgfSBmcm9tICdyZWR1eC1wcm9taXNlLW1pZGRsZXdhcmUnO1xuXG5jb25zdCBQT1NUX0FDVElWSVRZID0gJ0RJUkVDVF9MSU5FL1BPU1RfQUNUSVZJVFknO1xuZXhwb3J0IGNvbnN0IFBPU1RfQUNUSVZJVFlfRlVMRklMTEVEID0gYCR7IFBPU1RfQUNUSVZJVFkgfV8keyBGVUxGSUxMRUQgfWA7XG5leHBvcnQgY29uc3QgUE9TVF9BQ1RJVklUWV9QRU5ESU5HID0gYCR7IFBPU1RfQUNUSVZJVFkgfV8keyBQRU5ESU5HIH1gO1xuZXhwb3J0IGNvbnN0IFBPU1RfQUNUSVZJVFlfUkVKRUNURUQgPSBgJHsgUE9TVF9BQ1RJVklUWSB9XyR7IFJFSkVDVEVEIH1gO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiAoYWN0aXZpdHksIG1ldGhvZCA9ICdrZXlib2FyZCcpIHtcbiAgcmV0dXJuIHtcbiAgICB0eXBlOiBQT1NUX0FDVElWSVRZLFxuICAgIG1ldGE6IHsgbWV0aG9kIH0sXG4gICAgcGF5bG9hZDogeyBhY3Rpdml0eSB9XG4gIH07XG59XG5cbmV4cG9ydCB7XG4gIFBPU1RfQUNUSVZJVFlcbn1cbiJdfQ==

lib/actions/sendMessage.js

@@ -11,11 +11,11 @@ "use strict";
 
-function sendMessage(text, via) {
+function sendMessage(text, method) {
   return {
     type: SEND_MESSAGE,
     payload: {
-      text: text,
-      via: via
+      method: method,
+      text: text
     }
   };
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3NlbmRNZXNzYWdlLmpzIl0sIm5hbWVzIjpbIlNFTkRfTUVTU0FHRSIsInNlbmRNZXNzYWdlIiwidGV4dCIsInZpYSIsInR5cGUiLCJwYXlsb2FkIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUEsSUFBTUEsWUFBWSxHQUFHLHVCQUFyQjs7O0FBRWUsU0FBU0MsV0FBVCxDQUFxQkMsSUFBckIsRUFBMkJDLEdBQTNCLEVBQWdDO0FBQzdDLFNBQU87QUFDTEMsSUFBQUEsSUFBSSxFQUFFSixZQUREO0FBRUxLLElBQUFBLE9BQU8sRUFBRTtBQUFFSCxNQUFBQSxJQUFJLEVBQUpBLElBQUY7QUFBUUMsTUFBQUEsR0FBRyxFQUFIQTtBQUFSO0FBRkosR0FBUDtBQUlEIiwic291cmNlc0NvbnRlbnQiOlsiY29uc3QgU0VORF9NRVNTQUdFID0gJ1dFQl9DSEFUL1NFTkRfTUVTU0FHRSc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHNlbmRNZXNzYWdlKHRleHQsIHZpYSkge1xuICByZXR1cm4ge1xuICAgIHR5cGU6IFNFTkRfTUVTU0FHRSxcbiAgICBwYXlsb2FkOiB7IHRleHQsIHZpYSB9XG4gIH07XG59XG5cbmV4cG9ydCB7IFNFTkRfTUVTU0FHRSB9XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3NlbmRNZXNzYWdlLmpzIl0sIm5hbWVzIjpbIlNFTkRfTUVTU0FHRSIsInNlbmRNZXNzYWdlIiwidGV4dCIsIm1ldGhvZCIsInR5cGUiLCJwYXlsb2FkIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUEsSUFBTUEsWUFBWSxHQUFHLHVCQUFyQjs7O0FBRWUsU0FBU0MsV0FBVCxDQUFxQkMsSUFBckIsRUFBMkJDLE1BQTNCLEVBQW1DO0FBQ2hELFNBQU87QUFDTEMsSUFBQUEsSUFBSSxFQUFFSixZQUREO0FBRUxLLElBQUFBLE9BQU8sRUFBRTtBQUFFRixNQUFBQSxNQUFNLEVBQU5BLE1BQUY7QUFBVUQsTUFBQUEsSUFBSSxFQUFKQTtBQUFWO0FBRkosR0FBUDtBQUlEIiwic291cmNlc0NvbnRlbnQiOlsiY29uc3QgU0VORF9NRVNTQUdFID0gJ1dFQl9DSEFUL1NFTkRfTUVTU0FHRSc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHNlbmRNZXNzYWdlKHRleHQsIG1ldGhvZCkge1xuICByZXR1cm4ge1xuICAgIHR5cGU6IFNFTkRfTUVTU0FHRSxcbiAgICBwYXlsb2FkOiB7IG1ldGhvZCwgdGV4dCB9XG4gIH07XG59XG5cbmV4cG9ydCB7IFNFTkRfTUVTU0FHRSB9XG4iXX0=

lib/actions/setSendBox.js

@@ -11,11 +11,10 @@ "use strict";
 
-function _default(text, via) {
+function _default(text) {
   return {
     type: SET_SEND_BOX,
     payload: {
-      text: text,
-      via: via
+      text: text
     }
   };
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3NldFNlbmRCb3guanMiXSwibmFtZXMiOlsiU0VUX1NFTkRfQk9YIiwidGV4dCIsInZpYSIsInR5cGUiLCJwYXlsb2FkIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUEsSUFBTUEsWUFBWSxHQUFHLHVCQUFyQjs7O0FBRWUsa0JBQVVDLElBQVYsRUFBZ0JDLEdBQWhCLEVBQXFCO0FBQ2xDLFNBQU87QUFDTEMsSUFBQUEsSUFBSSxFQUFFSCxZQUREO0FBRUxJLElBQUFBLE9BQU8sRUFBRTtBQUFFSCxNQUFBQSxJQUFJLEVBQUpBLElBQUY7QUFBUUMsTUFBQUEsR0FBRyxFQUFIQTtBQUFSO0FBRkosR0FBUDtBQUlEIiwic291cmNlc0NvbnRlbnQiOlsiY29uc3QgU0VUX1NFTkRfQk9YID0gJ1dFQl9DSEFUL1NFVF9TRU5EX0JPWCc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uICh0ZXh0LCB2aWEpIHtcbiAgcmV0dXJuIHtcbiAgICB0eXBlOiBTRVRfU0VORF9CT1gsXG4gICAgcGF5bG9hZDogeyB0ZXh0LCB2aWEgfVxuICB9O1xufVxuXG5leHBvcnQgeyBTRVRfU0VORF9CT1ggfVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3NldFNlbmRCb3guanMiXSwibmFtZXMiOlsiU0VUX1NFTkRfQk9YIiwidGV4dCIsInR5cGUiLCJwYXlsb2FkIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUEsSUFBTUEsWUFBWSxHQUFHLHVCQUFyQjs7O0FBRWUsa0JBQVVDLElBQVYsRUFBZ0I7QUFDN0IsU0FBTztBQUNMQyxJQUFBQSxJQUFJLEVBQUVGLFlBREQ7QUFFTEcsSUFBQUEsT0FBTyxFQUFFO0FBQUVGLE1BQUFBLElBQUksRUFBSkE7QUFBRjtBQUZKLEdBQVA7QUFJRCIsInNvdXJjZXNDb250ZW50IjpbImNvbnN0IFNFVF9TRU5EX0JPWCA9ICdXRUJfQ0hBVC9TRVRfU0VORF9CT1gnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiAodGV4dCkge1xuICByZXR1cm4ge1xuICAgIHR5cGU6IFNFVF9TRU5EX0JPWCxcbiAgICBwYXlsb2FkOiB7IHRleHQgfVxuICB9O1xufVxuXG5leHBvcnQgeyBTRVRfU0VORF9CT1ggfVxuIl19

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/actions/submitSendBox.js

@@ -11,10 +11,11 @@ "use strict";
 
-function submitSendBox(via) {
+function submitSendBox() {
+  var method = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'keyboard';
   return {
     type: SUBMIT_SEND_BOX,
     payload: {
-      via: via
+      method: method
     }
   };
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3N1Ym1pdFNlbmRCb3guanMiXSwibmFtZXMiOlsiU1VCTUlUX1NFTkRfQk9YIiwic3VibWl0U2VuZEJveCIsInZpYSIsInR5cGUiLCJwYXlsb2FkIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUEsSUFBTUEsZUFBZSxHQUFHLDBCQUF4Qjs7O0FBRWUsU0FBU0MsYUFBVCxDQUF1QkMsR0FBdkIsRUFBNEI7QUFDekMsU0FBTztBQUNMQyxJQUFBQSxJQUFJLEVBQUVILGVBREQ7QUFFTEksSUFBQUEsT0FBTyxFQUFFO0FBQUVGLE1BQUFBLEdBQUcsRUFBSEE7QUFBRjtBQUZKLEdBQVA7QUFJRCIsInNvdXJjZXNDb250ZW50IjpbImNvbnN0IFNVQk1JVF9TRU5EX0JPWCA9ICdXRUJfQ0hBVC9TVUJNSVRfU0VORF9CT1gnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBzdWJtaXRTZW5kQm94KHZpYSkge1xuICByZXR1cm4ge1xuICAgIHR5cGU6IFNVQk1JVF9TRU5EX0JPWCxcbiAgICBwYXlsb2FkOiB7IHZpYSB9XG4gIH07XG59XG5cbmV4cG9ydCB7IFNVQk1JVF9TRU5EX0JPWCB9XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hY3Rpb25zL3N1Ym1pdFNlbmRCb3guanMiXSwibmFtZXMiOlsiU1VCTUlUX1NFTkRfQk9YIiwic3VibWl0U2VuZEJveCIsIm1ldGhvZCIsInR5cGUiLCJwYXlsb2FkIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUEsSUFBTUEsZUFBZSxHQUFHLDBCQUF4Qjs7O0FBRWUsU0FBU0MsYUFBVCxHQUE0QztBQUFBLE1BQXJCQyxNQUFxQix1RUFBWixVQUFZO0FBQ3pELFNBQU87QUFDTEMsSUFBQUEsSUFBSSxFQUFFSCxlQUREO0FBRUxJLElBQUFBLE9BQU8sRUFBRTtBQUFFRixNQUFBQSxNQUFNLEVBQU5BO0FBQUY7QUFGSixHQUFQO0FBSUQiLCJzb3VyY2VzQ29udGVudCI6WyJjb25zdCBTVUJNSVRfU0VORF9CT1ggPSAnV0VCX0NIQVQvU1VCTUlUX1NFTkRfQk9YJztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gc3VibWl0U2VuZEJveChtZXRob2QgPSAna2V5Ym9hcmQnKSB7XG4gIHJldHVybiB7XG4gICAgdHlwZTogU1VCTUlUX1NFTkRfQk9YLFxuICAgIHBheWxvYWQ6IHsgbWV0aG9kIH1cbiAgfTtcbn1cblxuZXhwb3J0IHsgU1VCTUlUX1NFTkRfQk9YIH1cbiJdfQ==

lib/index.js

@@ -40,2 +40,8 @@ "use strict";
 });
+Object.defineProperty(exports, "sendEvent", {
+  enumerable: true,
+  get: function get() {
+    return _sendEvent.default;
+  }
+});
 Object.defineProperty(exports, "sendFiles", {
@@ -53,2 +59,8 @@ enumerable: true,
 });
+Object.defineProperty(exports, "sendMessageBack", {
+  enumerable: true,
+  get: function get() {
+    return _sendMessageBack.default;
+  }
+});
 Object.defineProperty(exports, "sendPostBack", {
@@ -96,2 +108,8 @@ enumerable: true,
 });
+Object.defineProperty(exports, "setSendTypingIndicator", {
+  enumerable: true,
+  get: function get() {
+    return _setSendTypingIndicator.default;
+  }
+});
 Object.defineProperty(exports, "startDictate", {
@@ -139,2 +157,4 @@ enumerable: true,
 
+var _sendEvent = _interopRequireDefault(require("./actions/sendEvent"));
+
 var _sendFiles = _interopRequireDefault(require("./actions/sendFiles"));
@@ -144,2 +164,4 @@
 
+var _sendMessageBack = _interopRequireDefault(require("./actions/sendMessageBack"));
+
 var _sendPostBack = _interopRequireDefault(require("./actions/sendPostBack"));
@@ -159,2 +181,4 @@
 
+var _setSendTypingIndicator = _interopRequireDefault(require("./actions/setSendTypingIndicator"));
+
 var _startDictate = _interopRequireDefault(require("./actions/startDictate"));
@@ -179,4 +203,4 @@
 exports.Constants = Constants;
-var version = "4.2.1-master.d9808ca";
+var version = "4.2.1-master.da98602";
 exports.version = version;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJuYW1lcyI6WyJDb25zdGFudHMiLCJBY3Rpdml0eUNsaWVudFN0YXRlIiwiRGljdGF0ZVN0YXRlIiwidmVyc2lvbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFFQTs7QUFDQTs7QUFFQSxJQUFNQSxTQUFTLEdBQUc7QUFBRUMsRUFBQUEsbUJBQW1CLEVBQW5CQSxtQkFBRjtBQUF1QkMsRUFBQUEsWUFBWSxFQUFaQTtBQUF2QixDQUFsQjs7QUFDQSxJQUFNQyxPQUFPLHlCQUFiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IGNvbm5lY3QgZnJvbSAnLi9hY3Rpb25zL2Nvbm5lY3QnO1xuaW1wb3J0IGNyZWF0ZVN0b3JlIGZyb20gJy4vY3JlYXRlU3RvcmUnO1xuaW1wb3J0IGRpc2Nvbm5lY3QgZnJvbSAnLi9hY3Rpb25zL2Rpc2Nvbm5lY3QnO1xuaW1wb3J0IG1hcmtBY3Rpdml0eSBmcm9tICcuL2FjdGlvbnMvbWFya0FjdGl2aXR5JztcbmltcG9ydCBwb3N0QWN0aXZpdHkgZnJvbSAnLi9hY3Rpb25zL3Bvc3RBY3Rpdml0eSc7XG5pbXBvcnQgc2VuZEZpbGVzIGZyb20gJy4vYWN0aW9ucy9zZW5kRmlsZXMnO1xuaW1wb3J0IHNlbmRNZXNzYWdlIGZyb20gJy4vYWN0aW9ucy9zZW5kTWVzc2FnZSc7XG5pbXBvcnQgc2VuZFBvc3RCYWNrIGZyb20gJy4vYWN0aW9ucy9zZW5kUG9zdEJhY2snO1xuaW1wb3J0IHNldERpY3RhdGVJbnRlcmltcyBmcm9tICcuL2FjdGlvbnMvc2V0RGljdGF0ZUludGVyaW1zJztcbmltcG9ydCBzZXREaWN0YXRlU3RhdGUgZnJvbSAnLi9hY3Rpb25zL3NldERpY3RhdGVTdGF0ZSc7XG5pbXBvcnQgc2V0TGFuZ3VhZ2UgZnJvbSAnLi9hY3Rpb25zL3NldExhbmd1YWdlJztcbmltcG9ydCBzZXRTZW5kQm94IGZyb20gJy4vYWN0aW9ucy9zZXRTZW5kQm94JztcbmltcG9ydCBzZXRTZW5kVGltZW91dCBmcm9tICcuL2FjdGlvbnMvc2V0U2VuZFRpbWVvdXQnO1xuaW1wb3J0IHNldFNlbmRUeXBpbmcgZnJvbSAnLi9hY3Rpb25zL3NldFNlbmRUeXBpbmcnO1xuaW1wb3J0IHN0YXJ0RGljdGF0ZSBmcm9tICcuL2FjdGlvbnMvc3RhcnREaWN0YXRlJztcbmltcG9ydCBzdGFydFNwZWFraW5nQWN0aXZpdHkgZnJvbSAnLi9hY3Rpb25zL3N0YXJ0U3BlYWtpbmdBY3Rpdml0eSc7XG5pbXBvcnQgc3RvcERpY3RhdGUgZnJvbSAnLi9hY3Rpb25zL3N0b3BEaWN0YXRlJztcbmltcG9ydCBzdG9wU3BlYWtpbmdBY3Rpdml0eSBmcm9tICcuL2FjdGlvbnMvc3RvcFNwZWFraW5nQWN0aXZpdHknO1xuaW1wb3J0IHN1Ym1pdFNlbmRCb3ggZnJvbSAnLi9hY3Rpb25zL3N1Ym1pdFNlbmRCb3gnO1xuXG5pbXBvcnQgKiBhcyBBY3Rpdml0eUNsaWVudFN0YXRlIGZyb20gJy4vY29uc3RhbnRzL0FjdGl2aXR5Q2xpZW50U3RhdGUnO1xuaW1wb3J0ICogYXMgRGljdGF0ZVN0YXRlIGZyb20gJy4vY29uc3RhbnRzL0RpY3RhdGVTdGF0ZSc7XG5cbmNvbnN0IENvbnN0YW50cyA9IHsgQWN0aXZpdHlDbGllbnRTdGF0ZSwgRGljdGF0ZVN0YXRlIH07XG5jb25zdCB2ZXJzaW9uID0gVkVSU0lPTjtcblxuZXhwb3J0IHtcbiAgY29ubmVjdCxcbiAgQ29uc3RhbnRzLFxuICBjcmVhdGVTdG9yZSxcbiAgZGlzY29ubmVjdCxcbiAgbWFya0FjdGl2aXR5LFxuICBwb3N0QWN0aXZpdHksXG4gIHNlbmRGaWxlcyxcbiAgc2VuZE1lc3NhZ2UsXG4gIHNlbmRQb3N0QmFjayxcbiAgc2V0RGljdGF0ZUludGVyaW1zLFxuICBzZXREaWN0YXRlU3RhdGUsXG4gIHNldExhbmd1YWdlLFxuICBzZXRTZW5kQm94LFxuICBzZXRTZW5kVGltZW91dCxcbiAgc2V0U2VuZFR5cGluZyxcbiAgc3RhcnREaWN0YXRlLFxuICBzdGFydFNwZWFraW5nQWN0aXZpdHksXG4gIHN0b3BEaWN0YXRlLFxuICBzdG9wU3BlYWtpbmdBY3Rpdml0eSxcbiAgc3VibWl0U2VuZEJveCxcbiAgdmVyc2lvblxufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJuYW1lcyI6WyJDb25zdGFudHMiLCJBY3Rpdml0eUNsaWVudFN0YXRlIiwiRGljdGF0ZVN0YXRlIiwidmVyc2lvbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFFQTs7QUFDQTs7QUFFQSxJQUFNQSxTQUFTLEdBQUc7QUFBRUMsRUFBQUEsbUJBQW1CLEVBQW5CQSxtQkFBRjtBQUF1QkMsRUFBQUEsWUFBWSxFQUFaQTtBQUF2QixDQUFsQjs7QUFDQSxJQUFNQyxPQUFPLHlCQUFiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IGNvbm5lY3QgZnJvbSAnLi9hY3Rpb25zL2Nvbm5lY3QnO1xuaW1wb3J0IGNyZWF0ZVN0b3JlIGZyb20gJy4vY3JlYXRlU3RvcmUnO1xuaW1wb3J0IGRpc2Nvbm5lY3QgZnJvbSAnLi9hY3Rpb25zL2Rpc2Nvbm5lY3QnO1xuaW1wb3J0IG1hcmtBY3Rpdml0eSBmcm9tICcuL2FjdGlvbnMvbWFya0FjdGl2aXR5JztcbmltcG9ydCBwb3N0QWN0aXZpdHkgZnJvbSAnLi9hY3Rpb25zL3Bvc3RBY3Rpdml0eSc7XG5pbXBvcnQgc2VuZEV2ZW50IGZyb20gJy4vYWN0aW9ucy9zZW5kRXZlbnQnO1xuaW1wb3J0IHNlbmRGaWxlcyBmcm9tICcuL2FjdGlvbnMvc2VuZEZpbGVzJztcbmltcG9ydCBzZW5kTWVzc2FnZSBmcm9tICcuL2FjdGlvbnMvc2VuZE1lc3NhZ2UnO1xuaW1wb3J0IHNlbmRNZXNzYWdlQmFjayBmcm9tICcuL2FjdGlvbnMvc2VuZE1lc3NhZ2VCYWNrJztcbmltcG9ydCBzZW5kUG9zdEJhY2sgZnJvbSAnLi9hY3Rpb25zL3NlbmRQb3N0QmFjayc7XG5pbXBvcnQgc2V0RGljdGF0ZUludGVyaW1zIGZyb20gJy4vYWN0aW9ucy9zZXREaWN0YXRlSW50ZXJpbXMnO1xuaW1wb3J0IHNldERpY3RhdGVTdGF0ZSBmcm9tICcuL2FjdGlvbnMvc2V0RGljdGF0ZVN0YXRlJztcbmltcG9ydCBzZXRMYW5ndWFnZSBmcm9tICcuL2FjdGlvbnMvc2V0TGFuZ3VhZ2UnO1xuaW1wb3J0IHNldFNlbmRCb3ggZnJvbSAnLi9hY3Rpb25zL3NldFNlbmRCb3gnO1xuaW1wb3J0IHNldFNlbmRUaW1lb3V0IGZyb20gJy4vYWN0aW9ucy9zZXRTZW5kVGltZW91dCc7XG5pbXBvcnQgc2V0U2VuZFR5cGluZyBmcm9tICcuL2FjdGlvbnMvc2V0U2VuZFR5cGluZyc7XG5pbXBvcnQgc2V0U2VuZFR5cGluZ0luZGljYXRvciBmcm9tICcuL2FjdGlvbnMvc2V0U2VuZFR5cGluZ0luZGljYXRvcic7XG5pbXBvcnQgc3RhcnREaWN0YXRlIGZyb20gJy4vYWN0aW9ucy9zdGFydERpY3RhdGUnO1xuaW1wb3J0IHN0YXJ0U3BlYWtpbmdBY3Rpdml0eSBmcm9tICcuL2FjdGlvbnMvc3RhcnRTcGVha2luZ0FjdGl2aXR5JztcbmltcG9ydCBzdG9wRGljdGF0ZSBmcm9tICcuL2FjdGlvbnMvc3RvcERpY3RhdGUnO1xuaW1wb3J0IHN0b3BTcGVha2luZ0FjdGl2aXR5IGZyb20gJy4vYWN0aW9ucy9zdG9wU3BlYWtpbmdBY3Rpdml0eSc7XG5pbXBvcnQgc3VibWl0U2VuZEJveCBmcm9tICcuL2FjdGlvbnMvc3VibWl0U2VuZEJveCc7XG5cbmltcG9ydCAqIGFzIEFjdGl2aXR5Q2xpZW50U3RhdGUgZnJvbSAnLi9jb25zdGFudHMvQWN0aXZpdHlDbGllbnRTdGF0ZSc7XG5pbXBvcnQgKiBhcyBEaWN0YXRlU3RhdGUgZnJvbSAnLi9jb25zdGFudHMvRGljdGF0ZVN0YXRlJztcblxuY29uc3QgQ29uc3RhbnRzID0geyBBY3Rpdml0eUNsaWVudFN0YXRlLCBEaWN0YXRlU3RhdGUgfTtcbmNvbnN0IHZlcnNpb24gPSBWRVJTSU9OO1xuXG5leHBvcnQge1xuICBjb25uZWN0LFxuICBDb25zdGFudHMsXG4gIGNyZWF0ZVN0b3JlLFxuICBkaXNjb25uZWN0LFxuICBtYXJrQWN0aXZpdHksXG4gIHBvc3RBY3Rpdml0eSxcbiAgc2VuZEV2ZW50LFxuICBzZW5kRmlsZXMsXG4gIHNlbmRNZXNzYWdlLFxuICBzZW5kTWVzc2FnZUJhY2ssXG4gIHNlbmRQb3N0QmFjayxcbiAgc2V0RGljdGF0ZUludGVyaW1zLFxuICBzZXREaWN0YXRlU3RhdGUsXG4gIHNldExhbmd1YWdlLFxuICBzZXRTZW5kQm94LFxuICBzZXRTZW5kVGltZW91dCxcbiAgc2V0U2VuZFR5cGluZ0luZGljYXRvcixcbiAgc3RhcnREaWN0YXRlLFxuICBzdGFydFNwZWFraW5nQWN0aXZpdHksXG4gIHN0b3BEaWN0YXRlLFxuICBzdG9wU3BlYWtpbmdBY3Rpdml0eSxcbiAgc3VibWl0U2VuZEJveCxcbiAgdmVyc2lvbixcblxuICAvLyBUT0RPOiBbUDNdIFRha2UgdGhpcyBkZXByZWNhdGlvbiBjb2RlIG91dCB3aGVuIHJlbGVhc2luZyBvbiBvciBhZnRlciBKYW51YXJ5IDEzIDIwMjAgXG4gIHNldFNlbmRUeXBpbmdcbn1cbiJdfQ==

lib/reducer.d.ts

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

lib/reducer.js

@@ -14,2 +14,4 @@ "use strict";
 
+var _connectivityStatus = _interopRequireDefault(require("./reducers/connectivityStatus"));
+
 var _dictateInterims = _interopRequireDefault(require("./reducers/dictateInterims"));
@@ -29,2 +31,4 @@
 
+var _sendTypingIndicator = _interopRequireDefault(require("./reducers/sendTypingIndicator"));
+
 var _suggestedActions = _interopRequireDefault(require("./reducers/suggestedActions"));
@@ -34,2 +38,3 @@
   activities: _activities.default,
+  connectivityStatus: _connectivityStatus.default,
   dictateInterims: _dictateInterims.default,
@@ -42,6 +47,9 @@ dictateState: _dictateState.default,
   sendTimeout: _sendTimeout.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,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZWR1Y2VyLnRzIl0sIm5hbWVzIjpbImFjdGl2aXRpZXMiLCJkaWN0YXRlSW50ZXJpbXMiLCJkaWN0YXRlU3RhdGUiLCJsYW5ndWFnZSIsInJlYWR5U3RhdGUiLCJyZWZlcmVuY2VHcmFtbWFySUQiLCJzZW5kQm94VmFsdWUiLCJzZW5kVGltZW91dCIsInN1Z2dlc3RlZEFjdGlvbnMiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBOztBQUVBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztlQUVlLDRCQUFnQjtBQUM3QkEsRUFBQUEsVUFBVSxFQUFWQSxtQkFENkI7QUFFN0JDLEVBQUFBLGVBQWUsRUFBZkEsd0JBRjZCO0FBRzdCQyxFQUFBQSxZQUFZLEVBQVpBLHFCQUg2QjtBQUk3QkMsRUFBQUEsUUFBUSxFQUFSQSxpQkFKNkI7QUFLN0JDLEVBQUFBLFVBQVUsRUFBVkEsbUJBTDZCO0FBTTdCQyxFQUFBQSxrQkFBa0IsRUFBbEJBLDJCQU42QjtBQU83QkMsRUFBQUEsWUFBWSxFQUFaQSxxQkFQNkI7QUFRN0JDLEVBQUFBLFdBQVcsRUFBWEEsb0JBUjZCO0FBUzdCQyxFQUFBQSxnQkFBZ0IsRUFBaEJBO0FBVDZCLENBQWhCLEMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjb21iaW5lUmVkdWNlcnMgfSBmcm9tICdyZWR1eCc7XG5cbmltcG9ydCBhY3Rpdml0aWVzIGZyb20gJy4vcmVkdWNlcnMvYWN0aXZpdGllcyc7XG5pbXBvcnQgZGljdGF0ZUludGVyaW1zIGZyb20gJy4vcmVkdWNlcnMvZGljdGF0ZUludGVyaW1zJztcbmltcG9ydCBkaWN0YXRlU3RhdGUgZnJvbSAnLi9yZWR1Y2Vycy9kaWN0YXRlU3RhdGUnO1xuaW1wb3J0IGxhbmd1YWdlIGZyb20gJy4vcmVkdWNlcnMvbGFuZ3VhZ2UnO1xuaW1wb3J0IHJlYWR5U3RhdGUgZnJvbSAnLi9yZWR1Y2Vycy9yZWFkeVN0YXRlJztcbmltcG9ydCByZWZlcmVuY2VHcmFtbWFySUQgZnJvbSAnLi9yZWR1Y2Vycy9yZWZlcmVuY2VHcmFtbWFySUQnO1xuaW1wb3J0IHNlbmRCb3hWYWx1ZSBmcm9tICcuL3JlZHVjZXJzL3NlbmRCb3hWYWx1ZSc7XG5pbXBvcnQgc2VuZFRpbWVvdXQgZnJvbSAnLi9yZWR1Y2Vycy9zZW5kVGltZW91dCc7XG5pbXBvcnQgc3VnZ2VzdGVkQWN0aW9ucyBmcm9tICcuL3JlZHVjZXJzL3N1Z2dlc3RlZEFjdGlvbnMnO1xuXG5leHBvcnQgZGVmYXVsdCBjb21iaW5lUmVkdWNlcnMoe1xuICBhY3Rpdml0aWVzLFxuICBkaWN0YXRlSW50ZXJpbXMsXG4gIGRpY3RhdGVTdGF0ZSxcbiAgbGFuZ3VhZ2UsXG4gIHJlYWR5U3RhdGUsXG4gIHJlZmVyZW5jZUdyYW1tYXJJRCxcbiAgc2VuZEJveFZhbHVlLFxuICBzZW5kVGltZW91dCxcbiAgc3VnZ2VzdGVkQWN0aW9uc1xufSlcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZWR1Y2VyLnRzIl0sIm5hbWVzIjpbImFjdGl2aXRpZXMiLCJjb25uZWN0aXZpdHlTdGF0dXMiLCJkaWN0YXRlSW50ZXJpbXMiLCJkaWN0YXRlU3RhdGUiLCJsYW5ndWFnZSIsInJlYWR5U3RhdGUiLCJyZWZlcmVuY2VHcmFtbWFySUQiLCJzZW5kQm94VmFsdWUiLCJzZW5kVGltZW91dCIsInNlbmRUeXBpbmdJbmRpY2F0b3IiLCJzdWdnZXN0ZWRBY3Rpb25zIiwic2VuZFR5cGluZyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUE7O0FBRUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O2VBRWUsNEJBQWdCO0FBQzdCQSxFQUFBQSxVQUFVLEVBQVZBLG1CQUQ2QjtBQUU3QkMsRUFBQUEsa0JBQWtCLEVBQWxCQSwyQkFGNkI7QUFHN0JDLEVBQUFBLGVBQWUsRUFBZkEsd0JBSDZCO0FBSTdCQyxFQUFBQSxZQUFZLEVBQVpBLHFCQUo2QjtBQUs3QkMsRUFBQUEsUUFBUSxFQUFSQSxpQkFMNkI7QUFNN0JDLEVBQUFBLFVBQVUsRUFBVkEsbUJBTjZCO0FBTzdCQyxFQUFBQSxrQkFBa0IsRUFBbEJBLDJCQVA2QjtBQVE3QkMsRUFBQUEsWUFBWSxFQUFaQSxxQkFSNkI7QUFTN0JDLEVBQUFBLFdBQVcsRUFBWEEsb0JBVDZCO0FBVTdCQyxFQUFBQSxtQkFBbUIsRUFBbkJBLDRCQVY2QjtBQVc3QkMsRUFBQUEsZ0JBQWdCLEVBQWhCQSx5QkFYNkI7QUFhN0I7QUFDQUMsRUFBQUEsVUFBVSxFQUFFRjtBQWRpQixDQUFoQixDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgY29tYmluZVJlZHVjZXJzIH0gZnJvbSAncmVkdXgnO1xuXG5pbXBvcnQgYWN0aXZpdGllcyBmcm9tICcuL3JlZHVjZXJzL2FjdGl2aXRpZXMnO1xuaW1wb3J0IGNvbm5lY3Rpdml0eVN0YXR1cyBmcm9tICcuL3JlZHVjZXJzL2Nvbm5lY3Rpdml0eVN0YXR1cydcbmltcG9ydCBkaWN0YXRlSW50ZXJpbXMgZnJvbSAnLi9yZWR1Y2Vycy9kaWN0YXRlSW50ZXJpbXMnO1xuaW1wb3J0IGRpY3RhdGVTdGF0ZSBmcm9tICcuL3JlZHVjZXJzL2RpY3RhdGVTdGF0ZSc7XG5pbXBvcnQgbGFuZ3VhZ2UgZnJvbSAnLi9yZWR1Y2Vycy9sYW5ndWFnZSc7XG5pbXBvcnQgcmVhZHlTdGF0ZSBmcm9tICcuL3JlZHVjZXJzL3JlYWR5U3RhdGUnO1xuaW1wb3J0IHJlZmVyZW5jZUdyYW1tYXJJRCBmcm9tICcuL3JlZHVjZXJzL3JlZmVyZW5jZUdyYW1tYXJJRCc7XG5pbXBvcnQgc2VuZEJveFZhbHVlIGZyb20gJy4vcmVkdWNlcnMvc2VuZEJveFZhbHVlJztcbmltcG9ydCBzZW5kVGltZW91dCBmcm9tICcuL3JlZHVjZXJzL3NlbmRUaW1lb3V0JztcbmltcG9ydCBzZW5kVHlwaW5nSW5kaWNhdG9yIGZyb20gJy4vcmVkdWNlcnMvc2VuZFR5cGluZ0luZGljYXRvcic7XG5pbXBvcnQgc3VnZ2VzdGVkQWN0aW9ucyBmcm9tICcuL3JlZHVjZXJzL3N1Z2dlc3RlZEFjdGlvbnMnO1xuXG5leHBvcnQgZGVmYXVsdCBjb21iaW5lUmVkdWNlcnMoe1xuICBhY3Rpdml0aWVzLFxuICBjb25uZWN0aXZpdHlTdGF0dXMsXG4gIGRpY3RhdGVJbnRlcmltcyxcbiAgZGljdGF0ZVN0YXRlLFxuICBsYW5ndWFnZSxcbiAgcmVhZHlTdGF0ZSxcbiAgcmVmZXJlbmNlR3JhbW1hcklELFxuICBzZW5kQm94VmFsdWUsXG4gIHNlbmRUaW1lb3V0LFxuICBzZW5kVHlwaW5nSW5kaWNhdG9yLFxuICBzdWdnZXN0ZWRBY3Rpb25zLFxuXG4gIC8vIFRPRE86IFtQM10gVGFrZSB0aGlzIGRlcHJlY2F0aW9uIGNvZGUgb3V0IHdoZW4gcmVsZWFzaW5nIG9uIG9yIGFmdGVyIEphbnVhcnkgMTMgMjAyMFxuICBzZW5kVHlwaW5nOiBzZW5kVHlwaW5nSW5kaWNhdG9yXG59KVxuIl19

lib/reducers/activities.js

@@ -43,3 +43,10 @@ "use strict";
   _nextActivity$from = _nextActivity$from === void 0 ? {} : _nextActivity$from;
-  var nextFromID = _nextActivity$from.id;
+  var nextFromID = _nextActivity$from.id,
+      nextFromRole = _nextActivity$from.role,
+      nextType = nextActivity.type;
+
+  if (nextType === 'typing' && nextFromRole === 'user') {
+    return activities;
+  }
+
   var nextTimestamp = Date.parse(nextActivity.timestamp);
@@ -138,2 +145,2 @@ var nextActivities = activities.filter(function (_ref2) {
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/reducers/activities.js"],"names":["DEFAULT_STATE","getClientActivityID","channelData","clientActivityID","findByClientActivityID","activity","upsertActivityWithSort","activities","nextActivity","nextClientActivityID","from","nextFromID","id","nextTimestamp","Date","parse","timestamp","nextActivities","filter","type","indexToInsert","findIndex","state","SENDING","SEND_FAILED","splice","length","meta","payload","DELETE_ACTIVITY","activityID","MARK_ACTIVITY","name","value","POST_ACTIVITY_PENDING","POST_ACTIVITY_REJECTED","POST_ACTIVITY_FULFILLED","SENT","INCOMING_ACTIVITY"],"mappings":"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","sourcesContent":["import updateIn from 'simple-update-in';\n\nimport { DELETE_ACTIVITY } from '../actions/deleteActivity';\nimport { INCOMING_ACTIVITY } from '../actions/incomingActivity';\nimport { MARK_ACTIVITY } from '../actions/markActivity';\n\nimport {\n  POST_ACTIVITY_FULFILLED,\n  POST_ACTIVITY_PENDING,\n  POST_ACTIVITY_REJECTED\n} from '../actions/postActivity';\n\nimport { SEND_FAILED, SENDING, SENT } from '../constants/ActivityClientState';\n\nconst DEFAULT_STATE = [];\n\nfunction getClientActivityID({ channelData: { clientActivityID } = {} }) {\n  return clientActivityID;\n}\n\nfunction findByClientActivityID(clientActivityID) {\n  return activity => getClientActivityID(activity) === clientActivityID;\n}\n\nfunction upsertActivityWithSort(activities, nextActivity) {\n  const {\n    channelData: { clientActivityID: nextClientActivityID } = {},\n    from: { id: nextFromID } = {}\n  } = nextActivity;\n\n  const nextTimestamp = Date.parse(nextActivity.timestamp);\n  const nextActivities = activities.filter(({ channelData: { clientActivityID } = {}, from, type }) =>\n    // We will remove all \"typing\" and \"sending messages\" activities\n    // \"clientActivityID\" is unique and used to track if the message has been sent and echoed back from the server\n    !(\n      (type === 'typing' && from.id === nextFromID)\n      || (nextClientActivityID && clientActivityID === nextClientActivityID)\n    )\n  );\n\n  // Then, find the right (sorted) place to insert the new activity at, based on timestamp, and must be before \"typing\"\n  // Since clockskew might happen, we will ignore timestamp on messages that are sending\n  // If we are inserting \"typing\", we will always append it\n\n  // TODO: [P4] Move \"typing\" into Constants.ActivityType\n  const indexToInsert = nextActivity.type === 'typing' ? -1 : nextActivities.findIndex(({ channelData: { state } = {}, timestamp, type }) =>\n    (Date.parse(timestamp) > nextTimestamp && state !== SENDING && state !== SEND_FAILED) || type === 'typing'\n  );\n\n  // If no right place are found, append it\n  nextActivities.splice(~indexToInsert ? indexToInsert : nextActivities.length, 0, nextActivity);\n\n  return nextActivities;\n}\n\nexport default function (state = DEFAULT_STATE, { meta, payload, type }) {\n  switch (type) {\n    case DELETE_ACTIVITY:\n      state = updateIn(state, [({ id }) => id === payload.activityID]);\n      break;\n\n    case MARK_ACTIVITY:\n      state = updateIn(state, [({ id }) => id === payload.activityID, 'channelData', payload.name], () => payload.value);\n      break;\n\n    case POST_ACTIVITY_PENDING:\n      state = upsertActivityWithSort(state, updateIn(payload.activity, ['channelData', 'state'], () => SENDING));\n      break;\n\n    case POST_ACTIVITY_REJECTED:\n      state = updateIn(state, [findByClientActivityID(meta.clientActivityID), 'channelData', 'state'], () => SEND_FAILED);\n      break;\n\n    case POST_ACTIVITY_FULFILLED:\n      state = updateIn(state, [findByClientActivityID(meta.clientActivityID)], activity =>\n        // We will replace the activity with the version from the server\n        updateIn(payload.activity, ['channelData', 'state'], () => SENT)\n      );\n\n      break;\n\n    case INCOMING_ACTIVITY:\n      // UpdateActivity is not supported right now because we ignore duplicated activity ID\n      if (!~state.findIndex(({ id }) => id === payload.activity.id)) {\n        state = upsertActivityWithSort(state, payload.activity);\n      }\n\n      break;\n\n    default: break;\n  }\n\n  return state;\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/reducers/activities.js"],"names":["DEFAULT_STATE","getClientActivityID","channelData","clientActivityID","findByClientActivityID","activity","upsertActivityWithSort","activities","nextActivity","nextClientActivityID","from","nextFromID","id","nextFromRole","role","nextType","type","nextTimestamp","Date","parse","timestamp","nextActivities","filter","indexToInsert","findIndex","state","SENDING","SEND_FAILED","splice","length","meta","payload","DELETE_ACTIVITY","activityID","MARK_ACTIVITY","name","value","POST_ACTIVITY_PENDING","POST_ACTIVITY_REJECTED","POST_ACTIVITY_FULFILLED","SENT","INCOMING_ACTIVITY"],"mappings":";;;;;;;;;AAAA;;AAEA;;AACA;;AACA;;AAEA;;AAMA;;AAEA,IAAMA,aAAa,GAAG,EAAtB;;AAEA,SAASC,mBAAT,OAAyE;AAAA,8BAA1CC,WAA0C;AAAA,mDAAN,EAAM;AAAA,MAA3BC,gBAA2B,oBAA3BA,gBAA2B;AACvE,SAAOA,gBAAP;AACD;;AAED,SAASC,sBAAT,CAAgCD,gBAAhC,EAAkD;AAChD,SAAO,UAAAE,QAAQ;AAAA,WAAIJ,mBAAmB,CAACI,QAAD,CAAnB,KAAkCF,gBAAtC;AAAA,GAAf;AACD;;AAED,SAASG,sBAAT,CAAgCC,UAAhC,EAA4CC,YAA5C,EAA0D;AAAA,8BAKpDA,YALoD,CAEtDN,WAFsD;AAAA,6DAEI,EAFJ;AAAA,MAErBO,oBAFqB,yBAEvCN,gBAFuC;AAAA,2BAKpDK,YALoD,CAGtDE,IAHsD;AAAA,uDAGP,EAHO;AAAA,MAG1CC,UAH0C,sBAG9CC,EAH8C;AAAA,MAGxBC,YAHwB,sBAG9BC,IAH8B;AAAA,MAIhDC,QAJgD,GAKpDP,YALoD,CAItDQ,IAJsD;;AAOxD,MAAID,QAAQ,KAAK,QAAb,IAAyBF,YAAY,KAAK,MAA9C,EAAsD;AACpD,WAAON,UAAP;AACD;;AAED,MAAMU,aAAa,GAAGC,IAAI,CAACC,KAAL,CAAWX,YAAY,CAACY,SAAxB,CAAtB;AACA,MAAMC,cAAc,GAAGd,UAAU,CAACe,MAAX,CAAkB;AAAA,kCAAGpB,WAAH;AAAA,uDAAuC,EAAvC;AAAA,QAAkBC,gBAAlB,qBAAkBA,gBAAlB;AAAA,QAA2CO,IAA3C,SAA2CA,IAA3C;AAAA,QAAiDM,IAAjD,SAAiDA,IAAjD;AAAA,WACvC;AACA;AACA,QACGA,IAAI,KAAK,QAAT,IAAqBN,IAAI,CAACE,EAAL,KAAYD,UAAlC,IACIF,oBAAoB,IAAIN,gBAAgB,KAAKM,oBAFnD;AAHuC;AAAA,GAAlB,CAAvB,CAZwD,CAqBxD;AACA;AACA;AAEA;;AACA,MAAMc,aAAa,GAAGf,YAAY,CAACQ,IAAb,KAAsB,QAAtB,GAAiC,CAAC,CAAlC,GAAsCK,cAAc,CAACG,SAAf,CAAyB;AAAA,kCAAGtB,WAAH;AAAA,uDAA4B,EAA5B;AAAA,QAAkBuB,KAAlB,qBAAkBA,KAAlB;AAAA,QAAgCL,SAAhC,SAAgCA,SAAhC;AAAA,QAA2CJ,IAA3C,SAA2CA,IAA3C;AAAA,WAClFE,IAAI,CAACC,KAAL,CAAWC,SAAX,IAAwBH,aAAxB,IAAyCQ,KAAK,KAAKC,4BAAnD,IAA8DD,KAAK,KAAKE,gCAAzE,IAAyFX,IAAI,KAAK,QADf;AAAA,GAAzB,CAA5D,CA1BwD,CA8BxD;;AACAK,EAAAA,cAAc,CAACO,MAAf,CAAsB,CAACL,aAAD,GAAiBA,aAAjB,GAAiCF,cAAc,CAACQ,MAAtE,EAA8E,CAA9E,EAAiFrB,YAAjF;AAEA,SAAOa,cAAP;AACD;;AAEc,oBAA0D;AAAA,MAAhDI,KAAgD,uEAAxCzB,aAAwC;;AAAA;AAAA,MAAvB8B,IAAuB,SAAvBA,IAAuB;AAAA,MAAjBC,OAAiB,SAAjBA,OAAiB;AAAA,MAARf,IAAQ,SAARA,IAAQ;;AACvE,UAAQA,IAAR;AACE,SAAKgB,+BAAL;AACEP,MAAAA,KAAK,GAAG,6BAASA,KAAT,EAAgB,CAAC;AAAA,YAAGb,EAAH,SAAGA,EAAH;AAAA,eAAYA,EAAE,KAAKmB,OAAO,CAACE,UAA3B;AAAA,OAAD,CAAhB,CAAR;AACA;;AAEF,SAAKC,2BAAL;AACET,MAAAA,KAAK,GAAG,6BAASA,KAAT,EAAgB,CAAC;AAAA,YAAGb,EAAH,SAAGA,EAAH;AAAA,eAAYA,EAAE,KAAKmB,OAAO,CAACE,UAA3B;AAAA,OAAD,EAAwC,aAAxC,EAAuDF,OAAO,CAACI,IAA/D,CAAhB,EAAsF;AAAA,eAAMJ,OAAO,CAACK,KAAd;AAAA,OAAtF,CAAR;AACA;;AAEF,SAAKC,mCAAL;AACEZ,MAAAA,KAAK,GAAGnB,sBAAsB,CAACmB,KAAD,EAAQ,6BAASM,OAAO,CAAC1B,QAAjB,EAA2B,CAAC,aAAD,EAAgB,OAAhB,CAA3B,EAAqD;AAAA,eAAMqB,4BAAN;AAAA,OAArD,CAAR,CAA9B;AACA;;AAEF,SAAKY,oCAAL;AACEb,MAAAA,KAAK,GAAG,6BAASA,KAAT,EAAgB,CAACrB,sBAAsB,CAAC0B,IAAI,CAAC3B,gBAAN,CAAvB,EAAgD,aAAhD,EAA+D,OAA/D,CAAhB,EAAyF;AAAA,eAAMwB,gCAAN;AAAA,OAAzF,CAAR;AACA;;AAEF,SAAKY,qCAAL;AACEd,MAAAA,KAAK,GAAG,6BAASA,KAAT,EAAgB,CAACrB,sBAAsB,CAAC0B,IAAI,CAAC3B,gBAAN,CAAvB,CAAhB,EAAiE,UAAAE,QAAQ;AAAA,eAC/E;AACA,uCAAS0B,OAAO,CAAC1B,QAAjB,EAA2B,CAAC,aAAD,EAAgB,OAAhB,CAA3B,EAAqD;AAAA,mBAAMmC,yBAAN;AAAA,WAArD;AAF+E;AAAA,OAAzE,CAAR;AAKA;;AAEF,SAAKC,mCAAL;AACE;AACA,UAAI,CAAC,CAAChB,KAAK,CAACD,SAAN,CAAgB;AAAA,YAAGZ,EAAH,SAAGA,EAAH;AAAA,eAAYA,EAAE,KAAKmB,OAAO,CAAC1B,QAAR,CAAiBO,EAApC;AAAA,OAAhB,CAAN,EAA+D;AAC7Da,QAAAA,KAAK,GAAGnB,sBAAsB,CAACmB,KAAD,EAAQM,OAAO,CAAC1B,QAAhB,CAA9B;AACD;;AAED;;AAEF;AAAS;AAjCX;;AAoCA,SAAOoB,KAAP;AACD","sourcesContent":["import updateIn from 'simple-update-in';\n\nimport { DELETE_ACTIVITY } from '../actions/deleteActivity';\nimport { INCOMING_ACTIVITY } from '../actions/incomingActivity';\nimport { MARK_ACTIVITY } from '../actions/markActivity';\n\nimport {\n  POST_ACTIVITY_FULFILLED,\n  POST_ACTIVITY_PENDING,\n  POST_ACTIVITY_REJECTED\n} from '../actions/postActivity';\n\nimport { SEND_FAILED, SENDING, SENT } from '../constants/ActivityClientState';\n\nconst DEFAULT_STATE = [];\n\nfunction getClientActivityID({ channelData: { clientActivityID } = {} }) {\n  return clientActivityID;\n}\n\nfunction findByClientActivityID(clientActivityID) {\n  return activity => getClientActivityID(activity) === clientActivityID;\n}\n\nfunction upsertActivityWithSort(activities, nextActivity) {\n  const {\n    channelData: { clientActivityID: nextClientActivityID } = {},\n    from: { id: nextFromID, role: nextFromRole } = {},\n    type: nextType\n  } = nextActivity;\n\n  if (nextType === 'typing' && nextFromRole === 'user') {\n    return activities;\n  }\n\n  const nextTimestamp = Date.parse(nextActivity.timestamp);\n  const nextActivities = activities.filter(({ channelData: { clientActivityID } = {}, from, type }) =>\n    // We will remove all \"typing\" and \"sending messages\" activities\n    // \"clientActivityID\" is unique and used to track if the message has been sent and echoed back from the server\n    !(\n      (type === 'typing' && from.id === nextFromID)\n      || (nextClientActivityID && clientActivityID === nextClientActivityID)\n    )\n  );\n\n  // Then, find the right (sorted) place to insert the new activity at, based on timestamp, and must be before \"typing\"\n  // Since clockskew might happen, we will ignore timestamp on messages that are sending\n  // If we are inserting \"typing\", we will always append it\n\n  // TODO: [P4] Move \"typing\" into Constants.ActivityType\n  const indexToInsert = nextActivity.type === 'typing' ? -1 : nextActivities.findIndex(({ channelData: { state } = {}, timestamp, type }) =>\n    (Date.parse(timestamp) > nextTimestamp && state !== SENDING && state !== SEND_FAILED) || type === 'typing'\n  );\n\n  // If no right place are found, append it\n  nextActivities.splice(~indexToInsert ? indexToInsert : nextActivities.length, 0, nextActivity);\n\n  return nextActivities;\n}\n\nexport default function (state = DEFAULT_STATE, { meta, payload, type }) {\n  switch (type) {\n    case DELETE_ACTIVITY:\n      state = updateIn(state, [({ id }) => id === payload.activityID]);\n      break;\n\n    case MARK_ACTIVITY:\n      state = updateIn(state, [({ id }) => id === payload.activityID, 'channelData', payload.name], () => payload.value);\n      break;\n\n    case POST_ACTIVITY_PENDING:\n      state = upsertActivityWithSort(state, updateIn(payload.activity, ['channelData', 'state'], () => SENDING));\n      break;\n\n    case POST_ACTIVITY_REJECTED:\n      state = updateIn(state, [findByClientActivityID(meta.clientActivityID), 'channelData', 'state'], () => SEND_FAILED);\n      break;\n\n    case POST_ACTIVITY_FULFILLED:\n      state = updateIn(state, [findByClientActivityID(meta.clientActivityID)], activity =>\n        // We will replace the activity with the version from the server\n        updateIn(payload.activity, ['channelData', 'state'], () => SENT)\n      );\n\n      break;\n\n    case INCOMING_ACTIVITY:\n      // UpdateActivity is not supported right now because we ignore duplicated activity ID\n      if (!~state.findIndex(({ id }) => id === payload.activity.id)) {\n        state = upsertActivityWithSort(state, payload.activity);\n      }\n\n      break;\n\n    default: break;\n  }\n\n  return state;\n}\n"]}

lib/sagas.js

@@ -20,10 +20,18 @@ "use strict";
 
+var _detectSlowConnectionSaga = _interopRequireDefault(require("./sagas/detectSlowConnectionSaga"));
+
 var _incomingActivitySaga = _interopRequireDefault(require("./sagas/incomingActivitySaga"));
 
-var _incomingTypingSaga = _interopRequireDefault(require("./sagas/incomingTypingSaga"));
+var _markActivityForSpeakOnIncomingActivityFromOthersSaga = _interopRequireDefault(require("./sagas/markActivityForSpeakOnIncomingActivityFromOthersSaga"));
 
-var _markActivityForSpeakSaga = _interopRequireDefault(require("./sagas/markActivityForSpeakSaga"));
+var _markAllAsSpokenOnStopSpeakActivitySaga = _interopRequireDefault(require("./sagas/markAllAsSpokenOnStopSpeakActivitySaga"));
 
 var _postActivitySaga = _interopRequireDefault(require("./sagas/postActivitySaga"));
 
+var _removeIncomingTypingAfterIntervalSaga = _interopRequireDefault(require("./sagas/removeIncomingTypingAfterIntervalSaga"));
+
+var _sendConversationUpdateOnConnectSaga = _interopRequireDefault(require("./sagas/sendConversationUpdateOnConnectSaga"));
+
+var _sendEventToPostActivitySaga = _interopRequireDefault(require("./sagas/sendEventToPostActivitySaga"));
+
 var _sendFilesToPostActivitySaga = _interopRequireDefault(require("./sagas/sendFilesToPostActivitySaga"));
@@ -33,12 +41,16 @@
 
+var _sendMessageBackToPostActivitySaga = _interopRequireDefault(require("./sagas/sendMessageBackToPostActivitySaga"));
+
 var _sendPostBackToPostActivitySaga = _interopRequireDefault(require("./sagas/sendPostBackToPostActivitySaga"));
 
-var _sendTypingOnSetSendBoxSaga = _interopRequireDefault(require("./sagas/sendTypingOnSetSendBoxSaga"));
+var _sendTypingIndicatorOnSetSendBoxSaga = _interopRequireDefault(require("./sagas/sendTypingIndicatorOnSetSendBoxSaga"));
 
 var _startDictateAfterSpeakActivitySaga = _interopRequireDefault(require("./sagas/startDictateAfterSpeakActivitySaga"));
 
-var _stopDictateOnCardAction = _interopRequireDefault(require("./sagas/stopDictateOnCardAction"));
+var _startSpeakActivityOnPostActivitySaga = _interopRequireDefault(require("./sagas/startSpeakActivityOnPostActivitySaga"));
 
-var _stopSpeakActivityOnInputSaga = _interopRequireDefault(require("./sagas/stopSpeakActivityOnInputSaga"));
+var _stopDictateOnCardActionSaga = _interopRequireDefault(require("./sagas/stopDictateOnCardActionSaga"));
 
+var _stopSpeakingActivityOnInputSaga = _interopRequireDefault(require("./sagas/stopSpeakingActivityOnInputSaga"));
+
 var _submitSendBoxSaga = _interopRequireDefault(require("./sagas/submitSendBoxSaga"));
@@ -68,49 +80,73 @@
           _context.next = 8;
-          return (0, _effects.fork)(_incomingActivitySaga.default);
+          return (0, _effects.fork)(_detectSlowConnectionSaga.default);
 
         case 8:
           _context.next = 10;
-          return (0, _effects.fork)(_incomingTypingSaga.default);
+          return (0, _effects.fork)(_incomingActivitySaga.default);
 
         case 10:
           _context.next = 12;
-          return (0, _effects.fork)(_markActivityForSpeakSaga.default);
+          return (0, _effects.fork)(_markActivityForSpeakOnIncomingActivityFromOthersSaga.default);
 
         case 12:
           _context.next = 14;
-          return (0, _effects.fork)(_postActivitySaga.default);
+          return (0, _effects.fork)(_markAllAsSpokenOnStopSpeakActivitySaga.default);
 
         case 14:
           _context.next = 16;
-          return (0, _effects.fork)(_sendFilesToPostActivitySaga.default);
+          return (0, _effects.fork)(_postActivitySaga.default);
 
         case 16:
           _context.next = 18;
-          return (0, _effects.fork)(_sendMessageToPostActivitySaga.default);
+          return (0, _effects.fork)(_removeIncomingTypingAfterIntervalSaga.default);
 
         case 18:
           _context.next = 20;
-          return (0, _effects.fork)(_sendPostBackToPostActivitySaga.default);
+          return (0, _effects.fork)(_sendConversationUpdateOnConnectSaga.default);
 
         case 20:
           _context.next = 22;
-          return (0, _effects.fork)(_sendTypingOnSetSendBoxSaga.default);
+          return (0, _effects.fork)(_sendEventToPostActivitySaga.default);
 
         case 22:
           _context.next = 24;
-          return (0, _effects.fork)(_startDictateAfterSpeakActivitySaga.default);
+          return (0, _effects.fork)(_sendFilesToPostActivitySaga.default);
 
         case 24:
           _context.next = 26;
-          return (0, _effects.fork)(_stopDictateOnCardAction.default);
+          return (0, _effects.fork)(_sendMessageToPostActivitySaga.default);
 
         case 26:
           _context.next = 28;
-          return (0, _effects.fork)(_stopSpeakActivityOnInputSaga.default);
+          return (0, _effects.fork)(_sendMessageBackToPostActivitySaga.default);
 
         case 28:
           _context.next = 30;
+          return (0, _effects.fork)(_sendPostBackToPostActivitySaga.default);
+
+        case 30:
+          _context.next = 32;
+          return (0, _effects.fork)(_sendTypingIndicatorOnSetSendBoxSaga.default);
+
+        case 32:
+          _context.next = 34;
+          return (0, _effects.fork)(_startDictateAfterSpeakActivitySaga.default);
+
+        case 34:
+          _context.next = 36;
+          return (0, _effects.fork)(_startSpeakActivityOnPostActivitySaga.default);
+
+        case 36:
+          _context.next = 38;
+          return (0, _effects.fork)(_stopDictateOnCardActionSaga.default);
+
+        case 38:
+          _context.next = 40;
+          return (0, _effects.fork)(_stopSpeakingActivityOnInputSaga.default);
+
+        case 40:
+          _context.next = 42;
           return (0, _effects.fork)(_submitSendBoxSaga.default);
 
-        case 30:
+        case 42:
         case "end":
@@ -122,2 +158,2 @@ return _context.stop();
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9zYWdhcy5qcyJdLCJuYW1lcyI6WyJjbGVhclN1Z2dlc3RlZEFjdGlvbnNPblBvc3RBY3Rpdml0eVNhZ2EiLCJjb25uZWN0aW9uU3RhdHVzVXBkYXRlU2FnYSIsImNvbm5lY3RTYWdhIiwiaW5jb21pbmdBY3Rpdml0eVNhZ2EiLCJpbmNvbWluZ1R5cGluZ1NhZ2EiLCJtYXJrQWN0aXZpdHlGb3JTcGVha1NhZ2EiLCJwb3N0QWN0aXZpdHlTYWdhIiwic2VuZEZpbGVzVG9Qb3N0QWN0aXZpdHlTYWdhIiwic2VuZE1lc3NhZ2VUb1Bvc3RBY3Rpdml0eVNhZ2EiLCJzZW5kUG9zdEJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EiLCJzZW5kVHlwaW5nT25TZXRTZW5kQm94U2FnYSIsInN0YXJ0RGljdGF0ZUFmdGVyU3BlYWtBY3Rpdml0eVNhZ2EiLCJzdG9wRGljdGF0ZU9uQ2FyZEFjdGlvbiIsInN0b3BTcGVha0FjdGl2aXR5T25JbnB1dFNhZ2EiLCJzdWJtaXRTZW5kQm94U2FnYSJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQTs7QUFFQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7Ozs7O0FBRWU7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ2IsaUJBQU0sbUJBQUtBLGdEQUFMLENBQU47O0FBRGE7QUFBQTtBQUViLGlCQUFNLG1CQUFLQyxtQ0FBTCxDQUFOOztBQUZhO0FBQUE7QUFHYixpQkFBTSxtQkFBS0Msb0JBQUwsQ0FBTjs7QUFIYTtBQUFBO0FBSWIsaUJBQU0sbUJBQUtDLDZCQUFMLENBQU47O0FBSmE7QUFBQTtBQUtiLGlCQUFNLG1CQUFLQywyQkFBTCxDQUFOOztBQUxhO0FBQUE7QUFNYixpQkFBTSxtQkFBS0MsaUNBQUwsQ0FBTjs7QUFOYTtBQUFBO0FBT2IsaUJBQU0sbUJBQUtDLHlCQUFMLENBQU47O0FBUGE7QUFBQTtBQVFiLGlCQUFNLG1CQUFLQyxvQ0FBTCxDQUFOOztBQVJhO0FBQUE7QUFTYixpQkFBTSxtQkFBS0Msc0NBQUwsQ0FBTjs7QUFUYTtBQUFBO0FBVWIsaUJBQU0sbUJBQUtDLHVDQUFMLENBQU47O0FBVmE7QUFBQTtBQVdiLGlCQUFNLG1CQUFLQyxtQ0FBTCxDQUFOOztBQVhhO0FBQUE7QUFZYixpQkFBTSxtQkFBS0MsMkNBQUwsQ0FBTjs7QUFaYTtBQUFBO0FBYWIsaUJBQU0sbUJBQUtDLGdDQUFMLENBQU47O0FBYmE7QUFBQTtBQWNiLGlCQUFNLG1CQUFLQyxxQ0FBTCxDQUFOOztBQWRhO0FBQUE7QUFlYixpQkFBTSxtQkFBS0MsMEJBQUwsQ0FBTjs7QUFmYTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZvcmsgfSBmcm9tICdyZWR1eC1zYWdhL2VmZmVjdHMnO1xuXG5pbXBvcnQgY2xlYXJTdWdnZXN0ZWRBY3Rpb25zT25Qb3N0QWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvY2xlYXJTdWdnZXN0ZWRBY3Rpb25zT25Qb3N0QWN0aXZpdHlTYWdhJztcbmltcG9ydCBjb25uZWN0aW9uU3RhdHVzVXBkYXRlU2FnYSBmcm9tICcuL3NhZ2FzL2Nvbm5lY3Rpb25TdGF0dXNVcGRhdGVTYWdhJztcbmltcG9ydCBjb25uZWN0U2FnYSBmcm9tICcuL3NhZ2FzL2Nvbm5lY3RTYWdhJztcbmltcG9ydCBpbmNvbWluZ0FjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL2luY29taW5nQWN0aXZpdHlTYWdhJztcbmltcG9ydCBpbmNvbWluZ1R5cGluZ1NhZ2EgZnJvbSAnLi9zYWdhcy9pbmNvbWluZ1R5cGluZ1NhZ2EnO1xuaW1wb3J0IG1hcmtBY3Rpdml0eUZvclNwZWFrU2FnYSBmcm9tICcuL3NhZ2FzL21hcmtBY3Rpdml0eUZvclNwZWFrU2FnYSc7XG5pbXBvcnQgcG9zdEFjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL3Bvc3RBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IHNlbmRGaWxlc1RvUG9zdEFjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL3NlbmRGaWxlc1RvUG9zdEFjdGl2aXR5U2FnYSc7XG5pbXBvcnQgc2VuZE1lc3NhZ2VUb1Bvc3RBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9zZW5kTWVzc2FnZVRvUG9zdEFjdGl2aXR5U2FnYSc7XG5pbXBvcnQgc2VuZFBvc3RCYWNrVG9Qb3N0QWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvc2VuZFBvc3RCYWNrVG9Qb3N0QWN0aXZpdHlTYWdhJztcbmltcG9ydCBzZW5kVHlwaW5nT25TZXRTZW5kQm94U2FnYSBmcm9tICcuL3NhZ2FzL3NlbmRUeXBpbmdPblNldFNlbmRCb3hTYWdhJztcbmltcG9ydCBzdGFydERpY3RhdGVBZnRlclNwZWFrQWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvc3RhcnREaWN0YXRlQWZ0ZXJTcGVha0FjdGl2aXR5U2FnYSc7XG5pbXBvcnQgc3RvcERpY3RhdGVPbkNhcmRBY3Rpb24gZnJvbSAnLi9zYWdhcy9zdG9wRGljdGF0ZU9uQ2FyZEFjdGlvbic7XG5pbXBvcnQgc3RvcFNwZWFrQWN0aXZpdHlPbklucHV0U2FnYSBmcm9tICcuL3NhZ2FzL3N0b3BTcGVha0FjdGl2aXR5T25JbnB1dFNhZ2EnO1xuaW1wb3J0IHN1Ym1pdFNlbmRCb3hTYWdhIGZyb20gJy4vc2FnYXMvc3VibWl0U2VuZEJveFNhZ2EnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiogKCkge1xuICB5aWVsZCBmb3JrKGNsZWFyU3VnZ2VzdGVkQWN0aW9uc09uUG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsoY29ubmVjdGlvblN0YXR1c1VwZGF0ZVNhZ2EpO1xuICB5aWVsZCBmb3JrKGNvbm5lY3RTYWdhKTtcbiAgeWllbGQgZm9yayhpbmNvbWluZ0FjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsoaW5jb21pbmdUeXBpbmdTYWdhKTtcbiAgeWllbGQgZm9yayhtYXJrQWN0aXZpdHlGb3JTcGVha1NhZ2EpO1xuICB5aWVsZCBmb3JrKHBvc3RBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKHNlbmRGaWxlc1RvUG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsoc2VuZE1lc3NhZ2VUb1Bvc3RBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKHNlbmRQb3N0QmFja1RvUG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsoc2VuZFR5cGluZ09uU2V0U2VuZEJveFNhZ2EpO1xuICB5aWVsZCBmb3JrKHN0YXJ0RGljdGF0ZUFmdGVyU3BlYWtBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKHN0b3BEaWN0YXRlT25DYXJkQWN0aW9uKTtcbiAgeWllbGQgZm9yayhzdG9wU3BlYWtBY3Rpdml0eU9uSW5wdXRTYWdhKTtcbiAgeWllbGQgZm9yayhzdWJtaXRTZW5kQm94U2FnYSk7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9zYWdhcy5qcyJdLCJuYW1lcyI6WyJjbGVhclN1Z2dlc3RlZEFjdGlvbnNPblBvc3RBY3Rpdml0eVNhZ2EiLCJjb25uZWN0aW9uU3RhdHVzVXBkYXRlU2FnYSIsImNvbm5lY3RTYWdhIiwiZGV0ZWN0U2xvd0Nvbm5lY3Rpb25TYWdhIiwiaW5jb21pbmdBY3Rpdml0eVNhZ2EiLCJtYXJrQWN0aXZpdHlGb3JTcGVha09uSW5jb21pbmdBY3Rpdml0eUZyb21PdGhlcnNTYWdhIiwibWFya0FsbEFzU3Bva2VuT25TdG9wU3BlYWtBY3Rpdml0eVNhZ2EiLCJwb3N0QWN0aXZpdHlTYWdhIiwicmVtb3ZlSW5jb21pbmdUeXBpbmdBZnRlckludGVydmFsU2FnYSIsInNlbmRDb252ZXJzYXRpb25VcGRhdGVPbkNvbm5lY3RTYWdhIiwic2VuZEV2ZW50VG9Qb3N0QWN0aXZpdHlTYWdhIiwic2VuZEZpbGVzVG9Qb3N0QWN0aXZpdHlTYWdhIiwic2VuZE1lc3NhZ2VUb1Bvc3RBY3Rpdml0eVNhZ2EiLCJzZW5kTWVzc2FnZUJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EiLCJzZW5kUG9zdEJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EiLCJzZW5kVHlwaW5nSW5kaWNhdG9yT25TZXRTZW5kQm94U2FnYSIsInN0YXJ0RGljdGF0ZUFmdGVyU3BlYWtBY3Rpdml0eVNhZ2EiLCJzdGFydFNwZWFrQWN0aXZpdHlPblBvc3RBY3Rpdml0eVNhZ2EiLCJzdG9wRGljdGF0ZU9uQ2FyZEFjdGlvblNhZ2EiLCJzdG9wU3BlYWtpbmdBY3Rpdml0eU9uSW5wdXRTYWdhIiwic3VibWl0U2VuZEJveFNhZ2EiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBRUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7Ozs7OztBQUVlO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNiLGlCQUFNLG1CQUFLQSxnREFBTCxDQUFOOztBQURhO0FBQUE7QUFFYixpQkFBTSxtQkFBS0MsbUNBQUwsQ0FBTjs7QUFGYTtBQUFBO0FBR2IsaUJBQU0sbUJBQUtDLG9CQUFMLENBQU47O0FBSGE7QUFBQTtBQUliLGlCQUFNLG1CQUFLQyxpQ0FBTCxDQUFOOztBQUphO0FBQUE7QUFLYixpQkFBTSxtQkFBS0MsNkJBQUwsQ0FBTjs7QUFMYTtBQUFBO0FBTWIsaUJBQU0sbUJBQUtDLDZEQUFMLENBQU47O0FBTmE7QUFBQTtBQU9iLGlCQUFNLG1CQUFLQywrQ0FBTCxDQUFOOztBQVBhO0FBQUE7QUFRYixpQkFBTSxtQkFBS0MseUJBQUwsQ0FBTjs7QUFSYTtBQUFBO0FBU2IsaUJBQU0sbUJBQUtDLDhDQUFMLENBQU47O0FBVGE7QUFBQTtBQVViLGlCQUFNLG1CQUFLQyw0Q0FBTCxDQUFOOztBQVZhO0FBQUE7QUFXYixpQkFBTSxtQkFBS0Msb0NBQUwsQ0FBTjs7QUFYYTtBQUFBO0FBWWIsaUJBQU0sbUJBQUtDLG9DQUFMLENBQU47O0FBWmE7QUFBQTtBQWFiLGlCQUFNLG1CQUFLQyxzQ0FBTCxDQUFOOztBQWJhO0FBQUE7QUFjYixpQkFBTSxtQkFBS0MsMENBQUwsQ0FBTjs7QUFkYTtBQUFBO0FBZWIsaUJBQU0sbUJBQUtDLHVDQUFMLENBQU47O0FBZmE7QUFBQTtBQWdCYixpQkFBTSxtQkFBS0MsNENBQUwsQ0FBTjs7QUFoQmE7QUFBQTtBQWlCYixpQkFBTSxtQkFBS0MsMkNBQUwsQ0FBTjs7QUFqQmE7QUFBQTtBQWtCYixpQkFBTSxtQkFBS0MsNkNBQUwsQ0FBTjs7QUFsQmE7QUFBQTtBQW1CYixpQkFBTSxtQkFBS0Msb0NBQUwsQ0FBTjs7QUFuQmE7QUFBQTtBQW9CYixpQkFBTSxtQkFBS0Msd0NBQUwsQ0FBTjs7QUFwQmE7QUFBQTtBQXFCYixpQkFBTSxtQkFBS0MsMEJBQUwsQ0FBTjs7QUFyQmE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmb3JrIH0gZnJvbSAncmVkdXgtc2FnYS9lZmZlY3RzJztcblxuaW1wb3J0IGNsZWFyU3VnZ2VzdGVkQWN0aW9uc09uUG9zdEFjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL2NsZWFyU3VnZ2VzdGVkQWN0aW9uc09uUG9zdEFjdGl2aXR5U2FnYSc7XG5pbXBvcnQgY29ubmVjdGlvblN0YXR1c1VwZGF0ZVNhZ2EgZnJvbSAnLi9zYWdhcy9jb25uZWN0aW9uU3RhdHVzVXBkYXRlU2FnYSc7XG5pbXBvcnQgY29ubmVjdFNhZ2EgZnJvbSAnLi9zYWdhcy9jb25uZWN0U2FnYSc7XG5pbXBvcnQgZGV0ZWN0U2xvd0Nvbm5lY3Rpb25TYWdhIGZyb20gJy4vc2FnYXMvZGV0ZWN0U2xvd0Nvbm5lY3Rpb25TYWdhJztcbmltcG9ydCBpbmNvbWluZ0FjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL2luY29taW5nQWN0aXZpdHlTYWdhJztcbmltcG9ydCBtYXJrQWN0aXZpdHlGb3JTcGVha09uSW5jb21pbmdBY3Rpdml0eUZyb21PdGhlcnNTYWdhIGZyb20gJy4vc2FnYXMvbWFya0FjdGl2aXR5Rm9yU3BlYWtPbkluY29taW5nQWN0aXZpdHlGcm9tT3RoZXJzU2FnYSc7XG5pbXBvcnQgbWFya0FsbEFzU3Bva2VuT25TdG9wU3BlYWtBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9tYXJrQWxsQXNTcG9rZW5PblN0b3BTcGVha0FjdGl2aXR5U2FnYSc7XG5pbXBvcnQgcG9zdEFjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL3Bvc3RBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IHJlbW92ZUluY29taW5nVHlwaW5nQWZ0ZXJJbnRlcnZhbFNhZ2EgZnJvbSAnLi9zYWdhcy9yZW1vdmVJbmNvbWluZ1R5cGluZ0FmdGVySW50ZXJ2YWxTYWdhJztcbmltcG9ydCBzZW5kQ29udmVyc2F0aW9uVXBkYXRlT25Db25uZWN0U2FnYSBmcm9tICcuL3NhZ2FzL3NlbmRDb252ZXJzYXRpb25VcGRhdGVPbkNvbm5lY3RTYWdhJztcbmltcG9ydCBzZW5kRXZlbnRUb1Bvc3RBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9zZW5kRXZlbnRUb1Bvc3RBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IHNlbmRGaWxlc1RvUG9zdEFjdGl2aXR5U2FnYSBmcm9tICcuL3NhZ2FzL3NlbmRGaWxlc1RvUG9zdEFjdGl2aXR5U2FnYSc7XG5pbXBvcnQgc2VuZE1lc3NhZ2VUb1Bvc3RBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9zZW5kTWVzc2FnZVRvUG9zdEFjdGl2aXR5U2FnYSc7XG5pbXBvcnQgc2VuZE1lc3NhZ2VCYWNrVG9Qb3N0QWN0aXZpdHlTYWdhIGZyb20gJy4vc2FnYXMvc2VuZE1lc3NhZ2VCYWNrVG9Qb3N0QWN0aXZpdHlTYWdhJztcbmltcG9ydCBzZW5kUG9zdEJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9zZW5kUG9zdEJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IHNlbmRUeXBpbmdJbmRpY2F0b3JPblNldFNlbmRCb3hTYWdhIGZyb20gJy4vc2FnYXMvc2VuZFR5cGluZ0luZGljYXRvck9uU2V0U2VuZEJveFNhZ2EnO1xuaW1wb3J0IHN0YXJ0RGljdGF0ZUFmdGVyU3BlYWtBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9zdGFydERpY3RhdGVBZnRlclNwZWFrQWN0aXZpdHlTYWdhJztcbmltcG9ydCBzdGFydFNwZWFrQWN0aXZpdHlPblBvc3RBY3Rpdml0eVNhZ2EgZnJvbSAnLi9zYWdhcy9zdGFydFNwZWFrQWN0aXZpdHlPblBvc3RBY3Rpdml0eVNhZ2EnO1xuaW1wb3J0IHN0b3BEaWN0YXRlT25DYXJkQWN0aW9uU2FnYSBmcm9tICcuL3NhZ2FzL3N0b3BEaWN0YXRlT25DYXJkQWN0aW9uU2FnYSc7XG5pbXBvcnQgc3RvcFNwZWFraW5nQWN0aXZpdHlPbklucHV0U2FnYSBmcm9tICcuL3NhZ2FzL3N0b3BTcGVha2luZ0FjdGl2aXR5T25JbnB1dFNhZ2EnO1xuaW1wb3J0IHN1Ym1pdFNlbmRCb3hTYWdhIGZyb20gJy4vc2FnYXMvc3VibWl0U2VuZEJveFNhZ2EnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiogKCkge1xuICB5aWVsZCBmb3JrKGNsZWFyU3VnZ2VzdGVkQWN0aW9uc09uUG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsoY29ubmVjdGlvblN0YXR1c1VwZGF0ZVNhZ2EpO1xuICB5aWVsZCBmb3JrKGNvbm5lY3RTYWdhKTtcbiAgeWllbGQgZm9yayhkZXRlY3RTbG93Q29ubmVjdGlvblNhZ2EpO1xuICB5aWVsZCBmb3JrKGluY29taW5nQWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhtYXJrQWN0aXZpdHlGb3JTcGVha09uSW5jb21pbmdBY3Rpdml0eUZyb21PdGhlcnNTYWdhKTtcbiAgeWllbGQgZm9yayhtYXJrQWxsQXNTcG9rZW5PblN0b3BTcGVha0FjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsocG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsocmVtb3ZlSW5jb21pbmdUeXBpbmdBZnRlckludGVydmFsU2FnYSk7XG4gIHlpZWxkIGZvcmsoc2VuZENvbnZlcnNhdGlvblVwZGF0ZU9uQ29ubmVjdFNhZ2EpO1xuICB5aWVsZCBmb3JrKHNlbmRFdmVudFRvUG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsoc2VuZEZpbGVzVG9Qb3N0QWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhzZW5kTWVzc2FnZVRvUG9zdEFjdGl2aXR5U2FnYSk7XG4gIHlpZWxkIGZvcmsoc2VuZE1lc3NhZ2VCYWNrVG9Qb3N0QWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhzZW5kUG9zdEJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKHNlbmRUeXBpbmdJbmRpY2F0b3JPblNldFNlbmRCb3hTYWdhKTtcbiAgeWllbGQgZm9yayhzdGFydERpY3RhdGVBZnRlclNwZWFrQWN0aXZpdHlTYWdhKTtcbiAgeWllbGQgZm9yayhzdGFydFNwZWFrQWN0aXZpdHlPblBvc3RBY3Rpdml0eVNhZ2EpO1xuICB5aWVsZCBmb3JrKHN0b3BEaWN0YXRlT25DYXJkQWN0aW9uU2FnYSk7XG4gIHlpZWxkIGZvcmsoc3RvcFNwZWFraW5nQWN0aXZpdHlPbklucHV0U2FnYSk7XG4gIHlpZWxkIGZvcmsoc3VibWl0U2VuZEJveFNhZ2EpO1xufVxuIl19

lib/sagas/clearSuggestedActionsOnPostActivitySaga.js

@@ -8,3 +8,3 @@ "use strict";
 });
-exports.default = _callee2;
+exports.default = _callee;
 
@@ -15,6 +15,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _whileConnected = _interopRequireDefault(require("./effects/whileConnected"));
+
 var _postActivity = require("../actions/postActivity");
 
-var _whileConnected = _interopRequireDefault(require("./effects/whileConnected"));
-
 var _setSuggestedActions = _interopRequireDefault(require("../actions/setSuggestedActions"));
@@ -24,47 +24,61 @@
 /*#__PURE__*/
-_regenerator.default.mark(_callee2);
+_regenerator.default.mark(_callee),
+    _marked2 =
+/*#__PURE__*/
+_regenerator.default.mark(clearSuggestedActionsOnPostActivity),
+    _marked3 =
+/*#__PURE__*/
+_regenerator.default.mark(clearSuggestedActions);
 
-function _callee2() {
-  return _regenerator.default.wrap(function _callee2$(_context2) {
+function _callee() {
+  return _regenerator.default.wrap(function _callee$(_context) {
     while (1) {
+      switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return (0, _whileConnected.default)(clearSuggestedActionsOnPostActivity);
+
+        case 2:
+        case "end":
+          return _context.stop();
+      }
+    }
+  }, _marked, this);
+}
+
+function clearSuggestedActionsOnPostActivity() {
+  return _regenerator.default.wrap(function clearSuggestedActionsOnPostActivity$(_context2) {
+    while (1) {
       switch (_context2.prev = _context2.next) {
         case 0:
           _context2.next = 2;
-          return (0, _whileConnected.default)(
-          /*#__PURE__*/
-          _regenerator.default.mark(function _callee() {
-            return _regenerator.default.wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.next = 2;
-                    return (0, _effects.take)(function (_ref) {
-                      var payload = _ref.payload,
-                          type = _ref.type;
-                      return type === _postActivity.POST_ACTIVITY_PENDING && payload.activity.type === 'message';
-                    });
+          return (0, _effects.takeEvery)(function (_ref) {
+            var payload = _ref.payload,
+                type = _ref.type;
+            return type === _postActivity.POST_ACTIVITY_PENDING && payload.activity.type === 'message';
+          }, clearSuggestedActions);
 
-                  case 2:
-                    _context.next = 4;
-                    return (0, _effects.put)((0, _setSuggestedActions.default)());
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }
+  }, _marked2, this);
+}
 
-                  case 4:
-                    _context.next = 0;
-                    break;
+function clearSuggestedActions() {
+  return _regenerator.default.wrap(function clearSuggestedActions$(_context3) {
+    while (1) {
+      switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.next = 2;
+          return (0, _effects.put)((0, _setSuggestedActions.default)());
 
-                  case 6:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee, this);
-          }));
-
         case 2:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
     }
-  }, _marked, this);
+  }, _marked3, this);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9jbGVhclN1Z2dlc3RlZEFjdGlvbnNPblBvc3RBY3Rpdml0eVNhZ2EuanMiXSwibmFtZXMiOlsicGF5bG9hZCIsInR5cGUiLCJQT1NUX0FDVElWSVRZX1BFTkRJTkciLCJhY3Rpdml0eSJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQTs7QUFLQTs7QUFDQTs7QUFDQTs7Ozs7O0FBRWU7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ2IsaUJBQU07QUFBQTtBQUFBLG9DQUFlO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUVqQiwyQkFBTSxtQkFBSztBQUFBLDBCQUFHQSxPQUFILFFBQUdBLE9BQUg7QUFBQSwwQkFBWUMsSUFBWixRQUFZQSxJQUFaO0FBQUEsNkJBQXVCQSxJQUFJLEtBQUtDLG1DQUFULElBQWtDRixPQUFPLENBQUNHLFFBQVIsQ0FBaUJGLElBQWpCLEtBQTBCLFNBQW5GO0FBQUEscUJBQUwsQ0FBTjs7QUFGaUI7QUFBQTtBQUdqQiwyQkFBTSxrQkFBSSxtQ0FBSixDQUFOOztBQUhpQjtBQUFBO0FBQUE7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEsV0FBZixFQUFOOztBQURhO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgcHV0LFxuICB0YWtlXG59IGZyb20gJ3JlZHV4LXNhZ2EvZWZmZWN0cyc7XG5cbmltcG9ydCB7IFBPU1RfQUNUSVZJVFlfUEVORElORyB9IGZyb20gJy4uL2FjdGlvbnMvcG9zdEFjdGl2aXR5JztcbmltcG9ydCB3aGlsZUNvbm5lY3RlZCBmcm9tICcuL2VmZmVjdHMvd2hpbGVDb25uZWN0ZWQnO1xuaW1wb3J0IHNldFN1Z2dlc3RlZEFjdGlvbnMgZnJvbSAnLi4vYWN0aW9ucy9zZXRTdWdnZXN0ZWRBY3Rpb25zJztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24qICgpIHtcbiAgeWllbGQgd2hpbGVDb25uZWN0ZWQoZnVuY3Rpb24qICgpIHtcbiAgICBmb3IgKDs7KSB7XG4gICAgICB5aWVsZCB0YWtlKCh7IHBheWxvYWQsIHR5cGUgfSkgPT4gdHlwZSA9PT0gUE9TVF9BQ1RJVklUWV9QRU5ESU5HICYmIHBheWxvYWQuYWN0aXZpdHkudHlwZSA9PT0gJ21lc3NhZ2UnKTtcbiAgICAgIHlpZWxkIHB1dChzZXRTdWdnZXN0ZWRBY3Rpb25zKCkpO1xuICAgIH1cbiAgfSk7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9jbGVhclN1Z2dlc3RlZEFjdGlvbnNPblBvc3RBY3Rpdml0eVNhZ2EuanMiXSwibmFtZXMiOlsiY2xlYXJTdWdnZXN0ZWRBY3Rpb25zT25Qb3N0QWN0aXZpdHkiLCJjbGVhclN1Z2dlc3RlZEFjdGlvbnMiLCJwYXlsb2FkIiwidHlwZSIsIlBPU1RfQUNUSVZJVFlfUEVORElORyIsImFjdGl2aXR5Il0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUtBOztBQUVBOztBQUNBOzs7Ozs7OzBCQU1VQSxtQzs7OzBCQVVBQyxxQjs7QUFkSztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDYixpQkFBTSw2QkFBZUQsbUNBQWYsQ0FBTjs7QUFEYTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTs7QUFJZixTQUFVQSxtQ0FBVjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDRSxpQkFBTSx3QkFDSjtBQUFBLGdCQUFHRSxPQUFILFFBQUdBLE9BQUg7QUFBQSxnQkFBWUMsSUFBWixRQUFZQSxJQUFaO0FBQUEsbUJBQ0VBLElBQUksS0FBS0MsbUNBQVQsSUFDR0YsT0FBTyxDQUFDRyxRQUFSLENBQWlCRixJQUFqQixLQUEwQixTQUYvQjtBQUFBLFdBREksRUFLSkYscUJBTEksQ0FBTjs7QUFERjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTs7QUFVQSxTQUFVQSxxQkFBVjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDRSxpQkFBTSxrQkFBSSxtQ0FBSixDQUFOOztBQURGO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgcHV0LFxuICB0YWtlRXZlcnlcbn0gZnJvbSAncmVkdXgtc2FnYS9lZmZlY3RzJztcblxuaW1wb3J0IHdoaWxlQ29ubmVjdGVkIGZyb20gJy4vZWZmZWN0cy93aGlsZUNvbm5lY3RlZCc7XG5cbmltcG9ydCB7IFBPU1RfQUNUSVZJVFlfUEVORElORyB9IGZyb20gJy4uL2FjdGlvbnMvcG9zdEFjdGl2aXR5JztcbmltcG9ydCBzZXRTdWdnZXN0ZWRBY3Rpb25zIGZyb20gJy4uL2FjdGlvbnMvc2V0U3VnZ2VzdGVkQWN0aW9ucyc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKiAoKSB7XG4gIHlpZWxkIHdoaWxlQ29ubmVjdGVkKGNsZWFyU3VnZ2VzdGVkQWN0aW9uc09uUG9zdEFjdGl2aXR5KTtcbn1cblxuZnVuY3Rpb24qIGNsZWFyU3VnZ2VzdGVkQWN0aW9uc09uUG9zdEFjdGl2aXR5KCkge1xuICB5aWVsZCB0YWtlRXZlcnkoXG4gICAgKHsgcGF5bG9hZCwgdHlwZSB9KSA9PiAoXG4gICAgICB0eXBlID09PSBQT1NUX0FDVElWSVRZX1BFTkRJTkdcbiAgICAgICYmIHBheWxvYWQuYWN0aXZpdHkudHlwZSA9PT0gJ21lc3NhZ2UnXG4gICAgKSxcbiAgICBjbGVhclN1Z2dlc3RlZEFjdGlvbnNcbiAgKTtcbn1cblxuZnVuY3Rpb24qIGNsZWFyU3VnZ2VzdGVkQWN0aW9ucygpIHtcbiAgeWllbGQgcHV0KHNldFN1Z2dlc3RlZEFjdGlvbnMoKSk7XG59XG4iXX0=

lib/sagas/connectionStatusUpdateSaga.js

@@ -8,3 +8,3 @@ "use strict";
 });
-exports.default = _callee3;
+exports.default = _callee;
 
@@ -25,13 +25,34 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 /*#__PURE__*/
-_regenerator.default.mark(_callee3);
+_regenerator.default.mark(_callee),
+    _marked2 =
+/*#__PURE__*/
+_regenerator.default.mark(observeConnectionStatus);
 
-function _callee3() {
-  return _regenerator.default.wrap(function _callee3$(_context3) {
+function _callee() {
+  return _regenerator.default.wrap(function _callee$(_context) {
     while (1) {
+      switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return (0, _whileConnected.default)(observeConnectionStatus);
+
+        case 2:
+        case "end":
+          return _context.stop();
+      }
+    }
+  }, _marked, this);
+}
+
+function observeConnectionStatus(_ref) {
+  var directLine;
+  return _regenerator.default.wrap(function observeConnectionStatus$(_context3) {
+    while (1) {
       switch (_context3.prev = _context3.next) {
         case 0:
-          _context3.next = 2;
-          return (0, _whileConnected.default)(
+          directLine = _ref.directLine;
+          _context3.next = 3;
+          return (0, _observeEach.default)(directLine.connectionStatus$,
           /*#__PURE__*/
-          _regenerator.default.mark(function _callee2(directLine) {
+          _regenerator.default.mark(function _callee2(connectionStatus) {
             return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -42,25 +63,9 @@ while (1) {
                     _context2.next = 2;
-                    return (0, _observeEach.default)(directLine.connectionStatus$,
-                    /*#__PURE__*/
-                    _regenerator.default.mark(function _callee(connectionStatus) {
-                      return _regenerator.default.wrap(function _callee$(_context) {
-                        while (1) {
-                          switch (_context.prev = _context.next) {
-                            case 0:
-                              _context.next = 2;
-                              return (0, _effects.put)((0, _connectionStatusUpdate.default)(connectionStatus));
+                    return (0, _effects.put)((0, _connectionStatusUpdate.default)(connectionStatus));
 
-                            case 2:
-                              _context.next = 4;
-                              return (0, _effects.put)((0, _setReferenceGrammarID.default)(directLine.referenceGrammarId));
+                  case 2:
+                    _context2.next = 4;
+                    return (0, _effects.put)((0, _setReferenceGrammarID.default)(directLine.referenceGrammarId));
 
-                            case 4:
-                            case "end":
-                              return _context.stop();
-                          }
-                        }
-                      }, _callee, this);
-                    }));
-
-                  case 2:
+                  case 4:
                   case "end":
@@ -73,3 +78,3 @@ return _context2.stop();
 
-        case 2:
+        case 3:
         case "end":
@@ -79,4 +84,4 @@ return _context3.stop();
     }
-  }, _marked, this);
+  }, _marked2, this);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9jb25uZWN0aW9uU3RhdHVzVXBkYXRlU2FnYS5qcyJdLCJuYW1lcyI6WyJkaXJlY3RMaW5lIiwiY29ubmVjdGlvblN0YXR1cyQiLCJjb25uZWN0aW9uU3RhdHVzIiwicmVmZXJlbmNlR3JhbW1hcklkIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUlBOztBQUNBOztBQUVBOztBQUNBOzs7Ozs7QUFFZTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDYixpQkFBTTtBQUFBO0FBQUEsb0NBQWUsa0JBQVdBLFVBQVg7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ25CLDJCQUFNLDBCQUFZQSxVQUFVLENBQUNDLGlCQUF2QjtBQUFBO0FBQUEsOENBQTBDLGlCQUFXQyxnQkFBWDtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDOUMscUNBQU0sa0JBQUkscUNBQXVCQSxnQkFBdkIsQ0FBSixDQUFOOztBQUQ4QztBQUFBO0FBRTlDLHFDQUFNLGtCQUFJLG9DQUFzQkYsVUFBVSxDQUFDRyxrQkFBakMsQ0FBSixDQUFOOztBQUY4QztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxxQkFBMUMsRUFBTjs7QUFEbUI7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEsV0FBZixFQUFOOztBQURhO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgcHV0XG59IGZyb20gJ3JlZHV4LXNhZ2EvZWZmZWN0cyc7XG5cbmltcG9ydCBvYnNlcnZlRWFjaCBmcm9tICcuL2VmZmVjdHMvb2JzZXJ2ZUVhY2gnO1xuaW1wb3J0IHdoaWxlQ29ubmVjdGVkIGZyb20gJy4vZWZmZWN0cy93aGlsZUNvbm5lY3RlZCc7XG5cbmltcG9ydCBjb25uZWN0aW9uU3RhdHVzVXBkYXRlIGZyb20gJy4uL2FjdGlvbnMvY29ubmVjdGlvblN0YXR1c1VwZGF0ZSc7XG5pbXBvcnQgc2V0UmVmZXJlbmNlR3JhbW1hcklEIGZyb20gJy4uL2FjdGlvbnMvc2V0UmVmZXJlbmNlR3JhbW1hcklEJztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24qICgpIHtcbiAgeWllbGQgd2hpbGVDb25uZWN0ZWQoZnVuY3Rpb24qIChkaXJlY3RMaW5lKSB7XG4gICAgeWllbGQgb2JzZXJ2ZUVhY2goZGlyZWN0TGluZS5jb25uZWN0aW9uU3RhdHVzJCwgZnVuY3Rpb24qIChjb25uZWN0aW9uU3RhdHVzKSB7XG4gICAgICB5aWVsZCBwdXQoY29ubmVjdGlvblN0YXR1c1VwZGF0ZShjb25uZWN0aW9uU3RhdHVzKSk7XG4gICAgICB5aWVsZCBwdXQoc2V0UmVmZXJlbmNlR3JhbW1hcklEKGRpcmVjdExpbmUucmVmZXJlbmNlR3JhbW1hcklkKSk7XG4gICAgfSk7XG4gIH0pO1xufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9jb25uZWN0aW9uU3RhdHVzVXBkYXRlU2FnYS5qcyJdLCJuYW1lcyI6WyJvYnNlcnZlQ29ubmVjdGlvblN0YXR1cyIsImRpcmVjdExpbmUiLCJjb25uZWN0aW9uU3RhdHVzJCIsImNvbm5lY3Rpb25TdGF0dXMiLCJyZWZlcmVuY2VHcmFtbWFySWQiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBSUE7O0FBQ0E7O0FBRUE7O0FBQ0E7Ozs7Ozs7MEJBTVVBLHVCOztBQUpLO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNiLGlCQUFNLDZCQUFlQSx1QkFBZixDQUFOOztBQURhO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBOztBQUlmLFNBQVVBLHVCQUFWO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFvQ0MsVUFBQUEsVUFBcEMsUUFBb0NBLFVBQXBDO0FBQUE7QUFDRSxpQkFBTSwwQkFBWUEsVUFBVSxDQUFDQyxpQkFBdkI7QUFBQTtBQUFBLG9DQUEwQyxrQkFBV0MsZ0JBQVg7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQzlDLDJCQUFNLGtCQUFJLHFDQUF1QkEsZ0JBQXZCLENBQUosQ0FBTjs7QUFEOEM7QUFBQTtBQUU5QywyQkFBTSxrQkFBSSxvQ0FBc0JGLFVBQVUsQ0FBQ0csa0JBQWpDLENBQUosQ0FBTjs7QUFGOEM7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEsV0FBMUMsRUFBTjs7QUFERjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIHB1dFxufSBmcm9tICdyZWR1eC1zYWdhL2VmZmVjdHMnO1xuXG5pbXBvcnQgb2JzZXJ2ZUVhY2ggZnJvbSAnLi9lZmZlY3RzL29ic2VydmVFYWNoJztcbmltcG9ydCB3aGlsZUNvbm5lY3RlZCBmcm9tICcuL2VmZmVjdHMvd2hpbGVDb25uZWN0ZWQnO1xuXG5pbXBvcnQgY29ubmVjdGlvblN0YXR1c1VwZGF0ZSBmcm9tICcuLi9hY3Rpb25zL2Nvbm5lY3Rpb25TdGF0dXNVcGRhdGUnO1xuaW1wb3J0IHNldFJlZmVyZW5jZUdyYW1tYXJJRCBmcm9tICcuLi9hY3Rpb25zL3NldFJlZmVyZW5jZUdyYW1tYXJJRCc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKiAoKSB7XG4gIHlpZWxkIHdoaWxlQ29ubmVjdGVkKG9ic2VydmVDb25uZWN0aW9uU3RhdHVzKTtcbn1cblxuZnVuY3Rpb24qIG9ic2VydmVDb25uZWN0aW9uU3RhdHVzKHsgZGlyZWN0TGluZSB9KSB7XG4gIHlpZWxkIG9ic2VydmVFYWNoKGRpcmVjdExpbmUuY29ubmVjdGlvblN0YXR1cyQsIGZ1bmN0aW9uKiAoY29ubmVjdGlvblN0YXR1cykge1xuICAgIHlpZWxkIHB1dChjb25uZWN0aW9uU3RhdHVzVXBkYXRlKGNvbm5lY3Rpb25TdGF0dXMpKTtcbiAgICB5aWVsZCBwdXQoc2V0UmVmZXJlbmNlR3JhbW1hcklEKGRpcmVjdExpbmUucmVmZXJlbmNlR3JhbW1hcklkKSk7XG4gIH0pO1xufVxuIl19

lib/sagas/connectSaga.js

 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -16,8 +18,10 @@
 
-var _callUntil = _interopRequireDefault(require("./effects/callUntil"));
+var _mathRandom = _interopRequireDefault(require("math-random"));
 
-var _forever = _interopRequireDefault(require("./effects/forever"));
+var _updateConnectionStatus = _interopRequireWildcard(require("../actions/updateConnectionStatus"));
 
 var _createPromiseQueue = _interopRequireDefault(require("../createPromiseQueue"));
 
+var _botframeworkDirectlinejs = require("botframework-directlinejs");
+
 var _connect = require("../actions/connect");
@@ -29,3 +33,3 @@
 /*#__PURE__*/
-_regenerator.default.mark(_callee),
+_regenerator.default.mark(observeAndPutConnectionStatusUpdate),
     _marked2 =
@@ -36,66 +40,45 @@ /*#__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;
-var DEFAULT_USER_ID = 'default-user';
+function randomUserID() {
+  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 = DEFAULT_USER_ID;
-            } 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 = DEFAULT_USER_ID;
-            }
-          } else {
-            // Only specify "default-user" if not found from token and not passed in
-            userID = DEFAULT_USER_ID;
-          }
+        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":
@@ -105,7 +88,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) {
@@ -115,17 +136,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({
@@ -136,21 +143,32 @@ 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_FULFILLED,
-            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 = 18;
+          _context2.next = 2;
           break;
@@ -160,48 +178,18 @@
           _context2.prev = 14;
-          _context2.t0 = _context2["catch"](7);
-          _context2.next = 18;
-          return (0, _effects.put)({
-            type: _connect.CONNECT_REJECTED,
-            error: true,
-            meta: meta,
-            payload: _context2.t0
-          });
-
-        case 18:
-          _context2.prev = 18;
-          _context2.next = 21;
+          _context2.next = 17;
           return (0, _effects.cancelled)();
 
-        case 21:
+        case 17:
           if (!_context2.sent) {
-            _context2.next = 24;
+            _context2.next = 20;
             break;
           }
 
-          _context2.next = 24;
-          return (0, _effects.put)({
-            type: _connect.CONNECT_REJECTED,
-            error: true,
-            meta: meta,
-            payload: new Error('cancelled')
-          });
+          activitySubscription.unsubscribe();
+          throw new Error('Cancelled');
 
-        case 24:
-          return _context2.finish(18);
+        case 20:
+          return _context2.finish(14);
 
-        case 25:
-          _context2.next = 27;
-          return (0, _forever.default)();
-
-        case 27:
-          _context2.prev = 27;
-          // 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(27);
-
-        case 32:
+        case 21:
         case "end":
@@ -211,8 +199,9 @@ return _context2.stop();
     }
-  }, _marked2, this, [[6,, 27, 32], [7, 14, 18, 25]]);
+  }, _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, username, updateConnectionStatusTask, meta, endDirectLine, terminateAction;
+
+  return _regenerator.default.wrap(function _callee$(_context3) {
     while (1) {
@@ -222,66 +211,118 @@ 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$
-
-          _context3.next = 6;
-          return (0, _effects.cancel)(connectTask);
-
-        case 6:
-          _context3.prev = 6;
+          _ref4 = _context3.sent;
+          _ref4$payload = _ref4.payload;
+          directLine = _ref4$payload.directLine;
+          userIDFromAction = _ref4$payload.userID;
+          username = _ref4$payload.username;
           _context3.next = 9;
-          return (0, _callUntil.default)(connectionStatusQueue.shift, [], function (connectionStatus) {
-            return connectionStatus === ENDED;
-          });
+          return (0, _effects.fork)(observeAndPutConnectionStatusUpdate, directLine);
 
         case 9:
-          _context3.next = 11;
+          updateConnectionStatusTask = _context3.sent;
+          _context3.prev = 10;
+          meta = {
+            userID: rectifyUserID(directLine, userIDFromAction),
+            username: username
+          };
+          endDirectLine = void 0;
+          _context3.next = 15;
           return (0, _effects.put)({
-            type: _disconnect.DISCONNECT_FULFILLED
+            type: _connect.CONNECT_PENDING,
+            meta: meta
           });
 
-        case 11:
-          _context3.next = 17;
+        case 15:
+          _context3.prev = 15;
+          _context3.next = 18;
+          return (0, _effects.call)(connectSaga, directLine);
+
+        case 18:
+          endDirectLine = _context3.sent;
+          _context3.next = 26;
           break;
 
-        case 13:
-          _context3.prev = 13;
-          _context3.t0 = _context3["catch"](6);
-          _context3.next = 17;
+        case 21:
+          _context3.prev = 21;
+          _context3.t0 = _context3["catch"](15);
+          _context3.next = 25;
           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 25:
+          return _context3.abrupt("continue", 49);
 
-        case 20:
-          if (!_context3.sent) {
-            _context3.next = 23;
+        case 26:
+          _context3.prev = 26;
+          _context3.next = 29;
+          return (0, _effects.put)({
+            type: _connect.CONNECT_FULFILLING,
+            meta: meta,
+            payload: {
+              directLine: directLine
+            }
+          });
+
+        case 29:
+          _context3.next = 31;
+          return (0, _effects.put)({
+            type: _connect.CONNECT_FULFILLED,
+            meta: meta,
+            payload: {
+              directLine: directLine
+            }
+          });
+
+        case 31:
+          _context3.next = 33;
+          return (0, _effects.take)([_disconnect.DISCONNECT, negativeUpdateConnectionStatusAction]);
+
+        case 33:
+          terminateAction = _context3.sent;
+          _context3.next = 36;
+          return (0, _effects.put)({
+            type: _disconnect.DISCONNECT_PENDING
+          });
+
+        case 36:
+          endDirectLine();
+
+          if (!(terminateAction.type === _disconnect.DISCONNECT)) {
+            _context3.next = 40;
             break;
           }
 
-          _context3.next = 23;
+          _context3.next = 40;
+          return (0, _effects.take)(negativeUpdateConnectionStatusAction);
+
+        case 40:
+          _context3.prev = 40;
+          _context3.next = 43;
           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 43:
+          endDirectLine();
+          return _context3.finish(40);
 
-        case 25:
+        case 45:
+          _context3.prev = 45;
+          _context3.next = 48;
+          return (0, _effects.cancel)(updateConnectionStatusTask);
+
+        case 48:
+          return _context3.finish(45);
+
+        case 49:
+          _context3.next = 0;
+          break;
+
+        case 51:
         case "end":
@@ -291,4 +332,4 @@ return _context3.stop();
     }
-  }, _marked3, this, [[6, 13, 17, 25]]);
+  }, _marked3, this, [[10,, 45, 49], [15, 21], [26,, 40, 45]]);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/sagas/connectSaga.js"],"names":["connectSaga","disconnectSaga","ONLINE","ENDED","DEFAULT_USER_ID","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_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';\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_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\nconst DEFAULT_USER_ID = 'default-user';\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 = DEFAULT_USER_ID;\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 = DEFAULT_USER_ID;\n      }\n    } else {\n      // Only specify \"default-user\" if not found from token and not passed in\n      userID = DEFAULT_USER_ID;\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_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","username","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 {\n      payload: {\n        directLine,\n        userID: userIDFromAction,\n        username\n      }\n    } = yield take(CONNECT);\n    const updateConnectionStatusTask = yield fork(observeAndPutConnectionStatusUpdate, directLine);\n\n    try {\n      const meta = {\n        userID: rectifyUserID(directLine, userIDFromAction),\n        username\n      };\n\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

@@ -22,3 +22,3 @@ "use strict";
   _regenerator.default.mark(function _callee() {
-    var _ref, userID, directLine, task;
+    var _ref, _ref$meta, userID, username, directLine, task;
 
@@ -30,25 +30,31 @@ return _regenerator.default.wrap(function _callee$(_context) {
             _context.next = 2;
-            return (0, _effects.take)(_connect.CONNECT_FULFILLED);
+            return (0, _effects.take)(_connect.CONNECT_FULFILLING);
 
           case 2:
             _ref = _context.sent;
-            userID = _ref.meta.userID;
+            _ref$meta = _ref.meta;
+            userID = _ref$meta.userID;
+            username = _ref$meta.username;
             directLine = _ref.payload.directLine;
-            _context.next = 7;
-            return (0, _effects.fork)(fn, directLine, userID);
+            _context.next = 9;
+            return (0, _effects.fork)(fn, {
+              directLine: directLine,
+              userID: userID,
+              username: username
+            });
 
-          case 7:
+          case 9:
             task = _context.sent;
-            _context.next = 10;
-            return (0, _effects.take)(_disconnect.DISCONNECT_FULFILLED);
+            _context.next = 12;
+            return (0, _effects.take)(_disconnect.DISCONNECT_PENDING);
 
-          case 10:
-            _context.next = 12;
+          case 12:
+            _context.next = 14;
             return (0, _effects.cancel)(task);
 
-          case 12:
+          case 14:
             _context.next = 0;
             break;
 
-          case 14:
+          case 16:
           case "end":
@@ -61,2 +67,2 @@ return _context.stop();
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zYWdhcy9lZmZlY3RzL3doaWxlQ29ubmVjdGVkLmpzIl0sIm5hbWVzIjpbImZuIiwiQ09OTkVDVF9GVUxGSUxMRUQiLCJ1c2VySUQiLCJtZXRhIiwiZGlyZWN0TGluZSIsInBheWxvYWQiLCJ0YXNrIiwiRElTQ09OTkVDVF9GVUxGSUxMRUQiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBT0E7O0FBQ0E7O0FBRWUsa0JBQVVBLEVBQVYsRUFBYztBQUMzQixTQUFPO0FBQUE7QUFBQSw0QkFBSztBQUFBOztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFOEMsbUJBQU0sbUJBQUtDLDBCQUFMLENBQU47O0FBRjlDO0FBQUE7QUFFUUMsWUFBQUEsTUFGUixRQUVBQyxJQUZBLENBRVFELE1BRlI7QUFFNkJFLFlBQUFBLFVBRjdCLFFBRWtCQyxPQUZsQixDQUU2QkQsVUFGN0I7QUFBQTtBQUdLLG1CQUFNLG1CQUFLSixFQUFMLEVBQVNJLFVBQVQsRUFBcUJGLE1BQXJCLENBQU47O0FBSEw7QUFHRkksWUFBQUEsSUFIRTtBQUFBO0FBS1IsbUJBQU0sbUJBQUtDLGdDQUFMLENBQU47O0FBTFE7QUFBQTtBQU1SLG1CQUFNLHFCQUFPRCxJQUFQLENBQU47O0FBTlE7QUFBQTtBQUFBOztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLEdBQUwsRUFBUDtBQVNEIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgY2FsbCxcbiAgY2FuY2VsLFxuICBmb3JrLFxuICB0YWtlXG59IGZyb20gJ3JlZHV4LXNhZ2EvZWZmZWN0cyc7XG5cbmltcG9ydCB7IENPTk5FQ1RfRlVMRklMTEVEIH0gZnJvbSAnLi4vLi4vYWN0aW9ucy9jb25uZWN0JztcbmltcG9ydCB7IERJU0NPTk5FQ1RfRlVMRklMTEVEIH0gZnJvbSAnLi4vLi4vYWN0aW9ucy9kaXNjb25uZWN0JztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gKGZuKSB7XG4gIHJldHVybiBjYWxsKGZ1bmN0aW9uKiAoKSB7XG4gICAgZm9yICg7Oykge1xuICAgICAgY29uc3QgeyBtZXRhOiB7IHVzZXJJRCB9LCBwYXlsb2FkOiB7IGRpcmVjdExpbmUgfSB9ID0geWllbGQgdGFrZShDT05ORUNUX0ZVTEZJTExFRCk7XG4gICAgICBjb25zdCB0YXNrID0geWllbGQgZm9yayhmbiwgZGlyZWN0TGluZSwgdXNlcklEKTtcblxuICAgICAgeWllbGQgdGFrZShESVNDT05ORUNUX0ZVTEZJTExFRCk7XG4gICAgICB5aWVsZCBjYW5jZWwodGFzayk7XG4gICAgfVxuICB9KTtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zYWdhcy9lZmZlY3RzL3doaWxlQ29ubmVjdGVkLmpzIl0sIm5hbWVzIjpbImZuIiwiQ09OTkVDVF9GVUxGSUxMSU5HIiwibWV0YSIsInVzZXJJRCIsInVzZXJuYW1lIiwiZGlyZWN0TGluZSIsInBheWxvYWQiLCJ0YXNrIiwiRElTQ09OTkVDVF9QRU5ESU5HIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQU9BOztBQUNBOztBQUVlLGtCQUFVQSxFQUFWLEVBQWM7QUFDM0IsU0FBTztBQUFBO0FBQUEsNEJBQUs7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRXdELG1CQUFNLG1CQUFLQywyQkFBTCxDQUFOOztBQUZ4RDtBQUFBO0FBQUEsNkJBRUFDLElBRkE7QUFFUUMsWUFBQUEsTUFGUixhQUVRQSxNQUZSO0FBRWdCQyxZQUFBQSxRQUZoQixhQUVnQkEsUUFGaEI7QUFFdUNDLFlBQUFBLFVBRnZDLFFBRTRCQyxPQUY1QixDQUV1Q0QsVUFGdkM7QUFBQTtBQUdLLG1CQUFNLG1CQUFLTCxFQUFMLEVBQVM7QUFBRUssY0FBQUEsVUFBVSxFQUFWQSxVQUFGO0FBQWNGLGNBQUFBLE1BQU0sRUFBTkEsTUFBZDtBQUFzQkMsY0FBQUEsUUFBUSxFQUFSQTtBQUF0QixhQUFULENBQU47O0FBSEw7QUFHRkcsWUFBQUEsSUFIRTtBQUFBO0FBTVIsbUJBQU0sbUJBQUtDLDhCQUFMLENBQU47O0FBTlE7QUFBQTtBQU9SLG1CQUFNLHFCQUFPRCxJQUFQLENBQU47O0FBUFE7QUFBQTtBQUFBOztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLEdBQUwsRUFBUDtBQVVEIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgY2FsbCxcbiAgY2FuY2VsLFxuICBmb3JrLFxuICB0YWtlXG59IGZyb20gJ3JlZHV4LXNhZ2EvZWZmZWN0cyc7XG5cbmltcG9ydCB7IENPTk5FQ1RfRlVMRklMTElORyB9IGZyb20gJy4uLy4uL2FjdGlvbnMvY29ubmVjdCc7XG5pbXBvcnQgeyBESVNDT05ORUNUX1BFTkRJTkcgfSBmcm9tICcuLi8uLi9hY3Rpb25zL2Rpc2Nvbm5lY3QnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiAoZm4pIHtcbiAgcmV0dXJuIGNhbGwoZnVuY3Rpb24qICgpIHtcbiAgICBmb3IgKDs7KSB7XG4gICAgICBjb25zdCB7IG1ldGE6IHsgdXNlcklELCB1c2VybmFtZSB9LCBwYXlsb2FkOiB7IGRpcmVjdExpbmUgfSB9ID0geWllbGQgdGFrZShDT05ORUNUX0ZVTEZJTExJTkcpO1xuICAgICAgY29uc3QgdGFzayA9IHlpZWxkIGZvcmsoZm4sIHsgZGlyZWN0TGluZSwgdXNlcklELCB1c2VybmFtZSB9KTtcblxuICAgICAgLy8gV2hlbiB3ZSByZWNlaXZlIERJU0NPTk5FQ1RfUEVORElORywgdGhlIERpcmVjdCBMaW5lIGNvbm5lY3Rpb24gaXMgdGVhcmluZyBkb3duIGFuZCBzaG91bGQgbm90IGJlIHVzZWQuXG4gICAgICB5aWVsZCB0YWtlKERJU0NPTk5FQ1RfUEVORElORyk7XG4gICAgICB5aWVsZCBjYW5jZWwodGFzayk7XG4gICAgfVxuICB9KTtcbn1cbiJdfQ==

lib/sagas/incomingActivitySaga.js

@@ -8,10 +8,16 @@ "use strict";
 });
-exports.default = _callee3;
+exports.default = _callee;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
-
 var _effects = require("redux-saga/effects");
 
+var _simpleUpdateIn = _interopRequireDefault(require("simple-update-in"));
+
+var _incomingActivity = _interopRequireDefault(require("../actions/incomingActivity"));
+
+var _setSuggestedActions = _interopRequireDefault(require("../actions/setSuggestedActions"));
+
+var _activityFromBot = _interopRequireDefault(require("../definitions/activityFromBot"));
+
 var _observeEach = _interopRequireDefault(require("./effects/observeEach"));
@@ -21,29 +27,40 @@
 
-var _incomingActivity = _interopRequireDefault(require("../actions/incomingActivity"));
+var _activities = require("../selectors/activities");
 
-var _setSuggestedActions = _interopRequireDefault(require("../actions/setSuggestedActions"));
-
 var _marked =
 /*#__PURE__*/
-_regenerator.default.mark(_callee3);
+_regenerator.default.mark(_callee),
+    _marked2 =
+/*#__PURE__*/
+_regenerator.default.mark(observeActivity);
 
-function last(array, predicate) {
-  for (var i = array.length - 1; i >= 0; i--) {
-    var item = array[i];
+function _callee() {
+  return _regenerator.default.wrap(function _callee$(_context) {
+    while (1) {
+      switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return (0, _whileConnected.default)(observeActivity);
 
-    if (predicate.call(array, item)) {
-      return item;
+        case 2:
+        case "end":
+          return _context.stop();
+      }
     }
-  }
+  }, _marked, this);
 }
 
-function _callee3() {
-  return _regenerator.default.wrap(function _callee3$(_context3) {
+function observeActivity(_ref) {
+  var directLine, userID;
+  return _regenerator.default.wrap(function observeActivity$(_context3) {
     while (1) {
       switch (_context3.prev = _context3.next) {
         case 0:
-          _context3.next = 2;
-          return (0, _whileConnected.default)(
+          directLine = _ref.directLine, userID = _ref.userID;
+          _context3.next = 3;
+          return (0, _observeEach.default)(directLine.activity$,
           /*#__PURE__*/
-          _regenerator.default.mark(function _callee2(directLine, userID) {
+          _regenerator.default.mark(function _callee2(activity) {
+            var messageActivities, lastMessageActivity, _lastMessageActivity$, actions;
+
             return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -53,65 +70,26 @@ while (1) {
                   case 0:
-                    _context2.next = 2;
-                    return (0, _observeEach.default)(directLine.activity$,
-                    /*#__PURE__*/
-                    _regenerator.default.mark(function _callee(activity) {
-                      var activities, lastMessageActivity, _lastMessageActivity$, actions;
+                    activity = patchActivityWithFromRole(activity, userID);
+                    _context2.next = 3;
+                    return (0, _effects.put)((0, _incomingActivity.default)(activity));
 
-                      return _regenerator.default.wrap(function _callee$(_context) {
-                        while (1) {
-                          switch (_context.prev = _context.next) {
-                            case 0:
-                              activity = (0, _objectSpread2.default)({}, activity); // Patch activity.from.role to make sure its either "bot", "user", or "channel"
+                  case 3:
+                    _context2.next = 5;
+                    return (0, _effects.select)((0, _activities.ofType)('message'));
 
-                              if (!activity.from) {
-                                activity.from = {
-                                  role: 'channel'
-                                };
-                              } else if (!activity.from.role) {
-                                if (activity.from.id === userID) {
-                                  activity.from.role = 'user';
-                                } else if (activity.from.id) {
-                                  activity.from.role = 'bot';
-                                } else {
-                                  activity.from.role = 'channel';
-                                }
-                              }
+                  case 5:
+                    messageActivities = _context2.sent;
+                    lastMessageActivity = messageActivities[messageActivities.length - 1];
 
-                              _context.next = 4;
-                              return (0, _effects.put)((0, _incomingActivity.default)(activity));
+                    if (!(0, _activityFromBot.default)(lastMessageActivity)) {
+                      _context2.next = 13;
+                      break;
+                    }
 
-                            case 4:
-                              _context.next = 6;
-                              return (0, _effects.select)(function (_ref) {
-                                var activities = _ref.activities;
-                                return activities;
-                              });
+                    _lastMessageActivity$ = lastMessageActivity.suggestedActions;
+                    _lastMessageActivity$ = _lastMessageActivity$ === void 0 ? {} : _lastMessageActivity$;
+                    actions = _lastMessageActivity$.actions;
+                    _context2.next = 13;
+                    return (0, _effects.put)((0, _setSuggestedActions.default)(actions));
 
-                            case 6:
-                              activities = _context.sent;
-                              lastMessageActivity = last(activities, function (_ref2) {
-                                var type = _ref2.type;
-                                return type === 'message';
-                              });
-
-                              if (!(lastMessageActivity && lastMessageActivity.from && lastMessageActivity.from.role === 'bot')) {
-                                _context.next = 14;
-                                break;
-                              }
-
-                              _lastMessageActivity$ = lastMessageActivity.suggestedActions;
-                              _lastMessageActivity$ = _lastMessageActivity$ === void 0 ? {} : _lastMessageActivity$;
-                              actions = _lastMessageActivity$.actions;
-                              _context.next = 14;
-                              return (0, _effects.put)((0, _setSuggestedActions.default)(actions));
-
-                            case 14:
-                            case "end":
-                              return _context.stop();
-                          }
-                        }
-                      }, _callee, this);
-                    }));
-
-                  case 2:
+                  case 13:
                   case "end":
@@ -124,3 +102,3 @@ return _context2.stop();
 
-        case 2:
+        case 3:
         case "end":
@@ -130,4 +108,32 @@ return _context3.stop();
     }
-  }, _marked, this);
+  }, _marked2, this);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9pbmNvbWluZ0FjdGl2aXR5U2FnYS5qcyJdLCJuYW1lcyI6WyJsYXN0IiwiYXJyYXkiLCJwcmVkaWNhdGUiLCJpIiwibGVuZ3RoIiwiaXRlbSIsImNhbGwiLCJkaXJlY3RMaW5lIiwidXNlcklEIiwiYWN0aXZpdHkkIiwiYWN0aXZpdHkiLCJmcm9tIiwicm9sZSIsImlkIiwiYWN0aXZpdGllcyIsImxhc3RNZXNzYWdlQWN0aXZpdHkiLCJ0eXBlIiwic3VnZ2VzdGVkQWN0aW9ucyIsImFjdGlvbnMiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7QUFBQTs7QUFLQTs7QUFDQTs7QUFFQTs7QUFDQTs7Ozs7O0FBRUEsU0FBU0EsSUFBVCxDQUFjQyxLQUFkLEVBQXFCQyxTQUFyQixFQUFnQztBQUM5QixPQUFLLElBQUlDLENBQUMsR0FBR0YsS0FBSyxDQUFDRyxNQUFOLEdBQWUsQ0FBNUIsRUFBK0JELENBQUMsSUFBSSxDQUFwQyxFQUF1Q0EsQ0FBQyxFQUF4QyxFQUE0QztBQUMxQyxRQUFNRSxJQUFJLEdBQUdKLEtBQUssQ0FBQ0UsQ0FBRCxDQUFsQjs7QUFFQSxRQUFJRCxTQUFTLENBQUNJLElBQVYsQ0FBZUwsS0FBZixFQUFzQkksSUFBdEIsQ0FBSixFQUFpQztBQUMvQixhQUFPQSxJQUFQO0FBQ0Q7QUFDRjtBQUNGOztBQUVjO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNiLGlCQUFNO0FBQUE7QUFBQSxvQ0FBZSxrQkFBV0UsVUFBWCxFQUF1QkMsTUFBdkI7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ25CLDJCQUFNLDBCQUFZRCxVQUFVLENBQUNFLFNBQXZCO0FBQUE7QUFBQSw4Q0FBa0MsaUJBQVdDLFFBQVg7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUN0Q0EsOEJBQUFBLFFBQVEsbUNBQVFBLFFBQVIsQ0FBUixDQURzQyxDQUd0Qzs7QUFDQSxrQ0FBSSxDQUFDQSxRQUFRLENBQUNDLElBQWQsRUFBb0I7QUFDbEJELGdDQUFBQSxRQUFRLENBQUNDLElBQVQsR0FBZ0I7QUFBRUMsa0NBQUFBLElBQUksRUFBRTtBQUFSLGlDQUFoQjtBQUNELCtCQUZELE1BRU8sSUFBSSxDQUFDRixRQUFRLENBQUNDLElBQVQsQ0FBY0MsSUFBbkIsRUFBeUI7QUFDOUIsb0NBQUlGLFFBQVEsQ0FBQ0MsSUFBVCxDQUFjRSxFQUFkLEtBQXFCTCxNQUF6QixFQUFpQztBQUMvQkUsa0NBQUFBLFFBQVEsQ0FBQ0MsSUFBVCxDQUFjQyxJQUFkLEdBQXFCLE1BQXJCO0FBQ0QsaUNBRkQsTUFFTyxJQUFJRixRQUFRLENBQUNDLElBQVQsQ0FBY0UsRUFBbEIsRUFBc0I7QUFDM0JILGtDQUFBQSxRQUFRLENBQUNDLElBQVQsQ0FBY0MsSUFBZCxHQUFxQixLQUFyQjtBQUNELGlDQUZNLE1BRUE7QUFDTEYsa0NBQUFBLFFBQVEsQ0FBQ0MsSUFBVCxDQUFjQyxJQUFkLEdBQXFCLFNBQXJCO0FBQ0Q7QUFDRjs7QUFkcUM7QUFnQnRDLHFDQUFNLGtCQUFJLCtCQUFpQkYsUUFBakIsQ0FBSixDQUFOOztBQWhCc0M7QUFBQTtBQW1CbkIscUNBQU0scUJBQU87QUFBQSxvQ0FBR0ksVUFBSCxRQUFHQSxVQUFIO0FBQUEsdUNBQW9CQSxVQUFwQjtBQUFBLCtCQUFQLENBQU47O0FBbkJtQjtBQW1CaENBLDhCQUFBQSxVQW5CZ0M7QUFvQmhDQyw4QkFBQUEsbUJBcEJnQyxHQW9CVmYsSUFBSSxDQUFDYyxVQUFELEVBQWE7QUFBQSxvQ0FBR0UsSUFBSCxTQUFHQSxJQUFIO0FBQUEsdUNBQWNBLElBQUksS0FBSyxTQUF2QjtBQUFBLCtCQUFiLENBcEJNOztBQUFBLG9DQXVCcENELG1CQUFtQixJQUNoQkEsbUJBQW1CLENBQUNKLElBRHZCLElBRUdJLG1CQUFtQixDQUFDSixJQUFwQixDQUF5QkMsSUFBekIsS0FBa0MsS0F6QkQ7QUFBQTtBQUFBO0FBQUE7O0FBQUEsc0RBMkJXRyxtQkEzQlgsQ0EyQjVCRSxnQkEzQjRCO0FBQUEseUZBMkJJLEVBM0JKO0FBMkJSQyw4QkFBQUEsT0EzQlEseUJBMkJSQSxPQTNCUTtBQUFBO0FBNkJwQyxxQ0FBTSxrQkFBSSxrQ0FBb0JBLE9BQXBCLENBQUosQ0FBTjs7QUE3Qm9DO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLHFCQUFsQyxFQUFOOztBQURtQjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxXQUFmLEVBQU47O0FBRGE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBwdXQsXG4gIHNlbGVjdFxufSBmcm9tICdyZWR1eC1zYWdhL2VmZmVjdHMnO1xuXG5pbXBvcnQgb2JzZXJ2ZUVhY2ggZnJvbSAnLi9lZmZlY3RzL29ic2VydmVFYWNoJztcbmltcG9ydCB3aGlsZUNvbm5lY3RlZCBmcm9tICcuL2VmZmVjdHMvd2hpbGVDb25uZWN0ZWQnO1xuXG5pbXBvcnQgaW5jb21pbmdBY3Rpdml0eSBmcm9tICcuLi9hY3Rpb25zL2luY29taW5nQWN0aXZpdHknO1xuaW1wb3J0IHNldFN1Z2dlc3RlZEFjdGlvbnMgZnJvbSAnLi4vYWN0aW9ucy9zZXRTdWdnZXN0ZWRBY3Rpb25zJztcblxuZnVuY3Rpb24gbGFzdChhcnJheSwgcHJlZGljYXRlKSB7XG4gIGZvciAobGV0IGkgPSBhcnJheS5sZW5ndGggLSAxOyBpID49IDA7IGktLSkge1xuICAgIGNvbnN0IGl0ZW0gPSBhcnJheVtpXTtcblxuICAgIGlmIChwcmVkaWNhdGUuY2FsbChhcnJheSwgaXRlbSkpIHtcbiAgICAgIHJldHVybiBpdGVtO1xuICAgIH1cbiAgfVxufVxuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiogKCkge1xuICB5aWVsZCB3aGlsZUNvbm5lY3RlZChmdW5jdGlvbiogKGRpcmVjdExpbmUsIHVzZXJJRCkge1xuICAgIHlpZWxkIG9ic2VydmVFYWNoKGRpcmVjdExpbmUuYWN0aXZpdHkkLCBmdW5jdGlvbiogKGFjdGl2aXR5KSB7XG4gICAgICBhY3Rpdml0eSA9IHsgLi4uYWN0aXZpdHkgfTtcblxuICAgICAgLy8gUGF0Y2ggYWN0aXZpdHkuZnJvbS5yb2xlIHRvIG1ha2Ugc3VyZSBpdHMgZWl0aGVyIFwiYm90XCIsIFwidXNlclwiLCBvciBcImNoYW5uZWxcIlxuICAgICAgaWYgKCFhY3Rpdml0eS5mcm9tKSB7XG4gICAgICAgIGFjdGl2aXR5LmZyb20gPSB7IHJvbGU6ICdjaGFubmVsJyB9O1xuICAgICAgfSBlbHNlIGlmICghYWN0aXZpdHkuZnJvbS5yb2xlKSB7XG4gICAgICAgIGlmIChhY3Rpdml0eS5mcm9tLmlkID09PSB1c2VySUQpIHtcbiAgICAgICAgICBhY3Rpdml0eS5mcm9tLnJvbGUgPSAndXNlcic7XG4gICAgICAgIH0gZWxzZSBpZiAoYWN0aXZpdHkuZnJvbS5pZCkge1xuICAgICAgICAgIGFjdGl2aXR5LmZyb20ucm9sZSA9ICdib3QnO1xuICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgIGFjdGl2aXR5LmZyb20ucm9sZSA9ICdjaGFubmVsJztcbiAgICAgICAgfVxuICAgICAgfVxuXG4gICAgICB5aWVsZCBwdXQoaW5jb21pbmdBY3Rpdml0eShhY3Rpdml0eSkpO1xuXG4gICAgICAvLyBVcGRhdGUgc3VnZ2VzdGVkIGFjdGlvbnNcbiAgICAgIGNvbnN0IGFjdGl2aXRpZXMgPSB5aWVsZCBzZWxlY3QoKHsgYWN0aXZpdGllcyB9KSA9PiBhY3Rpdml0aWVzKTtcbiAgICAgIGNvbnN0IGxhc3RNZXNzYWdlQWN0aXZpdHkgPSBsYXN0KGFjdGl2aXRpZXMsICh7IHR5cGUgfSkgPT4gdHlwZSA9PT0gJ21lc3NhZ2UnKTtcblxuICAgICAgaWYgKFxuICAgICAgICBsYXN0TWVzc2FnZUFjdGl2aXR5XG4gICAgICAgICYmIGxhc3RNZXNzYWdlQWN0aXZpdHkuZnJvbVxuICAgICAgICAmJiBsYXN0TWVzc2FnZUFjdGl2aXR5LmZyb20ucm9sZSA9PT0gJ2JvdCdcbiAgICAgICkge1xuICAgICAgICBjb25zdCB7IHN1Z2dlc3RlZEFjdGlvbnM6IHsgYWN0aW9ucyB9ID0ge30gfSA9IGxhc3RNZXNzYWdlQWN0aXZpdHk7XG5cbiAgICAgICAgeWllbGQgcHV0KHNldFN1Z2dlc3RlZEFjdGlvbnMoYWN0aW9ucykpO1xuICAgICAgfVxuICAgIH0pO1xuICB9KTtcbn1cbiJdfQ==
+
+function patchActivityWithFromRole(activity, userID) {
+  // Some activities, such as "ConversationUpdate", does not have "from" defined.
+  // And although "role" is defined in Direct Line spec, it was not sent over the wire.
+  // We normalize the activity here to simplify null-check and logic later.
+  // Patch activity.from.role to make sure its either "bot", "user", or "channel"
+  if (!activity.from) {
+    activity = (0, _simpleUpdateIn.default)(activity, ['from', 'role'], function () {
+      return 'channel';
+    });
+  } else if (!activity.from.role) {
+    if (activity.from.id === userID) {
+      activity = (0, _simpleUpdateIn.default)(activity, ['from', 'role'], function () {
+        return 'user';
+      });
+    } else if (activity.from.id) {
+      activity = (0, _simpleUpdateIn.default)(activity, ['from', 'role'], function () {
+        return 'bot';
+      });
+    } else {
+      activity = (0, _simpleUpdateIn.default)(activity, ['from', 'role'], function () {
+        return 'channel';
+      });
+    }
+  }
+
+  return activity;
+}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9pbmNvbWluZ0FjdGl2aXR5U2FnYS5qcyJdLCJuYW1lcyI6WyJvYnNlcnZlQWN0aXZpdHkiLCJkaXJlY3RMaW5lIiwidXNlcklEIiwiYWN0aXZpdHkkIiwiYWN0aXZpdHkiLCJwYXRjaEFjdGl2aXR5V2l0aEZyb21Sb2xlIiwibWVzc2FnZUFjdGl2aXRpZXMiLCJsYXN0TWVzc2FnZUFjdGl2aXR5IiwibGVuZ3RoIiwic3VnZ2VzdGVkQWN0aW9ucyIsImFjdGlvbnMiLCJmcm9tIiwicm9sZSIsImlkIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUtBOztBQUVBOztBQUNBOztBQUVBOztBQUVBOztBQUNBOztBQUVBOzs7Ozs7OzBCQU1VQSxlOztBQUpLO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNiLGlCQUFNLDZCQUFlQSxlQUFmLENBQU47O0FBRGE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7O0FBSWYsU0FBVUEsZUFBVjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBNEJDLFVBQUFBLFVBQTVCLFFBQTRCQSxVQUE1QixFQUF3Q0MsTUFBeEMsUUFBd0NBLE1BQXhDO0FBQUE7QUFDRSxpQkFBTSwwQkFBWUQsVUFBVSxDQUFDRSxTQUF2QjtBQUFBO0FBQUEsb0NBQWtDLGtCQUFXQyxRQUFYO0FBQUE7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDdENBLG9CQUFBQSxRQUFRLEdBQUdDLHlCQUF5QixDQUFDRCxRQUFELEVBQVdGLE1BQVgsQ0FBcEM7QUFEc0M7QUFHdEMsMkJBQU0sa0JBQUksK0JBQWlCRSxRQUFqQixDQUFKLENBQU47O0FBSHNDO0FBQUE7QUFNWiwyQkFBTSxxQkFBTyx3QkFBaUIsU0FBakIsQ0FBUCxDQUFOOztBQU5ZO0FBTWhDRSxvQkFBQUEsaUJBTmdDO0FBT2hDQyxvQkFBQUEsbUJBUGdDLEdBT1ZELGlCQUFpQixDQUFDQSxpQkFBaUIsQ0FBQ0UsTUFBbEIsR0FBMkIsQ0FBNUIsQ0FQUDs7QUFBQSx5QkFTbEMsOEJBQWdCRCxtQkFBaEIsQ0FUa0M7QUFBQTtBQUFBO0FBQUE7O0FBQUEsNENBVVdBLG1CQVZYLENBVTVCRSxnQkFWNEI7QUFBQSwrRUFVSSxFQVZKO0FBVVJDLG9CQUFBQSxPQVZRLHlCQVVSQSxPQVZRO0FBQUE7QUFZcEMsMkJBQU0sa0JBQUksa0NBQW9CQSxPQUFwQixDQUFKLENBQU47O0FBWm9DO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLFdBQWxDLEVBQU47O0FBREY7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7O0FBa0JBLFNBQVNMLHlCQUFULENBQW1DRCxRQUFuQyxFQUE2Q0YsTUFBN0MsRUFBcUQ7QUFDbkQ7QUFDQTtBQUNBO0FBRUE7QUFDQSxNQUFJLENBQUNFLFFBQVEsQ0FBQ08sSUFBZCxFQUFvQjtBQUNsQlAsSUFBQUEsUUFBUSxHQUFHLDZCQUFTQSxRQUFULEVBQW1CLENBQUMsTUFBRCxFQUFTLE1BQVQsQ0FBbkIsRUFBcUM7QUFBQSxhQUFNLFNBQU47QUFBQSxLQUFyQyxDQUFYO0FBQ0QsR0FGRCxNQUVPLElBQUksQ0FBQ0EsUUFBUSxDQUFDTyxJQUFULENBQWNDLElBQW5CLEVBQXlCO0FBQzlCLFFBQUlSLFFBQVEsQ0FBQ08sSUFBVCxDQUFjRSxFQUFkLEtBQXFCWCxNQUF6QixFQUFpQztBQUMvQkUsTUFBQUEsUUFBUSxHQUFHLDZCQUFTQSxRQUFULEVBQW1CLENBQUMsTUFBRCxFQUFTLE1BQVQsQ0FBbkIsRUFBcUM7QUFBQSxlQUFNLE1BQU47QUFBQSxPQUFyQyxDQUFYO0FBQ0QsS0FGRCxNQUVPLElBQUlBLFFBQVEsQ0FBQ08sSUFBVCxDQUFjRSxFQUFsQixFQUFzQjtBQUMzQlQsTUFBQUEsUUFBUSxHQUFHLDZCQUFTQSxRQUFULEVBQW1CLENBQUMsTUFBRCxFQUFTLE1BQVQsQ0FBbkIsRUFBcUM7QUFBQSxlQUFNLEtBQU47QUFBQSxPQUFyQyxDQUFYO0FBQ0QsS0FGTSxNQUVBO0FBQ0xBLE1BQUFBLFFBQVEsR0FBRyw2QkFBU0EsUUFBVCxFQUFtQixDQUFDLE1BQUQsRUFBUyxNQUFULENBQW5CLEVBQXFDO0FBQUEsZUFBTSxTQUFOO0FBQUEsT0FBckMsQ0FBWDtBQUNEO0FBQ0Y7O0FBRUQsU0FBT0EsUUFBUDtBQUNEIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgcHV0LFxuICBzZWxlY3Rcbn0gZnJvbSAncmVkdXgtc2FnYS9lZmZlY3RzJztcblxuaW1wb3J0IHVwZGF0ZUluIGZyb20gJ3NpbXBsZS11cGRhdGUtaW4nO1xuXG5pbXBvcnQgaW5jb21pbmdBY3Rpdml0eSBmcm9tICcuLi9hY3Rpb25zL2luY29taW5nQWN0aXZpdHknO1xuaW1wb3J0IHNldFN1Z2dlc3RlZEFjdGlvbnMgZnJvbSAnLi4vYWN0aW9ucy9zZXRTdWdnZXN0ZWRBY3Rpb25zJztcblxuaW1wb3J0IGFjdGl2aXR5RnJvbUJvdCBmcm9tICcuLi9kZWZpbml0aW9ucy9hY3Rpdml0eUZyb21Cb3QnO1xuXG5pbXBvcnQgb2JzZXJ2ZUVhY2ggZnJvbSAnLi9lZmZlY3RzL29ic2VydmVFYWNoJztcbmltcG9ydCB3aGlsZUNvbm5lY3RlZCBmcm9tICcuL2VmZmVjdHMvd2hpbGVDb25uZWN0ZWQnO1xuXG5pbXBvcnQgeyBvZlR5cGUgYXMgYWN0aXZpdGllc09mVHlwZSB9IGZyb20gJy4uL3NlbGVjdG9ycy9hY3Rpdml0aWVzJztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24qICgpIHtcbiAgeWllbGQgd2hpbGVDb25uZWN0ZWQob2JzZXJ2ZUFjdGl2aXR5KTtcbn1cblxuZnVuY3Rpb24qIG9ic2VydmVBY3Rpdml0eSh7IGRpcmVjdExpbmUsIHVzZXJJRCB9KSB7XG4gIHlpZWxkIG9ic2VydmVFYWNoKGRpcmVjdExpbmUuYWN0aXZpdHkkLCBmdW5jdGlvbiogKGFjdGl2aXR5KSB7XG4gICAgYWN0aXZpdHkgPSBwYXRjaEFjdGl2aXR5V2l0aEZyb21Sb2xlKGFjdGl2aXR5LCB1c2VySUQpO1xuXG4gICAgeWllbGQgcHV0KGluY29taW5nQWN0aXZpdHkoYWN0aXZpdHkpKTtcblxuICAgIC8vIFVwZGF0ZSBzdWdnZXN0ZWQgYWN0aW9uc1xuICAgIGNvbnN0IG1lc3NhZ2VBY3Rpdml0aWVzID0geWllbGQgc2VsZWN0KGFjdGl2aXRpZXNPZlR5cGUoJ21lc3NhZ2UnKSk7XG4gICAgY29uc3QgbGFzdE1lc3NhZ2VBY3Rpdml0eSA9IG1lc3NhZ2VBY3Rpdml0aWVzW21lc3NhZ2VBY3Rpdml0aWVzLmxlbmd0aCAtIDFdO1xuXG4gICAgaWYgKGFjdGl2aXR5RnJvbUJvdChsYXN0TWVzc2FnZUFjdGl2aXR5KSkge1xuICAgICAgY29uc3QgeyBzdWdnZXN0ZWRBY3Rpb25zOiB7IGFjdGlvbnMgfSA9IHt9IH0gPSBsYXN0TWVzc2FnZUFjdGl2aXR5O1xuXG4gICAgICB5aWVsZCBwdXQoc2V0U3VnZ2VzdGVkQWN0aW9ucyhhY3Rpb25zKSk7XG4gICAgfVxuICB9KTtcbn1cblxuZnVuY3Rpb24gcGF0Y2hBY3Rpdml0eVdpdGhGcm9tUm9sZShhY3Rpdml0eSwgdXNlcklEKSB7XG4gIC8vIFNvbWUgYWN0aXZpdGllcywgc3VjaCBhcyBcIkNvbnZlcnNhdGlvblVwZGF0ZVwiLCBkb2VzIG5vdCBoYXZlIFwiZnJvbVwiIGRlZmluZWQuXG4gIC8vIEFuZCBhbHRob3VnaCBcInJvbGVcIiBpcyBkZWZpbmVkIGluIERpcmVjdCBMaW5lIHNwZWMsIGl0IHdhcyBub3Qgc2VudCBvdmVyIHRoZSB3aXJlLlxuICAvLyBXZSBub3JtYWxpemUgdGhlIGFjdGl2aXR5IGhlcmUgdG8gc2ltcGxpZnkgbnVsbC1jaGVjayBhbmQgbG9naWMgbGF0ZXIuXG5cbiAgLy8gUGF0Y2ggYWN0aXZpdHkuZnJvbS5yb2xlIHRvIG1ha2Ugc3VyZSBpdHMgZWl0aGVyIFwiYm90XCIsIFwidXNlclwiLCBvciBcImNoYW5uZWxcIlxuICBpZiAoIWFjdGl2aXR5LmZyb20pIHtcbiAgICBhY3Rpdml0eSA9IHVwZGF0ZUluKGFjdGl2aXR5LCBbJ2Zyb20nLCAncm9sZSddLCAoKSA9PiAnY2hhbm5lbCcpO1xuICB9IGVsc2UgaWYgKCFhY3Rpdml0eS5mcm9tLnJvbGUpIHtcbiAgICBpZiAoYWN0aXZpdHkuZnJvbS5pZCA9PT0gdXNlcklEKSB7XG4gICAgICBhY3Rpdml0eSA9IHVwZGF0ZUluKGFjdGl2aXR5LCBbJ2Zyb20nLCAncm9sZSddLCAoKSA9PiAndXNlcicpO1xuICAgIH0gZWxzZSBpZiAoYWN0aXZpdHkuZnJvbS5pZCkge1xuICAgICAgYWN0aXZpdHkgPSB1cGRhdGVJbihhY3Rpdml0eSwgWydmcm9tJywgJ3JvbGUnXSwgKCkgPT4gJ2JvdCcpO1xuICAgIH0gZWxzZSB7XG4gICAgICBhY3Rpdml0eSA9IHVwZGF0ZUluKGFjdGl2aXR5LCBbJ2Zyb20nLCAncm9sZSddLCAoKSA9PiAnY2hhbm5lbCcpO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBhY3Rpdml0eTtcbn1cbiJdfQ==

lib/sagas/postActivitySaga.js

@@ -8,3 +8,3 @@ "use strict";
 });
-exports.default = _callee2;
+exports.default = _callee3;
 
@@ -19,4 +19,2 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _sleep = _interopRequireDefault(require("../utils/sleep"));
-
 var _observeOnce = _interopRequireDefault(require("./effects/observeOnce"));
@@ -26,2 +24,6 @@
 
+var _language = _interopRequireDefault(require("../selectors/language"));
+
+var _sendTimeout = _interopRequireDefault(require("../selectors/sendTimeout"));
+
 var _deleteKey = _interopRequireDefault(require("../utils/deleteKey"));
@@ -31,2 +33,4 @@
 
+var _sleep = _interopRequireDefault(require("../utils/sleep"));
+
 var _uniqueID = _interopRequireDefault(require("../utils/uniqueID"));
@@ -40,3 +44,3 @@
 /*#__PURE__*/
-_regenerator.default.mark(_callee2),
+_regenerator.default.mark(_callee3),
     _marked2 =
@@ -46,38 +50,42 @@ /*#__PURE__*/
 
-function _callee2() {
-  return _regenerator.default.wrap(function _callee2$(_context2) {
+function _callee3() {
+  return _regenerator.default.wrap(function _callee3$(_context3) {
     while (1) {
-      switch (_context2.prev = _context2.next) {
+      switch (_context3.prev = _context3.next) {
         case 0:
-          _context2.next = 2;
+          _context3.next = 2;
           return (0, _whileConnected.default)(
           /*#__PURE__*/
-          _regenerator.default.mark(function _callee(directLine, userID) {
-            var numActivitiesPosted, action;
-            return _regenerator.default.wrap(function _callee$(_context) {
+          _regenerator.default.mark(function _callee2(_ref) {
+            var directLine, userID, username, numActivitiesPosted;
+            return _regenerator.default.wrap(function _callee2$(_context2) {
               while (1) {
-                switch (_context.prev = _context.next) {
+                switch (_context2.prev = _context2.next) {
                   case 0:
+                    directLine = _ref.directLine, userID = _ref.userID, username = _ref.username;
                     numActivitiesPosted = 0;
+                    _context2.next = 4;
+                    return (0, _effects.takeEvery)(_postActivity.POST_ACTIVITY,
+                    /*#__PURE__*/
+                    _regenerator.default.mark(function _callee(action) {
+                      return _regenerator.default.wrap(function _callee$(_context) {
+                        while (1) {
+                          switch (_context.prev = _context.next) {
+                            case 0:
+                              return _context.delegateYield(postActivity(directLine, userID, username, numActivitiesPosted++, action), "t0", 1);
 
-                  case 1:
-                    _context.next = 3;
-                    return (0, _effects.take)(_postActivity.POST_ACTIVITY);
+                            case 1:
+                            case "end":
+                              return _context.stop();
+                          }
+                        }
+                      }, _callee, this);
+                    }));
 
-                  case 3:
-                    action = _context.sent;
-                    _context.next = 6;
-                    return (0, _effects.fork)(postActivity, directLine, userID, numActivitiesPosted, action);
-
-                  case 6:
-                    numActivitiesPosted++;
-                    _context.next = 1;
-                    break;
-
-                  case 9:
+                  case 4:
                   case "end":
-                    return _context.stop();
+                    return _context2.stop();
                 }
               }
-            }, _callee, this);
+            }, _callee2, this);
           }));
@@ -87,3 +95,3 @@
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
@@ -94,18 +102,15 @@ }
 
-function postActivity(directLine, userID, numActivitiesPosted, _ref) {
-  var activity, locale, _activity, attachments, _activity$channelData, _activity$channelData2, clientActivityID, meta, echoBackCall, sendTimeout, _ref6, echoBack;
+function postActivity(directLine, userID, username, numActivitiesPosted, _ref2) {
+  var method, activity, locale, _activity, attachments, _activity$channelData, _activity$channelData2, clientActivityID, meta, echoBackCall, sendTimeout, _ref5, echoBack;
 
-  return _regenerator.default.wrap(function postActivity$(_context4) {
+  return _regenerator.default.wrap(function postActivity$(_context5) {
     while (1) {
-      switch (_context4.prev = _context4.next) {
+      switch (_context5.prev = _context5.next) {
         case 0:
-          activity = _ref.payload.activity;
-          _context4.next = 3;
-          return (0, _effects.select)(function (_ref2) {
-            var language = _ref2.language;
-            return language;
-          });
+          method = _ref2.meta.method, activity = _ref2.payload.activity;
+          _context5.next = 3;
+          return (0, _effects.select)(_language.default);
 
         case 3:
-          locale = _context4.sent;
+          locale = _context5.sent;
           _activity = activity, attachments = _activity.attachments, _activity$channelData = _activity.channelData;
@@ -131,2 +136,3 @@ _activity$channelData = _activity$channelData === void 0 ? {} : _activity$channelData;
               id: userID,
+              name: username,
               role: 'user'
@@ -150,15 +156,16 @@ },
           meta = {
-            clientActivityID: clientActivityID
+            clientActivityID: clientActivityID,
+            method: method
           };
-          _context4.next = 12;
+          _context5.next = 12;
           return (0, _effects.put)({
             type: _postActivity.POST_ACTIVITY_PENDING,
+            meta: meta,
             payload: {
               activity: activity
-            },
-            meta: meta
+            }
           });
 
         case 12:
-          _context4.prev = 12;
+          _context5.prev = 12;
           // Quirks: We might receive INCOMING_ACTIVITY before the postActivity call completed
@@ -168,14 +175,14 @@ //         So, we setup expectation first, then postActivity afterward
           /*#__PURE__*/
-          _regenerator.default.mark(function _callee3() {
+          _regenerator.default.mark(function _callee4() {
             var _ref4, _activity2, _activity2$channelDat, channelData, id;
 
-            return _regenerator.default.wrap(function _callee3$(_context3) {
+            return _regenerator.default.wrap(function _callee4$(_context4) {
               while (1) {
-                switch (_context3.prev = _context3.next) {
+                switch (_context4.prev = _context4.next) {
                   case 0:
-                    _context3.next = 2;
+                    _context4.next = 2;
                     return (0, _effects.take)(_incomingActivity.INCOMING_ACTIVITY);
 
                   case 2:
-                    _ref4 = _context3.sent;
+                    _ref4 = _context4.sent;
                     _activity2 = _ref4.payload.activity;
@@ -185,10 +192,10 @@ _activity2$channelDat = _activity2.channelData, channelData = _activity2$channelDat === void 0 ? {} : _activity2$channelDat, id = _activity2.id;
                     if (!(channelData.clientActivityID === clientActivityID && id)) {
-                      _context3.next = 7;
+                      _context4.next = 7;
                       break;
                     }
 
-                    return _context3.abrupt("return", _activity2);
+                    return _context4.abrupt("return", _activity2);
 
                   case 7:
-                    _context3.next = 0;
+                    _context4.next = 0;
                     break;
@@ -198,6 +205,6 @@
                   case "end":
-                    return _context3.stop();
+                    return _context4.stop();
                 }
               }
-            }, _callee3, this);
+            }, _callee4, this);
           })); // Timeout could be due to either:
@@ -208,11 +215,8 @@ // - Post activity call may take too long time to complete
 
-          _context4.next = 16;
-          return (0, _effects.select)(function (_ref5) {
-            var sendTimeout = _ref5.sendTimeout;
-            return sendTimeout;
-          });
+          _context5.next = 16;
+          return (0, _effects.select)(_sendTimeout.default);
 
         case 16:
-          sendTimeout = _context4.sent;
-          _context4.next = 19;
+          sendTimeout = _context5.sent;
+          _context5.next = 19;
           return (0, _effects.race)({
@@ -231,5 +235,5 @@ send: (0, _effects.all)({
         case 19:
-          _ref6 = _context4.sent;
-          echoBack = _ref6.send.echoBack;
-          _context4.next = 23;
+          _ref5 = _context5.sent;
+          echoBack = _ref5.send.echoBack;
+          _context5.next = 23;
           return (0, _effects.put)({
@@ -244,9 +248,9 @@ type: _postActivity.POST_ACTIVITY_FULFILLED,
         case 23:
-          _context4.next = 29;
+          _context5.next = 29;
           break;
 
         case 25:
-          _context4.prev = 25;
-          _context4.t0 = _context4["catch"](12);
-          _context4.next = 29;
+          _context5.prev = 25;
+          _context5.t0 = _context5["catch"](12);
+          _context5.next = 29;
           return (0, _effects.put)({
@@ -256,17 +260,17 @@ type: _postActivity.POST_ACTIVITY_REJECTED,
             meta: meta,
-            payload: _context4.t0
+            payload: _context5.t0
           });
 
         case 29:
-          _context4.prev = 29;
-          _context4.next = 32;
+          _context5.prev = 29;
+          _context5.next = 32;
           return (0, _effects.cancelled)();
 
         case 32:
-          if (!_context4.sent) {
-            _context4.next = 35;
+          if (!_context5.sent) {
+            _context5.next = 35;
             break;
           }
 
-          _context4.next = 35;
+          _context5.next = 35;
           return (0, _effects.put)({
@@ -280,7 +284,7 @@ type: _postActivity.POST_ACTIVITY_REJECTED,
         case 35:
-          return _context4.finish(29);
+          return _context5.finish(29);
 
         case 36:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
@@ -290,2 +294,2 @@ }
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/sagas/postActivitySaga.js"],"names":["postActivity","directLine","userID","numActivitiesPosted","POST_ACTIVITY","action","activity","payload","language","locale","attachments","channelData","clientActivityID","map","contentType","contentUrl","name","channelId","from","id","role","timestamp","entities","requiresBotState","supportsListening","supportsTts","type","meta","POST_ACTIVITY_PENDING","echoBackCall","INCOMING_ACTIVITY","sendTimeout","send","echoBack","timeout","then","Promise","reject","Error","POST_ACTIVITY_FULFILLED","POST_ACTIVITY_REJECTED","error"],"mappings":"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","sourcesContent":["import {\n  all,\n  call,\n  cancelled,\n  fork,\n  put,\n  race,\n  select,\n  take\n} from 'redux-saga/effects';\n\nimport sleep from '../utils/sleep';\n\nimport observeOnce from './effects/observeOnce';\nimport whileConnected from './effects/whileConnected';\n\nimport deleteKey from '../utils/deleteKey';\nimport getTimestamp from '../utils/getTimestamp';\nimport uniqueID from '../utils/uniqueID';\n\nimport {\n  POST_ACTIVITY,\n  POST_ACTIVITY_FULFILLED,\n  POST_ACTIVITY_PENDING,\n  POST_ACTIVITY_REJECTED\n} from '../actions/postActivity';\n\nimport { INCOMING_ACTIVITY } from '../actions/incomingActivity';\n\nexport default function* () {\n  yield whileConnected(function* (directLine, userID) {\n    for (let numActivitiesPosted = 0;; numActivitiesPosted++) {\n      const action = yield take(POST_ACTIVITY);\n\n      yield fork(postActivity, directLine, userID, numActivitiesPosted, action);\n    }\n  });\n}\n\nfunction* postActivity(directLine, userID, numActivitiesPosted, { payload: { activity } }) {\n  const locale = yield select(({ language }) => language);\n  const { attachments, channelData: { clientActivityID = uniqueID() } = {} } = activity;\n\n  activity = {\n    ...deleteKey(activity, 'id'),\n    attachments: attachments && attachments.map(({ contentType, contentUrl, name }) => ({\n      contentType,\n      contentUrl,\n      name\n    })),\n    channelData: {\n      clientActivityID,\n      ...deleteKey(activity.channelData, 'state')\n    },\n    channelId: 'webchat',\n    from: {\n      id: userID,\n      role: 'user'\n    },\n    locale,\n    timestamp: getTimestamp()\n  };\n\n  if (!numActivitiesPosted) {\n    activity.entities = [...activity.entities || [], {\n      // TODO: [P4] Currently in v3, we send the capabilities although the client might not actually have them\n      //       We need to understand why we need to send these, and only send capabilities the client have\n      requiresBotState: true,\n      supportsListening: true,\n      supportsTts: true,\n      type: 'ClientCapabilities'\n    }];\n  }\n\n  const meta = { clientActivityID };\n\n  yield put({ type: POST_ACTIVITY_PENDING, payload: { activity }, meta });\n\n  try {\n    // Quirks: We might receive INCOMING_ACTIVITY before the postActivity call completed\n    //         So, we setup expectation first, then postActivity afterward\n\n    const echoBackCall = call(function* () {\n      for (;;) {\n        const { payload: { activity } } = yield take(INCOMING_ACTIVITY);\n        const { channelData = {}, id } = activity;\n\n        if (channelData.clientActivityID === clientActivityID && id) {\n          return activity;\n        }\n      }\n    });\n\n    // Timeout could be due to either:\n    // - Post activity call may take too long time to complete\n    //   - Direct Line service only respond on HTTP after bot respond to Direct Line\n    // - Activity may take too long time to echo back\n\n    const sendTimeout = yield select(({ sendTimeout }) => sendTimeout);\n\n    const { send: { echoBack } } = yield race({\n      send: all({\n        echoBack: echoBackCall,\n        postActivity: observeOnce(directLine.postActivity(activity))\n      }),\n      timeout: call(() => sleep(sendTimeout).then(() => Promise.reject(new Error('timeout'))))\n    });\n\n    yield put({ type: POST_ACTIVITY_FULFILLED, meta, payload: { activity: echoBack } });\n  } catch (err) {\n    yield put({ type: POST_ACTIVITY_REJECTED, error: true, meta, payload: err });\n  } finally {\n    if (yield cancelled()) {\n      yield put({ type: POST_ACTIVITY_REJECTED, error: true, meta, payload: new Error('cancelled') });\n    }\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/sagas/postActivitySaga.js"],"names":["postActivity","directLine","userID","username","numActivitiesPosted","POST_ACTIVITY","action","method","meta","activity","payload","languageSelector","locale","attachments","channelData","clientActivityID","map","contentType","contentUrl","name","channelId","from","id","role","timestamp","entities","requiresBotState","supportsListening","supportsTts","type","POST_ACTIVITY_PENDING","echoBackCall","INCOMING_ACTIVITY","sendTimeoutSelector","sendTimeout","send","echoBack","timeout","then","Promise","reject","Error","POST_ACTIVITY_FULFILLED","POST_ACTIVITY_REJECTED","error"],"mappings":";;;;;;;;;;;;;;;AAAA;;AAWA;;AACA;;AAEA;;AACA;;AAEA;;AACA;;AACA;;AACA;;AAEA;;AAOA;;;;;;;0BAYUA,Y;;AAVK;AAAA;AAAA;AAAA;AAAA;AAAA;AACb,iBAAM;AAAA;AAAA,oCAAe;AAAA;AAAA;AAAA;AAAA;AAAA;AAAaC,oBAAAA,UAAb,QAAaA,UAAb,EAAyBC,MAAzB,QAAyBA,MAAzB,EAAiCC,QAAjC,QAAiCA,QAAjC;AACfC,oBAAAA,mBADe,GACO,CADP;AAAA;AAGnB,2BAAM,wBAAUC,2BAAV;AAAA;AAAA,8CAAyB,iBAAWC,MAAX;AAAA;AAAA;AAAA;AAAA;AAC7B,4DAAON,YAAY,CAACC,UAAD,EAAaC,MAAb,EAAqBC,QAArB,EAA+BC,mBAAmB,EAAlD,EAAsDE,MAAtD,CAAnB;;AAD6B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAzB,EAAN;;AAHmB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,WAAf,EAAN;;AADa;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAUf,SAAUN,YAAV,CAAuBC,UAAvB,EAAmCC,MAAnC,EAA2CC,QAA3C,EAAqDC,mBAArD;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAoFG,UAAAA,MAApF,SAA4EC,IAA5E,CAAoFD,MAApF,EAAyGE,QAAzG,SAA8FC,OAA9F,CAAyGD,QAAzG;AAAA;AACiB,iBAAM,qBAAOE,iBAAP,CAAN;;AADjB;AACQC,UAAAA,MADR;AAAA,sBAE+EH,QAF/E,EAEUI,WAFV,aAEUA,WAFV,oCAEuBC,WAFvB;AAAA,qEAEwE,EAFxE;AAAA,yDAEsCC,gBAFtC,EAEsCA,gBAFtC,uCAEyD,wBAFzD;AAIEN,UAAAA,QAAQ,mCACH,wBAAUA,QAAV,EAAoB,IAApB,CADG;AAENI,YAAAA,WAAW,EAAEA,WAAW,IAAIA,WAAW,CAACG,GAAZ,CAAgB;AAAA,kBAAGC,WAAH,SAAGA,WAAH;AAAA,kBAAgBC,UAAhB,SAAgBA,UAAhB;AAAA,kBAA4BC,IAA5B,SAA4BA,IAA5B;AAAA,qBAAwC;AAClFF,gBAAAA,WAAW,EAAXA,WADkF;AAElFC,gBAAAA,UAAU,EAAVA,UAFkF;AAGlFC,gBAAAA,IAAI,EAAJA;AAHkF,eAAxC;AAAA,aAAhB,CAFtB;AAONL,YAAAA,WAAW;AACTC,cAAAA,gBAAgB,EAAhBA;AADS,eAEN,wBAAUN,QAAQ,CAACK,WAAnB,EAAgC,OAAhC,CAFM,CAPL;AAWNM,YAAAA,SAAS,EAAE,SAXL;AAYNC,YAAAA,IAAI,EAAE;AACJC,cAAAA,EAAE,EAAEpB,MADA;AAEJiB,cAAAA,IAAI,EAAEhB,QAFF;AAGJoB,cAAAA,IAAI,EAAE;AAHF,aAZA;AAiBNX,YAAAA,MAAM,EAANA,MAjBM;AAkBNY,YAAAA,SAAS,EAAE;AAlBL,YAAR;;AAqBA,cAAI,CAACpB,mBAAL,EAA0B;AACxBK,YAAAA,QAAQ,CAACgB,QAAT,oCAAwBhB,QAAQ,CAACgB,QAAT,IAAqB,EAA7C,UAAiD;AAC/C;AACA;AACAC,cAAAA,gBAAgB,EAAE,IAH6B;AAI/CC,cAAAA,iBAAiB,EAAE,IAJ4B;AAK/CC,cAAAA,WAAW,EAAE,IALkC;AAM/CC,cAAAA,IAAI,EAAE;AANyC,aAAjD;AAQD;;AAEKrB,UAAAA,IApCR,GAoCe;AAAEO,YAAAA,gBAAgB,EAAhBA,gBAAF;AAAoBR,YAAAA,MAAM,EAANA;AAApB,WApCf;AAAA;AAsCE,iBAAM,kBAAI;AAAEsB,YAAAA,IAAI,EAAEC,mCAAR;AAA+BtB,YAAAA,IAAI,EAAJA,IAA/B;AAAqCE,YAAAA,OAAO,EAAE;AAAED,cAAAA,QAAQ,EAARA;AAAF;AAA9C,WAAJ,CAAN;;AAtCF;AAAA;AAyCI;AACA;AAEMsB,UAAAA,YA5CV,GA4CyB;AAAA;AAAA,oCAAK;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEY,2BAAM,mBAAKC,mCAAL,CAAN;;AAFZ;AAAA;AAEHvB,oBAAAA,UAFG,SAEdC,OAFc,CAEHD,QAFG;AAAA,4CAGWA,UAHX,CAGdK,WAHc,EAGdA,WAHc,sCAGA,EAHA,0BAGIQ,EAHJ,GAGWb,UAHX,CAGIa,EAHJ;;AAAA,0BAKlBR,WAAW,CAACC,gBAAZ,KAAiCA,gBAAjC,IAAqDO,EALnC;AAAA;AAAA;AAAA;;AAAA,sDAMbb,UANa;;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,WAAL,EA5CzB,EAuDI;AACA;AACA;AACA;;AA1DJ;AA4DwB,iBAAM,qBAAOwB,oBAAP,CAAN;;AA5DxB;AA4DUC,UAAAA,WA5DV;AAAA;AA8DmC,iBAAM,mBAAK;AACxCC,YAAAA,IAAI,EAAE,kBAAI;AACRC,cAAAA,QAAQ,EAAEL,YADF;AAER/B,cAAAA,YAAY,EAAE,0BAAYC,UAAU,CAACD,YAAX,CAAwBS,QAAxB,CAAZ;AAFN,aAAJ,CADkC;AAKxC4B,YAAAA,OAAO,EAAE,mBAAK;AAAA,qBAAM,oBAAMH,WAAN,EAAmBI,IAAnB,CAAwB;AAAA,uBAAMC,OAAO,CAACC,MAAR,CAAe,IAAIC,KAAJ,CAAU,SAAV,CAAf,CAAN;AAAA,eAAxB,CAAN;AAAA,aAAL;AAL+B,WAAL,CAAN;;AA9DnC;AAAA;AA8DoBL,UAAAA,QA9DpB,SA8DYD,IA9DZ,CA8DoBC,QA9DpB;AAAA;AAsEI,iBAAM,kBAAI;AAAEP,YAAAA,IAAI,EAAEa,qCAAR;AAAiClC,YAAAA,IAAI,EAAJA,IAAjC;AAAuCE,YAAAA,OAAO,EAAE;AAAED,cAAAA,QAAQ,EAAE2B;AAAZ;AAAhD,WAAJ,CAAN;;AAtEJ;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAwEI,iBAAM,kBAAI;AAAEP,YAAAA,IAAI,EAAEc,oCAAR;AAAgCC,YAAAA,KAAK,EAAE,IAAvC;AAA6CpC,YAAAA,IAAI,EAAJA,IAA7C;AAAmDE,YAAAA,OAAO;AAA1D,WAAJ,CAAN;;AAxEJ;AAAA;AAAA;AA0EQ,iBAAM,yBAAN;;AA1ER;AAAA;AAAA;AAAA;AAAA;;AAAA;AA2EM,iBAAM,kBAAI;AAAEmB,YAAAA,IAAI,EAAEc,oCAAR;AAAgCC,YAAAA,KAAK,EAAE,IAAvC;AAA6CpC,YAAAA,IAAI,EAAJA,IAA7C;AAAmDE,YAAAA,OAAO,EAAE,IAAI+B,KAAJ,CAAU,WAAV;AAA5D,WAAJ,CAAN;;AA3EN;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA","sourcesContent":["import {\n  all,\n  call,\n  cancelled,\n  put,\n  race,\n  select,\n  take,\n  takeEvery\n} from 'redux-saga/effects';\n\nimport observeOnce from './effects/observeOnce';\nimport whileConnected from './effects/whileConnected';\n\nimport languageSelector from '../selectors/language';\nimport sendTimeoutSelector from '../selectors/sendTimeout';\n\nimport deleteKey from '../utils/deleteKey';\nimport getTimestamp from '../utils/getTimestamp';\nimport sleep from '../utils/sleep';\nimport uniqueID from '../utils/uniqueID';\n\nimport {\n  POST_ACTIVITY,\n  POST_ACTIVITY_FULFILLED,\n  POST_ACTIVITY_PENDING,\n  POST_ACTIVITY_REJECTED\n} from '../actions/postActivity';\n\nimport { INCOMING_ACTIVITY } from '../actions/incomingActivity';\n\nexport default function* () {\n  yield whileConnected(function* ({ directLine, userID, username }) {\n    let numActivitiesPosted = 0;\n\n    yield takeEvery(POST_ACTIVITY, function* (action) {\n      yield* postActivity(directLine, userID, username, numActivitiesPosted++, action);\n    });\n  });\n}\n\nfunction* postActivity(directLine, userID, username, numActivitiesPosted, { meta: { method }, payload: { activity } }) {\n  const locale = yield select(languageSelector);\n  const { attachments, channelData: { clientActivityID = uniqueID() } = {} } = activity;\n\n  activity = {\n    ...deleteKey(activity, 'id'),\n    attachments: attachments && attachments.map(({ contentType, contentUrl, name }) => ({\n      contentType,\n      contentUrl,\n      name\n    })),\n    channelData: {\n      clientActivityID,\n      ...deleteKey(activity.channelData, 'state')\n    },\n    channelId: 'webchat',\n    from: {\n      id: userID,\n      name: username,\n      role: 'user'\n    },\n    locale,\n    timestamp: getTimestamp()\n  };\n\n  if (!numActivitiesPosted) {\n    activity.entities = [...activity.entities || [], {\n      // TODO: [P4] Currently in v3, we send the capabilities although the client might not actually have them\n      //       We need to understand why we need to send these, and only send capabilities the client have\n      requiresBotState: true,\n      supportsListening: true,\n      supportsTts: true,\n      type: 'ClientCapabilities'\n    }];\n  }\n\n  const meta = { clientActivityID, method };\n\n  yield put({ type: POST_ACTIVITY_PENDING, meta, payload: { activity } });\n\n  try {\n    // Quirks: We might receive INCOMING_ACTIVITY before the postActivity call completed\n    //         So, we setup expectation first, then postActivity afterward\n\n    const echoBackCall = call(function* () {\n      for (;;) {\n        const { payload: { activity } } = yield take(INCOMING_ACTIVITY);\n        const { channelData = {}, id } = activity;\n\n        if (channelData.clientActivityID === clientActivityID && id) {\n          return activity;\n        }\n      }\n    });\n\n    // Timeout could be due to either:\n    // - Post activity call may take too long time to complete\n    //   - Direct Line service only respond on HTTP after bot respond to Direct Line\n    // - Activity may take too long time to echo back\n\n    const sendTimeout = yield select(sendTimeoutSelector);\n\n    const { send: { echoBack } } = yield race({\n      send: all({\n        echoBack: echoBackCall,\n        postActivity: observeOnce(directLine.postActivity(activity))\n      }),\n      timeout: call(() => sleep(sendTimeout).then(() => Promise.reject(new Error('timeout'))))\n    });\n\n    yield put({ type: POST_ACTIVITY_FULFILLED, meta, payload: { activity: echoBack } });\n  } catch (err) {\n    yield put({ type: POST_ACTIVITY_REJECTED, error: true, meta, payload: err });\n  } finally {\n    if (yield cancelled()) {\n      yield put({ type: POST_ACTIVITY_REJECTED, error: true, meta, payload: new Error('cancelled') });\n    }\n  }\n}\n"]}

lib/sagas/sendFilesToPostActivitySaga.js

@@ -8,3 +8,3 @@ "use strict";
 });
-exports.default = _callee2;
+exports.default = _callee;
 
@@ -15,3 +15,3 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _mime = _interopRequireDefault(require("mime"));
+var _mimeWrapper = _interopRequireDefault(require("../utils/mime-wrapper"));
 
@@ -24,77 +24,84 @@ var _whileConnected = _interopRequireDefault(require("./effects/whileConnected"));
 
-var _stopSpeakingActivity = _interopRequireDefault(require("../actions/stopSpeakingActivity"));
-
 var _marked =
 /*#__PURE__*/
-_regenerator.default.mark(_callee2);
+_regenerator.default.mark(_callee),
+    _marked2 =
+/*#__PURE__*/
+_regenerator.default.mark(sendFilesToPostActivity),
+    _marked3 =
+/*#__PURE__*/
+_regenerator.default.mark(postActivityWithFiles);
 
-var getType = _mime.default.getType.bind(_mime.default);
+var getType = _mimeWrapper.default.getType.bind(_mimeWrapper.default);
 
-function _callee2() {
-  return _regenerator.default.wrap(function _callee2$(_context2) {
+function _callee() {
+  return _regenerator.default.wrap(function _callee$(_context) {
     while (1) {
+      switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return (0, _whileConnected.default)(sendFilesToPostActivity);
+
+        case 2:
+        case "end":
+          return _context.stop();
+      }
+    }
+  }, _marked, this);
+}
+
+function sendFilesToPostActivity() {
+  return _regenerator.default.wrap(function sendFilesToPostActivity$(_context2) {
+    while (1) {
       switch (_context2.prev = _context2.next) {
         case 0:
           _context2.next = 2;
-          return (0, _whileConnected.default)(
-          /*#__PURE__*/
-          _regenerator.default.mark(function _callee() {
-            var _ref, files;
+          return (0, _effects.takeEvery)(function (_ref) {
+            var payload = _ref.payload,
+                type = _ref.type;
+            return type === _sendFiles.SEND_FILES && payload.files.length;
+          }, postActivityWithFiles);
 
-            return _regenerator.default.wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.next = 2;
-                    return (0, _effects.take)(_sendFiles.SEND_FILES);
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }
+  }, _marked2, this);
+}
 
-                  case 2:
-                    _ref = _context.sent;
-                    files = _ref.payload.files;
-
-                    if (!files.length) {
-                      _context.next = 9;
-                      break;
-                    }
-
-                    _context.next = 7;
-                    return (0, _effects.put)((0, _postActivity.default)({
-                      attachments: [].map.call(files, function (file) {
-                        return {
-                          contentType: getType(file.name) || 'application/octet-stream',
-                          contentUrl: file.url,
-                          name: file.name
-                        };
-                      }),
-                      channelData: {
-                        attachmentSizes: [].map.call(files, function (file) {
-                          return file.size;
-                        })
-                      },
-                      type: 'message'
-                    }));
-
-                  case 7:
-                    _context.next = 9;
-                    return (0, _effects.put)((0, _stopSpeakingActivity.default)());
-
-                  case 9:
-                    _context.next = 0;
-                    break;
-
-                  case 11:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee, this);
+function postActivityWithFiles(_ref2) {
+  var files;
+  return _regenerator.default.wrap(function postActivityWithFiles$(_context3) {
+    while (1) {
+      switch (_context3.prev = _context3.next) {
+        case 0:
+          files = _ref2.payload.files;
+          _context3.next = 3;
+          return (0, _effects.put)((0, _postActivity.default)({
+            attachments: [].map.call(files, function (_ref3) {
+              var name = _ref3.name,
+                  url = _ref3.url;
+              return {
+                contentType: getType(name) || 'application/octet-stream',
+                contentUrl: url,
+                name: name
+              };
+            }),
+            channelData: {
+              attachmentSizes: [].map.call(files, function (_ref4) {
+                var size = _ref4.size;
+                return size;
+              })
+            },
+            type: 'message'
           }));
 
-        case 2:
+        case 3:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
     }
-  }, _marked, this);
+  }, _marked3, this);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9zZW5kRmlsZXNUb1Bvc3RBY3Rpdml0eVNhZ2EuanMiXSwibmFtZXMiOlsiZ2V0VHlwZSIsIm1pbWUiLCJiaW5kIiwiU0VORF9GSUxFUyIsImZpbGVzIiwicGF5bG9hZCIsImxlbmd0aCIsImF0dGFjaG1lbnRzIiwibWFwIiwiY2FsbCIsImZpbGUiLCJjb250ZW50VHlwZSIsIm5hbWUiLCJjb250ZW50VXJsIiwidXJsIiwiY2hhbm5lbERhdGEiLCJhdHRhY2htZW50U2l6ZXMiLCJzaXplIiwidHlwZSJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQTs7QUFLQTs7QUFFQTs7QUFFQTs7QUFDQTs7QUFDQTs7Ozs7O0FBRUEsSUFBTUEsT0FBTyxHQUFHQyxjQUFLRCxPQUFMLENBQWFFLElBQWIsQ0FBa0JELGFBQWxCLENBQWhCOztBQUVlO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNiLGlCQUFNO0FBQUE7QUFBQSxvQ0FBZTtBQUFBOztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFYywyQkFBTSxtQkFBS0UscUJBQUwsQ0FBTjs7QUFGZDtBQUFBO0FBRUVDLG9CQUFBQSxLQUZGLFFBRVRDLE9BRlMsQ0FFRUQsS0FGRjs7QUFBQSx5QkFJYkEsS0FBSyxDQUFDRSxNQUpPO0FBQUE7QUFBQTtBQUFBOztBQUFBO0FBS2YsMkJBQU0sa0JBQUksMkJBQWE7QUFDckJDLHNCQUFBQSxXQUFXLEVBQUUsR0FBR0MsR0FBSCxDQUFPQyxJQUFQLENBQVlMLEtBQVosRUFBbUIsVUFBQU0sSUFBSTtBQUFBLCtCQUFLO0FBQ3ZDQywwQkFBQUEsV0FBVyxFQUFFWCxPQUFPLENBQUNVLElBQUksQ0FBQ0UsSUFBTixDQUFQLElBQXNCLDBCQURJO0FBRXZDQywwQkFBQUEsVUFBVSxFQUFFSCxJQUFJLENBQUNJLEdBRnNCO0FBR3ZDRiwwQkFBQUEsSUFBSSxFQUFFRixJQUFJLENBQUNFO0FBSDRCLHlCQUFMO0FBQUEsdUJBQXZCLENBRFE7QUFNckJHLHNCQUFBQSxXQUFXLEVBQUU7QUFDWEMsd0JBQUFBLGVBQWUsRUFBRSxHQUFHUixHQUFILENBQU9DLElBQVAsQ0FBWUwsS0FBWixFQUFtQixVQUFBTSxJQUFJO0FBQUEsaUNBQUlBLElBQUksQ0FBQ08sSUFBVDtBQUFBLHlCQUF2QjtBQUROLHVCQU5RO0FBU3JCQyxzQkFBQUEsSUFBSSxFQUFFO0FBVGUscUJBQWIsQ0FBSixDQUFOOztBQUxlO0FBQUE7QUFpQmYsMkJBQU0sa0JBQUksb0NBQUosQ0FBTjs7QUFqQmU7QUFBQTtBQUFBOztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLFdBQWYsRUFBTjs7QUFEYTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIHB1dCxcbiAgdGFrZVxufSBmcm9tICdyZWR1eC1zYWdhL2VmZmVjdHMnO1xuXG5pbXBvcnQgbWltZSBmcm9tICdtaW1lJztcblxuaW1wb3J0IHdoaWxlQ29ubmVjdGVkIGZyb20gJy4vZWZmZWN0cy93aGlsZUNvbm5lY3RlZCc7XG5cbmltcG9ydCB7IFNFTkRfRklMRVMgfSBmcm9tICcuLi9hY3Rpb25zL3NlbmRGaWxlcyc7XG5pbXBvcnQgcG9zdEFjdGl2aXR5IGZyb20gJy4uL2FjdGlvbnMvcG9zdEFjdGl2aXR5JztcbmltcG9ydCBzdG9wU3BlYWtpbmdBY3Rpdml0eSBmcm9tICcuLi9hY3Rpb25zL3N0b3BTcGVha2luZ0FjdGl2aXR5JztcblxuY29uc3QgZ2V0VHlwZSA9IG1pbWUuZ2V0VHlwZS5iaW5kKG1pbWUpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiogKCkge1xuICB5aWVsZCB3aGlsZUNvbm5lY3RlZChmdW5jdGlvbiogKCkge1xuICAgIGZvciAoOzspIHtcbiAgICAgIGNvbnN0IHsgcGF5bG9hZDogeyBmaWxlcyB9IH0gPSB5aWVsZCB0YWtlKFNFTkRfRklMRVMpO1xuXG4gICAgICBpZiAoZmlsZXMubGVuZ3RoKSB7XG4gICAgICAgIHlpZWxkIHB1dChwb3N0QWN0aXZpdHkoe1xuICAgICAgICAgIGF0dGFjaG1lbnRzOiBbXS5tYXAuY2FsbChmaWxlcywgZmlsZSA9PiAoe1xuICAgICAgICAgICAgY29udGVudFR5cGU6IGdldFR5cGUoZmlsZS5uYW1lKSB8fCAnYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtJyxcbiAgICAgICAgICAgIGNvbnRlbnRVcmw6IGZpbGUudXJsLFxuICAgICAgICAgICAgbmFtZTogZmlsZS5uYW1lXG4gICAgICAgICAgfSkpLFxuICAgICAgICAgIGNoYW5uZWxEYXRhOiB7XG4gICAgICAgICAgICBhdHRhY2htZW50U2l6ZXM6IFtdLm1hcC5jYWxsKGZpbGVzLCBmaWxlID0+IGZpbGUuc2l6ZSlcbiAgICAgICAgICB9LFxuICAgICAgICAgIHR5cGU6ICdtZXNzYWdlJ1xuICAgICAgICB9KSk7XG5cbiAgICAgICAgeWllbGQgcHV0KHN0b3BTcGVha2luZ0FjdGl2aXR5KCkpO1xuICAgICAgfVxuICAgIH1cbiAgfSk7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9zZW5kRmlsZXNUb1Bvc3RBY3Rpdml0eVNhZ2EuanMiXSwibmFtZXMiOlsic2VuZEZpbGVzVG9Qb3N0QWN0aXZpdHkiLCJwb3N0QWN0aXZpdHlXaXRoRmlsZXMiLCJnZXRUeXBlIiwibWltZSIsImJpbmQiLCJwYXlsb2FkIiwidHlwZSIsIlNFTkRfRklMRVMiLCJmaWxlcyIsImxlbmd0aCIsImF0dGFjaG1lbnRzIiwibWFwIiwiY2FsbCIsIm5hbWUiLCJ1cmwiLCJjb250ZW50VHlwZSIsImNvbnRlbnRVcmwiLCJjaGFubmVsRGF0YSIsImF0dGFjaG1lbnRTaXplcyIsInNpemUiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBS0E7O0FBRUE7O0FBRUE7O0FBQ0E7Ozs7Ozs7MEJBUVVBLHVCOzs7MEJBVUFDLHFCOztBQWhCVixJQUFNQyxPQUFPLEdBQUdDLHFCQUFLRCxPQUFMLENBQWFFLElBQWIsQ0FBa0JELG9CQUFsQixDQUFoQjs7QUFFZTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDYixpQkFBTSw2QkFBZUgsdUJBQWYsQ0FBTjs7QUFEYTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTs7QUFJZixTQUFVQSx1QkFBVjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDRSxpQkFBTSx3QkFDSjtBQUFBLGdCQUFHSyxPQUFILFFBQUdBLE9BQUg7QUFBQSxnQkFBWUMsSUFBWixRQUFZQSxJQUFaO0FBQUEsbUJBQ0VBLElBQUksS0FBS0MscUJBQVQsSUFDR0YsT0FBTyxDQUFDRyxLQUFSLENBQWNDLE1BRm5CO0FBQUEsV0FESSxFQUtKUixxQkFMSSxDQUFOOztBQURGO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBOztBQVVBLFNBQVVBLHFCQUFWO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUE2Q08sVUFBQUEsS0FBN0MsU0FBa0NILE9BQWxDLENBQTZDRyxLQUE3QztBQUFBO0FBQ0UsaUJBQU0sa0JBQUksMkJBQWE7QUFDckJFLFlBQUFBLFdBQVcsRUFBRSxHQUFHQyxHQUFILENBQU9DLElBQVAsQ0FBWUosS0FBWixFQUFtQjtBQUFBLGtCQUFHSyxJQUFILFNBQUdBLElBQUg7QUFBQSxrQkFBU0MsR0FBVCxTQUFTQSxHQUFUO0FBQUEscUJBQW9CO0FBQ2xEQyxnQkFBQUEsV0FBVyxFQUFFYixPQUFPLENBQUNXLElBQUQsQ0FBUCxJQUFpQiwwQkFEb0I7QUFFbERHLGdCQUFBQSxVQUFVLEVBQUVGLEdBRnNDO0FBR2xERCxnQkFBQUEsSUFBSSxFQUFFQTtBQUg0QyxlQUFwQjtBQUFBLGFBQW5CLENBRFE7QUFNckJJLFlBQUFBLFdBQVcsRUFBRTtBQUNYQyxjQUFBQSxlQUFlLEVBQUUsR0FBR1AsR0FBSCxDQUFPQyxJQUFQLENBQVlKLEtBQVosRUFBbUI7QUFBQSxvQkFBR1csSUFBSCxTQUFHQSxJQUFIO0FBQUEsdUJBQWNBLElBQWQ7QUFBQSxlQUFuQjtBQUROLGFBTlE7QUFTckJiLFlBQUFBLElBQUksRUFBRTtBQVRlLFdBQWIsQ0FBSixDQUFOOztBQURGO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgcHV0LFxuICB0YWtlRXZlcnlcbn0gZnJvbSAncmVkdXgtc2FnYS9lZmZlY3RzJztcblxuaW1wb3J0IG1pbWUgZnJvbSAnLi4vdXRpbHMvbWltZS13cmFwcGVyJztcblxuaW1wb3J0IHdoaWxlQ29ubmVjdGVkIGZyb20gJy4vZWZmZWN0cy93aGlsZUNvbm5lY3RlZCc7XG5cbmltcG9ydCB7IFNFTkRfRklMRVMgfSBmcm9tICcuLi9hY3Rpb25zL3NlbmRGaWxlcyc7XG5pbXBvcnQgcG9zdEFjdGl2aXR5IGZyb20gJy4uL2FjdGlvbnMvcG9zdEFjdGl2aXR5JztcblxuY29uc3QgZ2V0VHlwZSA9IG1pbWUuZ2V0VHlwZS5iaW5kKG1pbWUpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiogKCkge1xuICB5aWVsZCB3aGlsZUNvbm5lY3RlZChzZW5kRmlsZXNUb1Bvc3RBY3Rpdml0eSk7XG59XG5cbmZ1bmN0aW9uKiBzZW5kRmlsZXNUb1Bvc3RBY3Rpdml0eSgpIHtcbiAgeWllbGQgdGFrZUV2ZXJ5KFxuICAgICh7IHBheWxvYWQsIHR5cGUgfSkgPT4gKFxuICAgICAgdHlwZSA9PT0gU0VORF9GSUxFU1xuICAgICAgJiYgcGF5bG9hZC5maWxlcy5sZW5ndGhcbiAgICApLFxuICAgIHBvc3RBY3Rpdml0eVdpdGhGaWxlc1xuICApO1xufVxuXG5mdW5jdGlvbiogcG9zdEFjdGl2aXR5V2l0aEZpbGVzKHsgcGF5bG9hZDogeyBmaWxlcyB9IH0pIHtcbiAgeWllbGQgcHV0KHBvc3RBY3Rpdml0eSh7XG4gICAgYXR0YWNobWVudHM6IFtdLm1hcC5jYWxsKGZpbGVzLCAoeyBuYW1lLCB1cmwgfSkgPT4gKHtcbiAgICAgIGNvbnRlbnRUeXBlOiBnZXRUeXBlKG5hbWUpIHx8ICdhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0nLFxuICAgICAgY29udGVudFVybDogdXJsLFxuICAgICAgbmFtZTogbmFtZVxuICAgIH0pKSxcbiAgICBjaGFubmVsRGF0YToge1xuICAgICAgYXR0YWNobWVudFNpemVzOiBbXS5tYXAuY2FsbChmaWxlcywgKHsgc2l6ZSB9KSA9PiBzaXplKVxuICAgIH0sXG4gICAgdHlwZTogJ21lc3NhZ2UnXG4gIH0pKTtcbn1cbiJdfQ==

lib/sagas/sendMessageToPostActivitySaga.js

@@ -8,3 +8,3 @@ "use strict";
 });
-exports.default = _callee2;
+exports.default = _callee;
 
@@ -21,82 +21,70 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _startSpeakingActivity = _interopRequireDefault(require("../actions/startSpeakingActivity"));
-
-var _stopSpeakingActivity = _interopRequireDefault(require("../actions/stopSpeakingActivity"));
-
 var _marked =
 /*#__PURE__*/
-_regenerator.default.mark(_callee2);
+_regenerator.default.mark(_callee),
+    _marked2 =
+/*#__PURE__*/
+_regenerator.default.mark(sendMessageToPostActivity),
+    _marked3 =
+/*#__PURE__*/
+_regenerator.default.mark(postActivityWithMessage);
 
-function _callee2() {
-  return _regenerator.default.wrap(function _callee2$(_context2) {
+function _callee() {
+  return _regenerator.default.wrap(function _callee$(_context) {
     while (1) {
+      switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return (0, _whileConnected.default)(sendMessageToPostActivity);
+
+        case 2:
+        case "end":
+          return _context.stop();
+      }
+    }
+  }, _marked, this);
+}
+
+function sendMessageToPostActivity() {
+  return _regenerator.default.wrap(function sendMessageToPostActivity$(_context2) {
+    while (1) {
       switch (_context2.prev = _context2.next) {
         case 0:
           _context2.next = 2;
-          return (0, _whileConnected.default)(
-          /*#__PURE__*/
-          _regenerator.default.mark(function _callee() {
-            var _ref, _ref$payload, text, via;
+          return (0, _effects.takeEvery)(function (_ref) {
+            var payload = _ref.payload,
+                type = _ref.type;
+            return type === _sendMessage.SEND_MESSAGE && payload.text;
+          }, postActivityWithMessage);
 
-            return _regenerator.default.wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.next = 2;
-                    return (0, _effects.take)(_sendMessage.SEND_MESSAGE);
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }
+  }, _marked2, this);
+}
 
-                  case 2:
-                    _ref = _context.sent;
-                    _ref$payload = _ref.payload;
-                    text = _ref$payload.text;
-                    via = _ref$payload.via;
+function postActivityWithMessage(_ref2) {
+  var _ref2$payload, method, text;
 
-                    if (!text) {
-                      _context.next = 16;
-                      break;
-                    }
+  return _regenerator.default.wrap(function postActivityWithMessage$(_context3) {
+    while (1) {
+      switch (_context3.prev = _context3.next) {
+        case 0:
+          _ref2$payload = _ref2.payload, method = _ref2$payload.method, text = _ref2$payload.text;
+          _context3.next = 3;
+          return (0, _effects.put)((0, _postActivity.default)({
+            text: text,
+            textFormat: 'plain',
+            type: 'message'
+          }, method));
 
-                    _context.next = 9;
-                    return (0, _effects.put)((0, _postActivity.default)({
-                      text: text,
-                      textFormat: 'plain',
-                      type: 'message'
-                    }));
-
-                  case 9:
-                    if (!(via === 'speech')) {
-                      _context.next = 14;
-                      break;
-                    }
-
-                    _context.next = 12;
-                    return (0, _effects.put)((0, _startSpeakingActivity.default)());
-
-                  case 12:
-                    _context.next = 16;
-                    break;
-
-                  case 14:
-                    _context.next = 16;
-                    return (0, _effects.put)((0, _stopSpeakingActivity.default)());
-
-                  case 16:
-                    _context.next = 0;
-                    break;
-
-                  case 18:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee, this);
-          }));
-
-        case 2:
+        case 3:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
     }
-  }, _marked, this);
+  }, _marked3, this);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9zZW5kTWVzc2FnZVRvUG9zdEFjdGl2aXR5U2FnYS5qcyJdLCJuYW1lcyI6WyJTRU5EX01FU1NBR0UiLCJwYXlsb2FkIiwidGV4dCIsInZpYSIsInRleHRGb3JtYXQiLCJ0eXBlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUtBOztBQUVBOztBQUNBOztBQUNBOztBQUNBOzs7Ozs7QUFFZTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDYixpQkFBTTtBQUFBO0FBQUEsb0NBQWU7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRWtCLDJCQUFNLG1CQUFLQSx5QkFBTCxDQUFOOztBQUZsQjtBQUFBO0FBQUEsd0NBRVRDLE9BRlM7QUFFRUMsb0JBQUFBLElBRkYsZ0JBRUVBLElBRkY7QUFFUUMsb0JBQUFBLEdBRlIsZ0JBRVFBLEdBRlI7O0FBQUEseUJBSWJELElBSmE7QUFBQTtBQUFBO0FBQUE7O0FBQUE7QUFLZiwyQkFBTSxrQkFBSSwyQkFBYTtBQUNyQkEsc0JBQUFBLElBQUksRUFBSkEsSUFEcUI7QUFFckJFLHNCQUFBQSxVQUFVLEVBQUUsT0FGUztBQUdyQkMsc0JBQUFBLElBQUksRUFBRTtBQUhlLHFCQUFiLENBQUosQ0FBTjs7QUFMZTtBQUFBLDBCQVdYRixHQUFHLEtBQUssUUFYRztBQUFBO0FBQUE7QUFBQTs7QUFBQTtBQVliLDJCQUFNLGtCQUFJLHFDQUFKLENBQU47O0FBWmE7QUFBQTtBQUFBOztBQUFBO0FBQUE7QUFjYiwyQkFBTSxrQkFBSSxvQ0FBSixDQUFOOztBQWRhO0FBQUE7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxXQUFmLEVBQU47O0FBRGE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBwdXQsXG4gIHRha2Vcbn0gZnJvbSAncmVkdXgtc2FnYS9lZmZlY3RzJztcblxuaW1wb3J0IHdoaWxlQ29ubmVjdGVkIGZyb20gJy4vZWZmZWN0cy93aGlsZUNvbm5lY3RlZCc7XG5cbmltcG9ydCB7IFNFTkRfTUVTU0FHRSB9IGZyb20gJy4uL2FjdGlvbnMvc2VuZE1lc3NhZ2UnO1xuaW1wb3J0IHBvc3RBY3Rpdml0eSBmcm9tICcuLi9hY3Rpb25zL3Bvc3RBY3Rpdml0eSc7XG5pbXBvcnQgc3RhcnRTcGVha2luZ0FjdGl2aXR5IGZyb20gJy4uL2FjdGlvbnMvc3RhcnRTcGVha2luZ0FjdGl2aXR5JztcbmltcG9ydCBzdG9wU3BlYWtpbmdBY3Rpdml0eSBmcm9tICcuLi9hY3Rpb25zL3N0b3BTcGVha2luZ0FjdGl2aXR5JztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24qICgpIHtcbiAgeWllbGQgd2hpbGVDb25uZWN0ZWQoZnVuY3Rpb24qICgpIHtcbiAgICBmb3IgKDs7KSB7XG4gICAgICBjb25zdCB7IHBheWxvYWQ6IHsgdGV4dCwgdmlhIH0gfSA9IHlpZWxkIHRha2UoU0VORF9NRVNTQUdFKTtcblxuICAgICAgaWYgKHRleHQpIHtcbiAgICAgICAgeWllbGQgcHV0KHBvc3RBY3Rpdml0eSh7XG4gICAgICAgICAgdGV4dCxcbiAgICAgICAgICB0ZXh0Rm9ybWF0OiAncGxhaW4nLFxuICAgICAgICAgIHR5cGU6ICdtZXNzYWdlJ1xuICAgICAgICB9KSk7XG5cbiAgICAgICAgaWYgKHZpYSA9PT0gJ3NwZWVjaCcpIHtcbiAgICAgICAgICB5aWVsZCBwdXQoc3RhcnRTcGVha2luZ0FjdGl2aXR5KCkpO1xuICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgIHlpZWxkIHB1dChzdG9wU3BlYWtpbmdBY3Rpdml0eSgpKTtcbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cbiAgfSk7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9zZW5kTWVzc2FnZVRvUG9zdEFjdGl2aXR5U2FnYS5qcyJdLCJuYW1lcyI6WyJzZW5kTWVzc2FnZVRvUG9zdEFjdGl2aXR5IiwicG9zdEFjdGl2aXR5V2l0aE1lc3NhZ2UiLCJwYXlsb2FkIiwidHlwZSIsIlNFTkRfTUVTU0FHRSIsInRleHQiLCJtZXRob2QiLCJ0ZXh0Rm9ybWF0Il0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUtBOztBQUVBOztBQUNBOzs7Ozs7OzBCQU1VQSx5Qjs7OzBCQU9BQyx1Qjs7QUFYSztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDYixpQkFBTSw2QkFBZUQseUJBQWYsQ0FBTjs7QUFEYTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTs7QUFJZixTQUFVQSx5QkFBVjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDRSxpQkFBTSx3QkFBVTtBQUFBLGdCQUFHRSxPQUFILFFBQUdBLE9BQUg7QUFBQSxnQkFBWUMsSUFBWixRQUFZQSxJQUFaO0FBQUEsbUJBQ2RBLElBQUksS0FBS0MseUJBQVQsSUFDR0YsT0FBTyxDQUFDRyxJQUZHO0FBQUEsV0FBVixFQUdISix1QkFIRyxDQUFOOztBQURGO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBOztBQU9BLFNBQVVBLHVCQUFWO0FBQUE7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxnQ0FBb0NDLE9BQXBDLEVBQStDSSxNQUEvQyxpQkFBK0NBLE1BQS9DLEVBQXVERCxJQUF2RCxpQkFBdURBLElBQXZEO0FBQUE7QUFDRSxpQkFBTSxrQkFBSSwyQkFBYTtBQUNyQkEsWUFBQUEsSUFBSSxFQUFKQSxJQURxQjtBQUVyQkUsWUFBQUEsVUFBVSxFQUFFLE9BRlM7QUFHckJKLFlBQUFBLElBQUksRUFBRTtBQUhlLFdBQWIsRUFJUEcsTUFKTyxDQUFKLENBQU47O0FBREY7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBwdXQsXG4gIHRha2VFdmVyeVxufSBmcm9tICdyZWR1eC1zYWdhL2VmZmVjdHMnO1xuXG5pbXBvcnQgd2hpbGVDb25uZWN0ZWQgZnJvbSAnLi9lZmZlY3RzL3doaWxlQ29ubmVjdGVkJztcblxuaW1wb3J0IHsgU0VORF9NRVNTQUdFIH0gZnJvbSAnLi4vYWN0aW9ucy9zZW5kTWVzc2FnZSc7XG5pbXBvcnQgcG9zdEFjdGl2aXR5IGZyb20gJy4uL2FjdGlvbnMvcG9zdEFjdGl2aXR5JztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24qICgpIHtcbiAgeWllbGQgd2hpbGVDb25uZWN0ZWQoc2VuZE1lc3NhZ2VUb1Bvc3RBY3Rpdml0eSk7XG59XG5cbmZ1bmN0aW9uKiBzZW5kTWVzc2FnZVRvUG9zdEFjdGl2aXR5KCkge1xuICB5aWVsZCB0YWtlRXZlcnkoKHsgcGF5bG9hZCwgdHlwZSB9KSA9PiAoXG4gICAgdHlwZSA9PT0gU0VORF9NRVNTQUdFXG4gICAgJiYgcGF5bG9hZC50ZXh0XG4gICksIHBvc3RBY3Rpdml0eVdpdGhNZXNzYWdlKTtcbn1cblxuZnVuY3Rpb24qIHBvc3RBY3Rpdml0eVdpdGhNZXNzYWdlKHsgcGF5bG9hZDogeyBtZXRob2QsIHRleHQgfSB9KSB7XG4gIHlpZWxkIHB1dChwb3N0QWN0aXZpdHkoe1xuICAgIHRleHQsXG4gICAgdGV4dEZvcm1hdDogJ3BsYWluJyxcbiAgICB0eXBlOiAnbWVzc2FnZSdcbiAgfSwgbWV0aG9kKSk7XG59XG4iXX0=

lib/sagas/sendPostBackToPostActivitySaga.js

@@ -8,3 +8,3 @@ "use strict";
 });
-exports.default = _callee2;
+exports.default = _callee;
 
@@ -15,4 +15,2 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _whileConnected = _interopRequireDefault(require("./effects/whileConnected"));
-
 var _sendPostBack = require("../actions/sendPostBack");
@@ -22,62 +20,74 @@
 
+var _whileConnected = _interopRequireDefault(require("./effects/whileConnected"));
+
 var _marked =
 /*#__PURE__*/
-_regenerator.default.mark(_callee2);
+_regenerator.default.mark(_callee),
+    _marked2 =
+/*#__PURE__*/
+_regenerator.default.mark(sendPostBackToPostActivity),
+    _marked3 =
+/*#__PURE__*/
+_regenerator.default.mark(postActivityWithPostBack);
 
-function _callee2() {
-  return _regenerator.default.wrap(function _callee2$(_context2) {
+function _callee() {
+  return _regenerator.default.wrap(function _callee$(_context) {
     while (1) {
+      switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return (0, _whileConnected.default)(sendPostBackToPostActivity);
+
+        case 2:
+        case "end":
+          return _context.stop();
+      }
+    }
+  }, _marked, this);
+}
+
+function sendPostBackToPostActivity() {
+  return _regenerator.default.wrap(function sendPostBackToPostActivity$(_context2) {
+    while (1) {
       switch (_context2.prev = _context2.next) {
         case 0:
           _context2.next = 2;
-          return (0, _whileConnected.default)(
-          /*#__PURE__*/
-          _regenerator.default.mark(function _callee() {
-            var _ref, value;
+          return (0, _effects.takeEvery)(function (_ref) {
+            var payload = _ref.payload,
+                type = _ref.type;
+            return type === _sendPostBack.SEND_POST_BACK && payload.value;
+          }, postActivityWithPostBack);
 
-            return _regenerator.default.wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.next = 2;
-                    return (0, _effects.take)(_sendPostBack.SEND_POST_BACK);
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }
+  }, _marked2, this);
+}
 
-                  case 2:
-                    _ref = _context.sent;
-                    value = _ref.payload.value;
-
-                    if (!value) {
-                      _context.next = 7;
-                      break;
-                    }
-
-                    _context.next = 7;
-                    return (0, _effects.put)((0, _postActivity.default)({
-                      channelData: {
-                        postBack: true
-                      },
-                      text: typeof value === 'string' ? value : undefined,
-                      type: 'message',
-                      value: typeof value !== 'string' ? value : undefined
-                    }));
-
-                  case 7:
-                    _context.next = 0;
-                    break;
-
-                  case 9:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee, this);
+function postActivityWithPostBack(_ref2) {
+  var value;
+  return _regenerator.default.wrap(function postActivityWithPostBack$(_context3) {
+    while (1) {
+      switch (_context3.prev = _context3.next) {
+        case 0:
+          value = _ref2.payload.value;
+          _context3.next = 3;
+          return (0, _effects.put)((0, _postActivity.default)({
+            channelData: {
+              postBack: true
+            },
+            text: typeof value === 'string' ? value : undefined,
+            type: 'message',
+            value: typeof value !== 'string' ? value : undefined
           }));
 
-        case 2:
+        case 3:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
     }
-  }, _marked, this);
+  }, _marked3, this);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9zZW5kUG9zdEJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EuanMiXSwibmFtZXMiOlsiU0VORF9QT1NUX0JBQ0siLCJ2YWx1ZSIsInBheWxvYWQiLCJjaGFubmVsRGF0YSIsInBvc3RCYWNrIiwidGV4dCIsInVuZGVmaW5lZCIsInR5cGUiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBS0E7O0FBRUE7O0FBQ0E7Ozs7OztBQUVlO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNiLGlCQUFNO0FBQUE7QUFBQSxvQ0FBZTtBQUFBOztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFYywyQkFBTSxtQkFBS0EsNEJBQUwsQ0FBTjs7QUFGZDtBQUFBO0FBRUVDLG9CQUFBQSxLQUZGLFFBRVRDLE9BRlMsQ0FFRUQsS0FGRjs7QUFBQSx5QkFJYkEsS0FKYTtBQUFBO0FBQUE7QUFBQTs7QUFBQTtBQUtmLDJCQUFNLGtCQUFJLDJCQUFhO0FBQ3JCRSxzQkFBQUEsV0FBVyxFQUFFO0FBQ1hDLHdCQUFBQSxRQUFRLEVBQUU7QUFEQyx1QkFEUTtBQUlyQkMsc0JBQUFBLElBQUksRUFBRSxPQUFPSixLQUFQLEtBQWlCLFFBQWpCLEdBQTRCQSxLQUE1QixHQUFvQ0ssU0FKckI7QUFLckJDLHNCQUFBQSxJQUFJLEVBQUUsU0FMZTtBQU1yQk4sc0JBQUFBLEtBQUssRUFBRSxPQUFPQSxLQUFQLEtBQWlCLFFBQWpCLEdBQTRCQSxLQUE1QixHQUFvQ0s7QUFOdEIscUJBQWIsQ0FBSixDQUFOOztBQUxlO0FBQUE7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxXQUFmLEVBQU47O0FBRGE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBwdXQsXG4gIHRha2Vcbn0gZnJvbSAncmVkdXgtc2FnYS9lZmZlY3RzJztcblxuaW1wb3J0IHdoaWxlQ29ubmVjdGVkIGZyb20gJy4vZWZmZWN0cy93aGlsZUNvbm5lY3RlZCc7XG5cbmltcG9ydCB7IFNFTkRfUE9TVF9CQUNLIH0gZnJvbSAnLi4vYWN0aW9ucy9zZW5kUG9zdEJhY2snO1xuaW1wb3J0IHBvc3RBY3Rpdml0eSBmcm9tICcuLi9hY3Rpb25zL3Bvc3RBY3Rpdml0eSc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKiAoKSB7XG4gIHlpZWxkIHdoaWxlQ29ubmVjdGVkKGZ1bmN0aW9uKiAoKSB7XG4gICAgZm9yICg7Oykge1xuICAgICAgY29uc3QgeyBwYXlsb2FkOiB7IHZhbHVlIH0gfSA9IHlpZWxkIHRha2UoU0VORF9QT1NUX0JBQ0spO1xuXG4gICAgICBpZiAodmFsdWUpIHtcbiAgICAgICAgeWllbGQgcHV0KHBvc3RBY3Rpdml0eSh7XG4gICAgICAgICAgY2hhbm5lbERhdGE6IHtcbiAgICAgICAgICAgIHBvc3RCYWNrOiB0cnVlXG4gICAgICAgICAgfSxcbiAgICAgICAgICB0ZXh0OiB0eXBlb2YgdmFsdWUgPT09ICdzdHJpbmcnID8gdmFsdWUgOiB1bmRlZmluZWQsXG4gICAgICAgICAgdHlwZTogJ21lc3NhZ2UnLFxuICAgICAgICAgIHZhbHVlOiB0eXBlb2YgdmFsdWUgIT09ICdzdHJpbmcnID8gdmFsdWUgOiB1bmRlZmluZWRcbiAgICAgICAgfSkpO1xuICAgICAgfVxuICAgIH1cbiAgfSk7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9zZW5kUG9zdEJhY2tUb1Bvc3RBY3Rpdml0eVNhZ2EuanMiXSwibmFtZXMiOlsic2VuZFBvc3RCYWNrVG9Qb3N0QWN0aXZpdHkiLCJwb3N0QWN0aXZpdHlXaXRoUG9zdEJhY2siLCJwYXlsb2FkIiwidHlwZSIsIlNFTkRfUE9TVF9CQUNLIiwidmFsdWUiLCJjaGFubmVsRGF0YSIsInBvc3RCYWNrIiwidGV4dCIsInVuZGVmaW5lZCJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQTs7QUFLQTs7QUFDQTs7QUFDQTs7Ozs7OzswQkFNVUEsMEI7OzswQkFVQUMsd0I7O0FBZEs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ2IsaUJBQU0sNkJBQWVELDBCQUFmLENBQU47O0FBRGE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7O0FBSWYsU0FBVUEsMEJBQVY7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ0UsaUJBQU0sd0JBQ0o7QUFBQSxnQkFBR0UsT0FBSCxRQUFHQSxPQUFIO0FBQUEsZ0JBQVlDLElBQVosUUFBWUEsSUFBWjtBQUFBLG1CQUNFQSxJQUFJLEtBQUtDLDRCQUFULElBQ0dGLE9BQU8sQ0FBQ0csS0FGYjtBQUFBLFdBREksRUFLSkosd0JBTEksQ0FBTjs7QUFERjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTs7QUFVQSxTQUFVQSx3QkFBVjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBZ0RJLFVBQUFBLEtBQWhELFNBQXFDSCxPQUFyQyxDQUFnREcsS0FBaEQ7QUFBQTtBQUNFLGlCQUFNLGtCQUFJLDJCQUFhO0FBQ3JCQyxZQUFBQSxXQUFXLEVBQUU7QUFDWEMsY0FBQUEsUUFBUSxFQUFFO0FBREMsYUFEUTtBQUlyQkMsWUFBQUEsSUFBSSxFQUFFLE9BQU9ILEtBQVAsS0FBaUIsUUFBakIsR0FBNEJBLEtBQTVCLEdBQW9DSSxTQUpyQjtBQUtyQk4sWUFBQUEsSUFBSSxFQUFFLFNBTGU7QUFNckJFLFlBQUFBLEtBQUssRUFBRSxPQUFPQSxLQUFQLEtBQWlCLFFBQWpCLEdBQTRCQSxLQUE1QixHQUFvQ0k7QUFOdEIsV0FBYixDQUFKLENBQU47O0FBREY7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBwdXQsXG4gIHRha2VFdmVyeVxufSBmcm9tICdyZWR1eC1zYWdhL2VmZmVjdHMnO1xuXG5pbXBvcnQgeyBTRU5EX1BPU1RfQkFDSyB9IGZyb20gJy4uL2FjdGlvbnMvc2VuZFBvc3RCYWNrJztcbmltcG9ydCBwb3N0QWN0aXZpdHkgZnJvbSAnLi4vYWN0aW9ucy9wb3N0QWN0aXZpdHknO1xuaW1wb3J0IHdoaWxlQ29ubmVjdGVkIGZyb20gJy4vZWZmZWN0cy93aGlsZUNvbm5lY3RlZCc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKiAoKSB7XG4gIHlpZWxkIHdoaWxlQ29ubmVjdGVkKHNlbmRQb3N0QmFja1RvUG9zdEFjdGl2aXR5KTtcbn1cblxuZnVuY3Rpb24qIHNlbmRQb3N0QmFja1RvUG9zdEFjdGl2aXR5KCkge1xuICB5aWVsZCB0YWtlRXZlcnkoXG4gICAgKHsgcGF5bG9hZCwgdHlwZSB9KSA9PiAoXG4gICAgICB0eXBlID09PSBTRU5EX1BPU1RfQkFDS1xuICAgICAgJiYgcGF5bG9hZC52YWx1ZVxuICAgICksXG4gICAgcG9zdEFjdGl2aXR5V2l0aFBvc3RCYWNrXG4gICk7XG59XG5cbmZ1bmN0aW9uKiBwb3N0QWN0aXZpdHlXaXRoUG9zdEJhY2soeyBwYXlsb2FkOiB7IHZhbHVlIH0gfSkge1xuICB5aWVsZCBwdXQocG9zdEFjdGl2aXR5KHtcbiAgICBjaGFubmVsRGF0YToge1xuICAgICAgcG9zdEJhY2s6IHRydWVcbiAgICB9LFxuICAgIHRleHQ6IHR5cGVvZiB2YWx1ZSA9PT0gJ3N0cmluZycgPyB2YWx1ZSA6IHVuZGVmaW5lZCxcbiAgICB0eXBlOiAnbWVzc2FnZScsXG4gICAgdmFsdWU6IHR5cGVvZiB2YWx1ZSAhPT0gJ3N0cmluZycgPyB2YWx1ZSA6IHVuZGVmaW5lZFxuICB9KSk7XG59XG4iXX0=

lib/sagas/startDictateAfterSpeakActivitySaga.js

@@ -10,2 +10,4 @@ "use strict";
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
@@ -15,12 +17,14 @@
 
-var _whileConnected = _interopRequireDefault(require("./effects/whileConnected"));
-
 var _markActivity = require("../actions/markActivity");
 
-var _startSpeakingActivity = require("../actions/startSpeakingActivity");
+var _startDictate = _interopRequireDefault(require("../actions/startDictate"));
 
-var _stopSpeakingActivity = require("../actions/stopSpeakingActivity");
+var _speakingActivity = _interopRequireDefault(require("../definitions/speakingActivity"));
 
-var _startDictate = _interopRequireDefault(require("../actions/startDictate"));
+var _whileConnected = _interopRequireDefault(require("./effects/whileConnected"));
 
+var _whileSpeakIncomingActivity = _interopRequireDefault(require("./effects/whileSpeakIncomingActivity"));
+
+var _activities2 = require("../selectors/activities");
+
 var _marked =
@@ -31,3 +35,6 @@ /*#__PURE__*/
 /*#__PURE__*/
-_regenerator.default.mark(startDictateAfterSpeakActivitySaga);
+_regenerator.default.mark(startDictateAfterSpeakActivity),
+    _marked3 =
+/*#__PURE__*/
+_regenerator.default.mark(startDictateAfterAllActivitiesSpoken);
 
@@ -42,4 +49,3 @@ function _callee2() {
           /*#__PURE__*/
-          _regenerator.default.mark(function _callee(_, userID) {
-            var task;
+          _regenerator.default.mark(function _callee() {
             return _regenerator.default.wrap(function _callee$(_context) {
@@ -50,22 +56,5 @@ while (1) {
                     _context.next = 2;
-                    return (0, _effects.take)(_startSpeakingActivity.START_SPEAKING_ACTIVITY);
+                    return (0, _whileSpeakIncomingActivity.default)(startDictateAfterSpeakActivity);
 
                   case 2:
-                    _context.next = 4;
-                    return (0, _effects.fork)(startDictateAfterSpeakActivitySaga, userID);
-
-                  case 4:
-                    task = _context.sent;
-                    _context.next = 7;
-                    return (0, _effects.take)(_stopSpeakingActivity.STOP_SPEAKING_ACTIVITY);
-
-                  case 7:
-                    _context.next = 9;
-                    return (0, _effects.cancel)(task);
-
-                  case 9:
-                    _context.next = 0;
-                    break;
-
-                  case 11:
                   case "end":
@@ -86,63 +75,49 @@ return _context.stop();
 
-function startDictateAfterSpeakActivitySaga() {
-  var _loop;
-
-  return _regenerator.default.wrap(function startDictateAfterSpeakActivitySaga$(_context4) {
+function startDictateAfterSpeakActivity() {
+  return _regenerator.default.wrap(function startDictateAfterSpeakActivity$(_context3) {
     while (1) {
-      switch (_context4.prev = _context4.next) {
+      switch (_context3.prev = _context3.next) {
         case 0:
-          _loop =
-          /*#__PURE__*/
-          _regenerator.default.mark(function _loop() {
-            var _ref, activityID, activities;
+          _context3.next = 2;
+          return (0, _effects.takeEvery)(function (_ref) {
+            var payload = _ref.payload,
+                type = _ref.type;
+            return type === _markActivity.MARK_ACTIVITY && payload.name === 'speak' && payload.value === false;
+          }, startDictateAfterAllActivitiesSpoken);
 
-            return _regenerator.default.wrap(function _loop$(_context3) {
-              while (1) {
-                switch (_context3.prev = _context3.next) {
-                  case 0:
-                    _context3.next = 2;
-                    return (0, _effects.take)(function (_ref2) {
-                      var payload = _ref2.payload,
-                          type = _ref2.type;
-                      return type === _markActivity.MARK_ACTIVITY && payload.name === 'speak' && payload.value === false;
-                    });
+        case 2:
+        case "end":
+          return _context3.stop();
+      }
+    }
+  }, _marked2, this);
+}
 
-                  case 2:
-                    _ref = _context3.sent;
-                    activityID = _ref.payload.activityID;
-                    _context3.next = 6;
-                    return (0, _effects.select)(function (_ref3) {
-                      var activities = _ref3.activities;
-                      return activities;
-                    });
+function startDictateAfterAllActivitiesSpoken(_ref2) {
+  var activityID, activities, _activities, spokenActivity;
 
-                  case 6:
-                    activities = _context3.sent;
+  return _regenerator.default.wrap(function startDictateAfterAllActivitiesSpoken$(_context4) {
+    while (1) {
+      switch (_context4.prev = _context4.next) {
+        case 0:
+          activityID = _ref2.payload.activityID;
+          _context4.next = 3;
+          return (0, _effects.select)((0, _activities2.ofID)(activityID));
 
-                    if (activities.some(function (activity) {
-                      return activity.id !== activityID && activity.channelData && activity.channelData.speak === true;
-                    })) {
-                      _context3.next = 10;
-                      break;
-                    }
+        case 3:
+          activities = _context4.sent;
+          _activities = (0, _slicedToArray2.default)(activities, 1), spokenActivity = _activities[0];
 
-                    _context3.next = 10;
-                    return (0, _effects.put)((0, _startDictate.default)());
+          if (!(spokenActivity && spokenActivity.inputHint !== 'ignoringInput' // Checks if there are no more activities that will be synthesis
+          && !activities.some(function (activity) {
+            return activity.id !== activityID && (0, _speakingActivity.default)(activity);
+          }))) {
+            _context4.next = 8;
+            break;
+          }
 
-                  case 10:
-                  case "end":
-                    return _context3.stop();
-                }
-              }
-            }, _loop, this);
-          });
+          _context4.next = 8;
+          return (0, _effects.put)((0, _startDictate.default)());
 
-        case 1:
-          return _context4.delegateYield(_loop(), "t0", 2);
-
-        case 2:
-          _context4.next = 1;
-          break;
-
-        case 4:
+        case 8:
         case "end":
@@ -152,4 +127,4 @@ return _context4.stop();
     }
-  }, _marked2, this);
+  }, _marked3, this);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9zdGFydERpY3RhdGVBZnRlclNwZWFrQWN0aXZpdHlTYWdhLmpzIl0sIm5hbWVzIjpbInN0YXJ0RGljdGF0ZUFmdGVyU3BlYWtBY3Rpdml0eVNhZ2EiLCJfIiwidXNlcklEIiwiU1RBUlRfU1BFQUtJTkdfQUNUSVZJVFkiLCJ0YXNrIiwiU1RPUF9TUEVBS0lOR19BQ1RJVklUWSIsInBheWxvYWQiLCJ0eXBlIiwiTUFSS19BQ1RJVklUWSIsIm5hbWUiLCJ2YWx1ZSIsImFjdGl2aXR5SUQiLCJhY3Rpdml0aWVzIiwic29tZSIsImFjdGl2aXR5IiwiaWQiLCJjaGFubmVsRGF0YSIsInNwZWFrIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQVFBOztBQUVBOztBQUNBOztBQUNBOztBQUNBOzs7Ozs7OzBCQWVVQSxrQzs7QUFiSztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDYixpQkFBTTtBQUFBO0FBQUEsb0NBQWUsaUJBQVdDLENBQVgsRUFBY0MsTUFBZDtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUVqQiwyQkFBTSxtQkFBS0MsOENBQUwsQ0FBTjs7QUFGaUI7QUFBQTtBQUlKLDJCQUFNLG1CQUFLSCxrQ0FBTCxFQUF5Q0UsTUFBekMsQ0FBTjs7QUFKSTtBQUlYRSxvQkFBQUEsSUFKVztBQUFBO0FBTWpCLDJCQUFNLG1CQUFLQyw0Q0FBTCxDQUFOOztBQU5pQjtBQUFBO0FBT2pCLDJCQUFNLHFCQUFPRCxJQUFQLENBQU47O0FBUGlCO0FBQUE7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxXQUFmLEVBQU47O0FBRGE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7O0FBYWYsU0FBVUosa0NBQVY7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBOztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFFd0MsMkJBQU0sbUJBQUs7QUFBQSwwQkFBR00sT0FBSCxTQUFHQSxPQUFIO0FBQUEsMEJBQVlDLElBQVosU0FBWUEsSUFBWjtBQUFBLDZCQUF1QkEsSUFBSSxLQUFLQywyQkFBVCxJQUEwQkYsT0FBTyxDQUFDRyxJQUFSLEtBQWlCLE9BQTNDLElBQXNESCxPQUFPLENBQUNJLEtBQVIsS0FBa0IsS0FBL0Y7QUFBQSxxQkFBTCxDQUFOOztBQUZ4QztBQUFBO0FBRXVCQyxvQkFBQUEsVUFGdkIsUUFFWUwsT0FGWixDQUV1QkssVUFGdkI7QUFBQTtBQUd1QiwyQkFBTSxxQkFBTztBQUFBLDBCQUFHQyxVQUFILFNBQUdBLFVBQUg7QUFBQSw2QkFBb0JBLFVBQXBCO0FBQUEscUJBQVAsQ0FBTjs7QUFIdkI7QUFHVUEsb0JBQUFBLFVBSFY7O0FBQUEsd0JBS1NBLFVBQVUsQ0FBQ0MsSUFBWCxDQUFnQixVQUFBQyxRQUFRO0FBQUEsNkJBQUlBLFFBQVEsQ0FBQ0MsRUFBVCxLQUFnQkosVUFBaEIsSUFBOEJHLFFBQVEsQ0FBQ0UsV0FBdkMsSUFBc0RGLFFBQVEsQ0FBQ0UsV0FBVCxDQUFxQkMsS0FBckIsS0FBK0IsSUFBekY7QUFBQSxxQkFBeEIsQ0FMVDtBQUFBO0FBQUE7QUFBQTs7QUFBQTtBQU1NLDJCQUFNLGtCQUFJLDRCQUFKLENBQU47O0FBTk47QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7O0FBQUE7QUFBQTs7QUFBQTtBQUFBO0FBQUE7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBjYW5jZWwsXG4gIGZvcmssXG4gIHB1dCxcbiAgc2VsZWN0LFxuICB0YWtlXG59IGZyb20gJ3JlZHV4LXNhZ2EvZWZmZWN0cyc7XG5cbmltcG9ydCB3aGlsZUNvbm5lY3RlZCBmcm9tICcuL2VmZmVjdHMvd2hpbGVDb25uZWN0ZWQnO1xuXG5pbXBvcnQgeyBNQVJLX0FDVElWSVRZIH0gZnJvbSAnLi4vYWN0aW9ucy9tYXJrQWN0aXZpdHknO1xuaW1wb3J0IHsgU1RBUlRfU1BFQUtJTkdfQUNUSVZJVFkgfSBmcm9tICcuLi9hY3Rpb25zL3N0YXJ0U3BlYWtpbmdBY3Rpdml0eSc7XG5pbXBvcnQgeyBTVE9QX1NQRUFLSU5HX0FDVElWSVRZIH0gZnJvbSAnLi4vYWN0aW9ucy9zdG9wU3BlYWtpbmdBY3Rpdml0eSc7XG5pbXBvcnQgc3RhcnREaWN0YXRlIGZyb20gJy4uL2FjdGlvbnMvc3RhcnREaWN0YXRlJztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24qICgpIHtcbiAgeWllbGQgd2hpbGVDb25uZWN0ZWQoZnVuY3Rpb24qIChfLCB1c2VySUQpIHtcbiAgICBmb3IgKDs7KSB7XG4gICAgICB5aWVsZCB0YWtlKFNUQVJUX1NQRUFLSU5HX0FDVElWSVRZKTtcblxuICAgICAgY29uc3QgdGFzayA9IHlpZWxkIGZvcmsoc3RhcnREaWN0YXRlQWZ0ZXJTcGVha0FjdGl2aXR5U2FnYSwgdXNlcklEKTtcblxuICAgICAgeWllbGQgdGFrZShTVE9QX1NQRUFLSU5HX0FDVElWSVRZKTtcbiAgICAgIHlpZWxkIGNhbmNlbCh0YXNrKTtcbiAgICB9XG4gIH0pO1xufVxuXG5mdW5jdGlvbiogc3RhcnREaWN0YXRlQWZ0ZXJTcGVha0FjdGl2aXR5U2FnYSgpIHtcbiAgZm9yICg7Oykge1xuICAgIGNvbnN0IHsgcGF5bG9hZDogeyBhY3Rpdml0eUlEIH0gfSA9IHlpZWxkIHRha2UoKHsgcGF5bG9hZCwgdHlwZSB9KSA9PiB0eXBlID09PSBNQVJLX0FDVElWSVRZICYmIHBheWxvYWQubmFtZSA9PT0gJ3NwZWFrJyAmJiBwYXlsb2FkLnZhbHVlID09PSBmYWxzZSk7XG4gICAgY29uc3QgYWN0aXZpdGllcyA9IHlpZWxkIHNlbGVjdCgoeyBhY3Rpdml0aWVzIH0pID0+IGFjdGl2aXRpZXMpO1xuXG4gICAgaWYgKCFhY3Rpdml0aWVzLnNvbWUoYWN0aXZpdHkgPT4gYWN0aXZpdHkuaWQgIT09IGFjdGl2aXR5SUQgJiYgYWN0aXZpdHkuY2hhbm5lbERhdGEgJiYgYWN0aXZpdHkuY2hhbm5lbERhdGEuc3BlYWsgPT09IHRydWUpKSB7XG4gICAgICB5aWVsZCBwdXQoc3RhcnREaWN0YXRlKCkpO1xuICAgIH1cbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9zdGFydERpY3RhdGVBZnRlclNwZWFrQWN0aXZpdHlTYWdhLmpzIl0sIm5hbWVzIjpbInN0YXJ0RGljdGF0ZUFmdGVyU3BlYWtBY3Rpdml0eSIsInN0YXJ0RGljdGF0ZUFmdGVyQWxsQWN0aXZpdGllc1Nwb2tlbiIsInBheWxvYWQiLCJ0eXBlIiwiTUFSS19BQ1RJVklUWSIsIm5hbWUiLCJ2YWx1ZSIsImFjdGl2aXR5SUQiLCJhY3Rpdml0aWVzIiwic3Bva2VuQWN0aXZpdHkiLCJpbnB1dEhpbnQiLCJzb21lIiwiYWN0aXZpdHkiLCJpZCJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7OztBQUFBOztBQU1BOztBQUNBOztBQUVBOztBQUVBOztBQUNBOztBQUVBOzs7Ozs7OzBCQVFVQSw4Qjs7OzBCQVdBQyxvQzs7QUFqQks7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ2IsaUJBQU07QUFBQTtBQUFBLG9DQUFlO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNuQiwyQkFBTSx5Q0FBMkJELDhCQUEzQixDQUFOOztBQURtQjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxXQUFmLEVBQU47O0FBRGE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7O0FBTWYsU0FBVUEsOEJBQVY7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQ0UsaUJBQU0sd0JBQ0o7QUFBQSxnQkFBR0UsT0FBSCxRQUFHQSxPQUFIO0FBQUEsZ0JBQVlDLElBQVosUUFBWUEsSUFBWjtBQUFBLG1CQUNFQSxJQUFJLEtBQUtDLDJCQUFULElBQ0dGLE9BQU8sQ0FBQ0csSUFBUixLQUFpQixPQURwQixJQUVHSCxPQUFPLENBQUNJLEtBQVIsS0FBa0IsS0FIdkI7QUFBQSxXQURJLEVBTUpMLG9DQU5JLENBQU47O0FBREY7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7O0FBV0EsU0FBVUEsb0NBQVY7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUE0RE0sVUFBQUEsVUFBNUQsU0FBaURMLE9BQWpELENBQTRESyxVQUE1RDtBQUFBO0FBQ3FCLGlCQUFNLHFCQUFPLHVCQUFlQSxVQUFmLENBQVAsQ0FBTjs7QUFEckI7QUFDUUMsVUFBQUEsVUFEUjtBQUFBLHFEQUUyQkEsVUFGM0IsTUFFU0MsY0FGVDs7QUFBQSxnQkFLSUEsY0FBYyxJQUNYQSxjQUFjLENBQUNDLFNBQWYsS0FBNkIsZUFEaEMsQ0FFQTtBQUZBLGFBR0csQ0FBQ0YsVUFBVSxDQUFDRyxJQUFYLENBQ0YsVUFBQUMsUUFBUTtBQUFBLG1CQUFJQSxRQUFRLENBQUNDLEVBQVQsS0FBZ0JOLFVBQWhCLElBQThCLCtCQUFpQkssUUFBakIsQ0FBbEM7QUFBQSxXQUROLENBUlI7QUFBQTtBQUFBO0FBQUE7O0FBQUE7QUFjSSxpQkFBTSxrQkFBSSw0QkFBSixDQUFOOztBQWRKO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgcHV0LFxuICBzZWxlY3QsXG4gIHRha2VFdmVyeVxufSBmcm9tICdyZWR1eC1zYWdhL2VmZmVjdHMnO1xuXG5pbXBvcnQgeyBNQVJLX0FDVElWSVRZIH0gZnJvbSAnLi4vYWN0aW9ucy9tYXJrQWN0aXZpdHknO1xuaW1wb3J0IHN0YXJ0RGljdGF0ZSBmcm9tICcuLi9hY3Rpb25zL3N0YXJ0RGljdGF0ZSc7XG5cbmltcG9ydCBzcGVha2luZ0FjdGl2aXR5IGZyb20gJy4uL2RlZmluaXRpb25zL3NwZWFraW5nQWN0aXZpdHknO1xuXG5pbXBvcnQgd2hpbGVDb25uZWN0ZWQgZnJvbSAnLi9lZmZlY3RzL3doaWxlQ29ubmVjdGVkJztcbmltcG9ydCB3aGlsZVNwZWFrSW5jb21pbmdBY3Rpdml0eSBmcm9tICcuL2VmZmVjdHMvd2hpbGVTcGVha0luY29taW5nQWN0aXZpdHknO1xuXG5pbXBvcnQgeyBvZklEIGFzIGFjdGl2aXRpZXNPZklEIH0gZnJvbSAnLi4vc2VsZWN0b3JzL2FjdGl2aXRpZXMnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiogKCkge1xuICB5aWVsZCB3aGlsZUNvbm5lY3RlZChmdW5jdGlvbiogKCkge1xuICAgIHlpZWxkIHdoaWxlU3BlYWtJbmNvbWluZ0FjdGl2aXR5KHN0YXJ0RGljdGF0ZUFmdGVyU3BlYWtBY3Rpdml0eSk7XG4gIH0pO1xufVxuXG5mdW5jdGlvbiogc3RhcnREaWN0YXRlQWZ0ZXJTcGVha0FjdGl2aXR5KCkge1xuICB5aWVsZCB0YWtlRXZlcnkoXG4gICAgKHsgcGF5bG9hZCwgdHlwZSB9KSA9PiAoXG4gICAgICB0eXBlID09PSBNQVJLX0FDVElWSVRZXG4gICAgICAmJiBwYXlsb2FkLm5hbWUgPT09ICdzcGVhaydcbiAgICAgICYmIHBheWxvYWQudmFsdWUgPT09IGZhbHNlXG4gICAgKSxcbiAgICBzdGFydERpY3RhdGVBZnRlckFsbEFjdGl2aXRpZXNTcG9rZW5cbiAgKTtcbn1cblxuZnVuY3Rpb24qIHN0YXJ0RGljdGF0ZUFmdGVyQWxsQWN0aXZpdGllc1Nwb2tlbih7IHBheWxvYWQ6IHsgYWN0aXZpdHlJRCB9IH0pIHtcbiAgY29uc3QgYWN0aXZpdGllcyA9IHlpZWxkIHNlbGVjdChhY3Rpdml0aWVzT2ZJRChhY3Rpdml0eUlEKSk7XG4gIGNvbnN0IFtzcG9rZW5BY3Rpdml0eV0gPSBhY3Rpdml0aWVzO1xuXG4gIGlmIChcbiAgICBzcG9rZW5BY3Rpdml0eVxuICAgICYmIHNwb2tlbkFjdGl2aXR5LmlucHV0SGludCAhPT0gJ2lnbm9yaW5nSW5wdXQnXG4gICAgLy8gQ2hlY2tzIGlmIHRoZXJlIGFyZSBubyBtb3JlIGFjdGl2aXRpZXMgdGhhdCB3aWxsIGJlIHN5bnRoZXNpc1xuICAgICYmICFhY3Rpdml0aWVzLnNvbWUoXG4gICAgICBhY3Rpdml0eSA9PiBhY3Rpdml0eS5pZCAhPT0gYWN0aXZpdHlJRCAmJiBzcGVha2luZ0FjdGl2aXR5KGFjdGl2aXR5KVxuICAgIClcbiAgKSB7XG4gICAgLy8gV2UgaG9ub3IgaW5wdXQgaGludCBiYXNlZCBvbiB0aGlzIGFydGljbGVcbiAgICAvLyBodHRwczovL2RvY3MubWljcm9zb2Z0LmNvbS9lbi11cy9henVyZS9ib3Qtc2VydmljZS9ib3QtYnVpbGRlci1ob3d0by1hZGQtaW5wdXQtaGludHM/dmlldz1henVyZS1ib3Qtc2VydmljZS00LjAmdGFicz1jc1xuICAgIHlpZWxkIHB1dChzdGFydERpY3RhdGUoKSk7XG4gIH1cbn1cbiJdfQ==

lib/sagas/submitSendBoxSaga.js

@@ -8,3 +8,3 @@ "use strict";
 });
-exports.default = _callee2;
+exports.default = _callee;
 
@@ -15,4 +15,2 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _whileConnected = _interopRequireDefault(require("./effects/whileConnected"));
-
 var _submitSendBox = require("../actions/submitSendBox");
@@ -24,58 +22,68 @@
 
+var _whileConnected = _interopRequireDefault(require("./effects/whileConnected"));
+
+var _sendBoxValue = _interopRequireDefault(require("../selectors/sendBoxValue"));
+
 var _marked =
 /*#__PURE__*/
-_regenerator.default.mark(_callee2);
+_regenerator.default.mark(_callee),
+    _marked2 =
+/*#__PURE__*/
+_regenerator.default.mark(submitSendBox);
 
-function _callee2() {
-  return _regenerator.default.wrap(function _callee2$(_context2) {
+function _callee() {
+  return _regenerator.default.wrap(function _callee$(_context) {
     while (1) {
-      switch (_context2.prev = _context2.next) {
+      switch (_context.prev = _context.next) {
         case 0:
-          _context2.next = 2;
-          return (0, _whileConnected.default)(
+          _context.next = 2;
+          return (0, _whileConnected.default)(submitSendBox);
+
+        case 2:
+        case "end":
+          return _context.stop();
+      }
+    }
+  }, _marked, this);
+}
+
+function submitSendBox() {
+  return _regenerator.default.wrap(function submitSendBox$(_context3) {
+    while (1) {
+      switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.next = 2;
+          return (0, _effects.takeEvery)(_submitSendBox.SUBMIT_SEND_BOX,
           /*#__PURE__*/
-          _regenerator.default.mark(function _callee() {
-            var _ref, via, sendBoxValue;
-
-            return _regenerator.default.wrap(function _callee$(_context) {
+          _regenerator.default.mark(function _callee2(_ref) {
+            var method, sendBoxValue;
+            return _regenerator.default.wrap(function _callee2$(_context2) {
               while (1) {
-                switch (_context.prev = _context.next) {
+                switch (_context2.prev = _context2.next) {
                   case 0:
-                    _context.next = 2;
-                    return (0, _effects.take)(_submitSendBox.SUBMIT_SEND_BOX);
+                    method = _ref.payload.method;
+                    _context2.next = 3;
+                    return (0, _effects.select)(_sendBoxValue.default);
 
-                  case 2:
-                    _ref = _context.sent;
-                    via = _ref.payload.via;
-                    _context.next = 6;
-                    return (0, _effects.select)(function (_ref2) {
-                      var sendBoxValue = _ref2.sendBoxValue;
-                      return sendBoxValue;
-                    });
+                  case 3:
+                    sendBoxValue = _context2.sent;
 
-                  case 6:
-                    sendBoxValue = _context.sent;
-
                     if (!sendBoxValue) {
-                      _context.next = 12;
+                      _context2.next = 9;
                       break;
                     }
 
-                    _context.next = 10;
-                    return (0, _effects.put)((0, _sendMessage.default)(sendBoxValue, via));
+                    _context2.next = 7;
+                    return (0, _effects.put)((0, _sendMessage.default)(sendBoxValue, method));
 
-                  case 10:
-                    _context.next = 12;
-                    return (0, _effects.put)((0, _setSendBox.default)('', 'keyboard'));
+                  case 7:
+                    _context2.next = 9;
+                    return (0, _effects.put)((0, _setSendBox.default)(''));
 
-                  case 12:
-                    _context.next = 0;
-                    break;
-
-                  case 14:
+                  case 9:
                   case "end":
-                    return _context.stop();
+                    return _context2.stop();
                 }
               }
-            }, _callee, this);
+            }, _callee2, this);
           }));
@@ -85,7 +93,7 @@
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
     }
-  }, _marked, this);
+  }, _marked2, this);
 }
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9zdWJtaXRTZW5kQm94U2FnYS5qcyJdLCJuYW1lcyI6WyJTVUJNSVRfU0VORF9CT1giLCJ2aWEiLCJwYXlsb2FkIiwic2VuZEJveFZhbHVlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQU1BOztBQUVBOztBQUNBOztBQUNBOzs7Ozs7QUFFZTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDYixpQkFBTTtBQUFBO0FBQUEsb0NBQWU7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBRVksMkJBQU0sbUJBQUtBLDhCQUFMLENBQU47O0FBRlo7QUFBQTtBQUVFQyxvQkFBQUEsR0FGRixRQUVUQyxPQUZTLENBRUVELEdBRkY7QUFBQTtBQUdJLDJCQUFNLHFCQUFPO0FBQUEsMEJBQUdFLFlBQUgsU0FBR0EsWUFBSDtBQUFBLDZCQUFzQkEsWUFBdEI7QUFBQSxxQkFBUCxDQUFOOztBQUhKO0FBR1hBLG9CQUFBQSxZQUhXOztBQUFBLHlCQUtiQSxZQUxhO0FBQUE7QUFBQTtBQUFBOztBQUFBO0FBTWYsMkJBQU0sa0JBQUksMEJBQVlBLFlBQVosRUFBMEJGLEdBQTFCLENBQUosQ0FBTjs7QUFOZTtBQUFBO0FBT2YsMkJBQU0sa0JBQUkseUJBQVcsRUFBWCxFQUFlLFVBQWYsQ0FBSixDQUFOOztBQVBlO0FBQUE7QUFBQTs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxXQUFmLEVBQU47O0FBRGE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBwdXQsXG4gIHNlbGVjdCxcbiAgdGFrZVxufSBmcm9tICdyZWR1eC1zYWdhL2VmZmVjdHMnO1xuXG5pbXBvcnQgd2hpbGVDb25uZWN0ZWQgZnJvbSAnLi9lZmZlY3RzL3doaWxlQ29ubmVjdGVkJztcblxuaW1wb3J0IHsgU1VCTUlUX1NFTkRfQk9YIH0gZnJvbSAnLi4vYWN0aW9ucy9zdWJtaXRTZW5kQm94JztcbmltcG9ydCBzZW5kTWVzc2FnZSBmcm9tICcuLi9hY3Rpb25zL3NlbmRNZXNzYWdlJztcbmltcG9ydCBzZXRTZW5kQm94IGZyb20gJy4uL2FjdGlvbnMvc2V0U2VuZEJveCc7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKiAoKSB7XG4gIHlpZWxkIHdoaWxlQ29ubmVjdGVkKGZ1bmN0aW9uKiAoKSB7XG4gICAgZm9yICg7Oykge1xuICAgICAgY29uc3QgeyBwYXlsb2FkOiB7IHZpYSB9IH0gPSB5aWVsZCB0YWtlKFNVQk1JVF9TRU5EX0JPWCk7XG4gICAgICBjb25zdCBzZW5kQm94VmFsdWUgPSB5aWVsZCBzZWxlY3QoKHsgc2VuZEJveFZhbHVlIH0pID0+IHNlbmRCb3hWYWx1ZSk7XG5cbiAgICAgIGlmIChzZW5kQm94VmFsdWUpIHtcbiAgICAgICAgeWllbGQgcHV0KHNlbmRNZXNzYWdlKHNlbmRCb3hWYWx1ZSwgdmlhKSk7XG4gICAgICAgIHlpZWxkIHB1dChzZXRTZW5kQm94KCcnLCAna2V5Ym9hcmQnKSk7XG4gICAgICB9XG4gICAgfVxuICB9KTtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zYWdhcy9zdWJtaXRTZW5kQm94U2FnYS5qcyJdLCJuYW1lcyI6WyJzdWJtaXRTZW5kQm94IiwiU1VCTUlUX1NFTkRfQk9YIiwibWV0aG9kIiwicGF5bG9hZCIsInNlbmRCb3hWYWx1ZVNlbGVjdG9yIiwic2VuZEJveFZhbHVlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQU1BOztBQUNBOztBQUNBOztBQUVBOztBQUVBOzs7Ozs7OzBCQU1VQSxhOztBQUpLO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUNiLGlCQUFNLDZCQUFlQSxhQUFmLENBQU47O0FBRGE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7O0FBSWYsU0FBVUEsYUFBVjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFDRSxpQkFBTSx3QkFBVUMsOEJBQVY7QUFBQTtBQUFBLG9DQUEyQjtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBd0JDLG9CQUFBQSxNQUF4QixRQUFhQyxPQUFiLENBQXdCRCxNQUF4QjtBQUFBO0FBQ1YsMkJBQU0scUJBQU9FLHFCQUFQLENBQU47O0FBRFU7QUFDekJDLG9CQUFBQSxZQUR5Qjs7QUFBQSx5QkFHM0JBLFlBSDJCO0FBQUE7QUFBQTtBQUFBOztBQUFBO0FBSTdCLDJCQUFNLGtCQUFJLDBCQUFZQSxZQUFaLEVBQTBCSCxNQUExQixDQUFKLENBQU47O0FBSjZCO0FBQUE7QUFLN0IsMkJBQU0sa0JBQUkseUJBQVcsRUFBWCxDQUFKLENBQU47O0FBTDZCO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLFdBQTNCLEVBQU47O0FBREY7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBwdXQsXG4gIHNlbGVjdCxcbiAgdGFrZUV2ZXJ5XG59IGZyb20gJ3JlZHV4LXNhZ2EvZWZmZWN0cyc7XG5cbmltcG9ydCB7IFNVQk1JVF9TRU5EX0JPWCB9IGZyb20gJy4uL2FjdGlvbnMvc3VibWl0U2VuZEJveCc7XG5pbXBvcnQgc2VuZE1lc3NhZ2UgZnJvbSAnLi4vYWN0aW9ucy9zZW5kTWVzc2FnZSc7XG5pbXBvcnQgc2V0U2VuZEJveCBmcm9tICcuLi9hY3Rpb25zL3NldFNlbmRCb3gnO1xuXG5pbXBvcnQgd2hpbGVDb25uZWN0ZWQgZnJvbSAnLi9lZmZlY3RzL3doaWxlQ29ubmVjdGVkJztcblxuaW1wb3J0IHNlbmRCb3hWYWx1ZVNlbGVjdG9yIGZyb20gJy4uL3NlbGVjdG9ycy9zZW5kQm94VmFsdWUnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiogKCkge1xuICB5aWVsZCB3aGlsZUNvbm5lY3RlZChzdWJtaXRTZW5kQm94KTtcbn1cblxuZnVuY3Rpb24qIHN1Ym1pdFNlbmRCb3goKSB7XG4gIHlpZWxkIHRha2VFdmVyeShTVUJNSVRfU0VORF9CT1gsIGZ1bmN0aW9uKiAoeyBwYXlsb2FkOiB7IG1ldGhvZCB9IH0pIHtcbiAgICBjb25zdCBzZW5kQm94VmFsdWUgPSB5aWVsZCBzZWxlY3Qoc2VuZEJveFZhbHVlU2VsZWN0b3IpO1xuXG4gICAgaWYgKHNlbmRCb3hWYWx1ZSkge1xuICAgICAgeWllbGQgcHV0KHNlbmRNZXNzYWdlKHNlbmRCb3hWYWx1ZSwgbWV0aG9kKSk7XG4gICAgICB5aWVsZCBwdXQoc2V0U2VuZEJveCgnJykpO1xuICAgIH1cbiAgfSk7XG59XG4iXX0=

package.json

 {
   "name": "botframework-webchat-core",
-  "version": "4.2.1-master.d9808ca",
+  "version": "4.2.1-master.da98602",
   "description": "Core of botframework-webchat",
@@ -53,3 +53,3 @@ "main": "lib/index.js",
     "babel-plugin-version-transform": "^1.0.0",
-    "botframework-directlinejs": "^0.10.1",
+    "botframework-directlinejs": "~0.11.2",
     "concurrently": "^4.0.1",
@@ -65,2 +65,3 @@ "jest": "^23.6.0",
     "jsonwebtoken": "^8.3.0",
+    "math-random": "^1.0.4",
     "mime": "^2.3.1",
@@ -67,0 +68,0 @@ "redux": "^4.0.0",

src/actions/connect.js

 const CONNECT = 'DIRECT_LINE/CONNECT';
+const CONNECT_FULFILLED = `${ CONNECT }_FULFILLED`;
+const CONNECT_FULFILLING = `${ CONNECT }_FULFILLING`;
 const CONNECT_PENDING = `${ CONNECT }_PENDING`;
 const CONNECT_REJECTED = `${ CONNECT }_REJECTED`;
-const CONNECT_FULFILLED = `${ CONNECT }_FULFILLED`;
+const CONNECT_STILL_PENDING = `${ CONNECT }_STILL_PENDING`;
 
-export default function ({ directLine, userID }) {
+export default function ({ directLine, userID, username }) {
   return {
     type: CONNECT,
-    payload: { directLine, userID }
+    payload: {
+      directLine,
+      userID,
+      username
+    }
   };
@@ -15,5 +21,7 @@ }
   CONNECT,
+  CONNECT_FULFILLED,
+  CONNECT_FULFILLING,
   CONNECT_PENDING,
   CONNECT_REJECTED,
-  CONNECT_FULFILLED
+  CONNECT_STILL_PENDING
 }

src/actions/postActivity.js

@@ -8,5 +8,6 @@ import { FULFILLED, PENDING, REJECTED } from 'redux-promise-middleware';
 
-export default function (activity) {
+export default function (activity, method = 'keyboard') {
   return {
     type: POST_ACTIVITY,
+    meta: { method },
     payload: { activity }
@@ -13,0 +14,0 @@ };

src/actions/sendMessage.js

 const SEND_MESSAGE = 'WEB_CHAT/SEND_MESSAGE';
 
-export default function sendMessage(text, via) {
+export default function sendMessage(text, method) {
   return {
     type: SEND_MESSAGE,
-    payload: { text, via }
+    payload: { method, text }
   };
@@ -8,0 +8,0 @@ }

src/actions/setSendBox.js

 const SET_SEND_BOX = 'WEB_CHAT/SET_SEND_BOX';
 
-export default function (text, via) {
+export default function (text) {
   return {
     type: SET_SEND_BOX,
-    payload: { text, via }
+    payload: { text }
   };
@@ -8,0 +8,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/actions/submitSendBox.js

 const SUBMIT_SEND_BOX = 'WEB_CHAT/SUBMIT_SEND_BOX';
 
-export default function submitSendBox(via) {
+export default function submitSendBox(method = 'keyboard') {
   return {
     type: SUBMIT_SEND_BOX,
-    payload: { via }
+    payload: { method }
   };
@@ -8,0 +8,0 @@ }

src/index.js

@@ -6,4 +6,6 @@ import connect from './actions/connect';
 import postActivity from './actions/postActivity';
+import sendEvent from './actions/sendEvent';
 import sendFiles from './actions/sendFiles';
 import sendMessage from './actions/sendMessage';
+import sendMessageBack from './actions/sendMessageBack';
 import sendPostBack from './actions/sendPostBack';
@@ -16,2 +18,3 @@ import setDictateInterims from './actions/setDictateInterims';
 import setSendTyping from './actions/setSendTyping';
+import setSendTypingIndicator from './actions/setSendTypingIndicator';
 import startDictate from './actions/startDictate';
@@ -36,4 +39,6 @@ import startSpeakingActivity from './actions/startSpeakingActivity';
   postActivity,
+  sendEvent,
   sendFiles,
   sendMessage,
+  sendMessageBack,
   sendPostBack,
@@ -45,3 +50,3 @@ setDictateInterims,
   setSendTimeout,
-  setSendTyping,
+  setSendTypingIndicator,
   startDictate,
@@ -52,3 +57,6 @@ startSpeakingActivity,
   submitSendBox,
-  version
+  version,
+
+  // TODO: [P3] Take this deprecation code out when releasing on or after January 13 2020 
+  setSendTyping
 }

src/reducer.ts

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

src/reducers/activities.js

@@ -28,5 +28,10 @@ import updateIn from 'simple-update-in';
     channelData: { clientActivityID: nextClientActivityID } = {},
-    from: { id: nextFromID } = {}
+    from: { id: nextFromID, role: nextFromRole } = {},
+    type: nextType
   } = nextActivity;
 
+  if (nextType === 'typing' && nextFromRole === 'user') {
+    return activities;
+  }
+
   const nextTimestamp = Date.parse(nextActivity.timestamp);
@@ -33,0 +38,0 @@ const nextActivities = activities.filter(({ channelData: { clientActivityID } = {}, from, type }) =>

src/sagas.js

@@ -6,13 +6,19 @@ import { fork } from 'redux-saga/effects';
 import connectSaga from './sagas/connectSaga';
+import detectSlowConnectionSaga from './sagas/detectSlowConnectionSaga';
 import incomingActivitySaga from './sagas/incomingActivitySaga';
-import incomingTypingSaga from './sagas/incomingTypingSaga';
-import markActivityForSpeakSaga from './sagas/markActivityForSpeakSaga';
+import markActivityForSpeakOnIncomingActivityFromOthersSaga from './sagas/markActivityForSpeakOnIncomingActivityFromOthersSaga';
+import markAllAsSpokenOnStopSpeakActivitySaga from './sagas/markAllAsSpokenOnStopSpeakActivitySaga';
 import postActivitySaga from './sagas/postActivitySaga';
+import removeIncomingTypingAfterIntervalSaga from './sagas/removeIncomingTypingAfterIntervalSaga';
+import sendConversationUpdateOnConnectSaga from './sagas/sendConversationUpdateOnConnectSaga';
+import sendEventToPostActivitySaga from './sagas/sendEventToPostActivitySaga';
 import sendFilesToPostActivitySaga from './sagas/sendFilesToPostActivitySaga';
 import sendMessageToPostActivitySaga from './sagas/sendMessageToPostActivitySaga';
+import sendMessageBackToPostActivitySaga from './sagas/sendMessageBackToPostActivitySaga';
 import sendPostBackToPostActivitySaga from './sagas/sendPostBackToPostActivitySaga';
-import sendTypingOnSetSendBoxSaga from './sagas/sendTypingOnSetSendBoxSaga';
+import sendTypingIndicatorOnSetSendBoxSaga from './sagas/sendTypingIndicatorOnSetSendBoxSaga';
 import startDictateAfterSpeakActivitySaga from './sagas/startDictateAfterSpeakActivitySaga';
-import stopDictateOnCardAction from './sagas/stopDictateOnCardAction';
-import stopSpeakActivityOnInputSaga from './sagas/stopSpeakActivityOnInputSaga';
+import startSpeakActivityOnPostActivitySaga from './sagas/startSpeakActivityOnPostActivitySaga';
+import stopDictateOnCardActionSaga from './sagas/stopDictateOnCardActionSaga';
+import stopSpeakingActivityOnInputSaga from './sagas/stopSpeakingActivityOnInputSaga';
 import submitSendBoxSaga from './sagas/submitSendBoxSaga';
@@ -24,14 +30,20 @@
   yield fork(connectSaga);
+  yield fork(detectSlowConnectionSaga);
   yield fork(incomingActivitySaga);
-  yield fork(incomingTypingSaga);
-  yield fork(markActivityForSpeakSaga);
+  yield fork(markActivityForSpeakOnIncomingActivityFromOthersSaga);
+  yield fork(markAllAsSpokenOnStopSpeakActivitySaga);
   yield fork(postActivitySaga);
+  yield fork(removeIncomingTypingAfterIntervalSaga);
+  yield fork(sendConversationUpdateOnConnectSaga);
+  yield fork(sendEventToPostActivitySaga);
   yield fork(sendFilesToPostActivitySaga);
   yield fork(sendMessageToPostActivitySaga);
+  yield fork(sendMessageBackToPostActivitySaga);
   yield fork(sendPostBackToPostActivitySaga);
-  yield fork(sendTypingOnSetSendBoxSaga);
+  yield fork(sendTypingIndicatorOnSetSendBoxSaga);
   yield fork(startDictateAfterSpeakActivitySaga);
-  yield fork(stopDictateOnCardAction);
-  yield fork(stopSpeakActivityOnInputSaga);
+  yield fork(startSpeakActivityOnPostActivitySaga);
+  yield fork(stopDictateOnCardActionSaga);
+  yield fork(stopSpeakingActivityOnInputSaga);
   yield fork(submitSendBoxSaga);
 }

src/sagas/clearSuggestedActionsOnPostActivitySaga.js

 import {
   put,
-  take
+  takeEvery
 } from 'redux-saga/effects';
 
+import whileConnected from './effects/whileConnected';
+
 import { POST_ACTIVITY_PENDING } from '../actions/postActivity';
-import whileConnected from './effects/whileConnected';
 import setSuggestedActions from '../actions/setSuggestedActions';
 
 export default function* () {
-  yield whileConnected(function* () {
-    for (;;) {
-      yield take(({ payload, type }) => type === POST_ACTIVITY_PENDING && payload.activity.type === 'message');
-      yield put(setSuggestedActions());
-    }
-  });
+  yield whileConnected(clearSuggestedActionsOnPostActivity);
 }
+
+function* clearSuggestedActionsOnPostActivity() {
+  yield takeEvery(
+    ({ payload, type }) => (
+      type === POST_ACTIVITY_PENDING
+      && payload.activity.type === 'message'
+    ),
+    clearSuggestedActions
+  );
+}
+
+function* clearSuggestedActions() {
+  yield put(setSuggestedActions());
+}

src/sagas/connectionStatusUpdateSaga.js

@@ -12,8 +12,10 @@ import {
 export default function* () {
-  yield whileConnected(function* (directLine) {
-    yield observeEach(directLine.connectionStatus$, function* (connectionStatus) {
-      yield put(connectionStatusUpdate(connectionStatus));
-      yield put(setReferenceGrammarID(directLine.referenceGrammarId));
-    });
+  yield whileConnected(observeConnectionStatus);
+}
+
+function* observeConnectionStatus({ directLine }) {
+  yield observeEach(directLine.connectionStatus$, function* (connectionStatus) {
+    yield put(connectionStatusUpdate(connectionStatus));
+    yield put(setReferenceGrammarID(directLine.referenceGrammarId));
   });
 }

src/sagas/connectSaga.js

@@ -11,8 +11,10 @@ import {
 import { decode } from 'jsonwebtoken';
+import random from 'math-random';
 
-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 {
@@ -22,2 +24,3 @@ CONNECT,
   CONNECT_REJECTED,
+  CONNECT_FULFILLING,
   CONNECT_FULFILLED
@@ -29,55 +32,73 @@ } from '../actions/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;
 
-const DEFAULT_USER_ID = 'default-user';
+function randomUserID() {
+  return `r_${ random().toString(36).substr(2, 10) }`;
+}
 
-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 = DEFAULT_USER_ID;
-      } 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 = DEFAULT_USER_ID;
-      }
-    } else {
-      // Only specify "default-user" if not found from token and not passed in
-      userID = DEFAULT_USER_ID;
+      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$
@@ -87,46 +108,92 @@ const activitySubscription = directLine.activity$.subscribe({ next: () => 0 });
   try {
-    try {
-      yield callUntil(connectionStatusQueue.shift, [], connectionStatus => connectionStatus === ONLINE);
-      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,
+        username
+      }
+    } = 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),
+        username
+      };
 
-  // DirectLineJS should cancel underlying REST/WS when we cancel
-  // the connect task, which subsequently unsubscribe connectionStatus$
-  yield cancel(connectTask);
+      let endDirectLine;
 
-  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') });
+      yield put({ type: CONNECT_PENDING, meta });
+
+      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

@@ -8,4 +8,4 @@ import {
 
-import { CONNECT_FULFILLED } from '../../actions/connect';
-import { DISCONNECT_FULFILLED } from '../../actions/disconnect';
+import { CONNECT_FULFILLING } from '../../actions/connect';
+import { DISCONNECT_PENDING } from '../../actions/disconnect';
 
@@ -15,6 +15,7 @@ export default function (fn) {
     for (;;) {
-      const { meta: { userID }, payload: { directLine } } = yield take(CONNECT_FULFILLED);
-      const task = yield fork(fn, directLine, userID);
+      const { meta: { userID, username }, payload: { directLine } } = yield take(CONNECT_FULFILLING);
+      const task = yield fork(fn, { directLine, userID, username });
 
-      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 @@ }

src/sagas/incomingActivitySaga.js

@@ -6,4 +6,3 @@ import {
 
-import observeEach from './effects/observeEach';
-import whileConnected from './effects/whileConnected';
+import updateIn from 'simple-update-in';
 
@@ -13,47 +12,50 @@ import incomingActivity from '../actions/incomingActivity';
 
-function last(array, predicate) {
-  for (let i = array.length - 1; i >= 0; i--) {
-    const item = array[i];
+import activityFromBot from '../definitions/activityFromBot';
 
-    if (predicate.call(array, item)) {
-      return item;
-    }
-  }
-}
+import observeEach from './effects/observeEach';
+import whileConnected from './effects/whileConnected';
 
+import { ofType as activitiesOfType } from '../selectors/activities';
+
 export default function* () {
-  yield whileConnected(function* (directLine, userID) {
-    yield observeEach(directLine.activity$, function* (activity) {
-      activity = { ...activity };
+  yield whileConnected(observeActivity);
+}
 
-      // Patch activity.from.role to make sure its either "bot", "user", or "channel"
-      if (!activity.from) {
-        activity.from = { role: 'channel' };
-      } else if (!activity.from.role) {
-        if (activity.from.id === userID) {
-          activity.from.role = 'user';
-        } else if (activity.from.id) {
-          activity.from.role = 'bot';
-        } else {
-          activity.from.role = 'channel';
-        }
-      }
+function* observeActivity({ directLine, userID }) {
+  yield observeEach(directLine.activity$, function* (activity) {
+    activity = patchActivityWithFromRole(activity, userID);
 
-      yield put(incomingActivity(activity));
+    yield put(incomingActivity(activity));
 
-      // Update suggested actions
-      const activities = yield select(({ activities }) => activities);
-      const lastMessageActivity = last(activities, ({ type }) => type === 'message');
+    // Update suggested actions
+    const messageActivities = yield select(activitiesOfType('message'));
+    const lastMessageActivity = messageActivities[messageActivities.length - 1];
 
-      if (
-        lastMessageActivity
-        && lastMessageActivity.from
-        && lastMessageActivity.from.role === 'bot'
-      ) {
-        const { suggestedActions: { actions } = {} } = lastMessageActivity;
+    if (activityFromBot(lastMessageActivity)) {
+      const { suggestedActions: { actions } = {} } = lastMessageActivity;
 
-        yield put(setSuggestedActions(actions));
-      }
-    });
+      yield put(setSuggestedActions(actions));
+    }
   });
 }
+
+function patchActivityWithFromRole(activity, userID) {
+  // Some activities, such as "ConversationUpdate", does not have "from" defined.
+  // And although "role" is defined in Direct Line spec, it was not sent over the wire.
+  // We normalize the activity here to simplify null-check and logic later.
+
+  // Patch activity.from.role to make sure its either "bot", "user", or "channel"
+  if (!activity.from) {
+    activity = updateIn(activity, ['from', 'role'], () => 'channel');
+  } else if (!activity.from.role) {
+    if (activity.from.id === userID) {
+      activity = updateIn(activity, ['from', 'role'], () => 'user');
+    } else if (activity.from.id) {
+      activity = updateIn(activity, ['from', 'role'], () => 'bot');
+    } else {
+      activity = updateIn(activity, ['from', 'role'], () => 'channel');
+    }
+  }
+
+  return activity;
+}

src/sagas/postActivitySaga.js

@@ -5,16 +5,18 @@ import {
   cancelled,
-  fork,
   put,
   race,
   select,
-  take
+  take,
+  takeEvery
 } from 'redux-saga/effects';
 
-import sleep from '../utils/sleep';
-
 import observeOnce from './effects/observeOnce';
 import whileConnected from './effects/whileConnected';
 
+import languageSelector from '../selectors/language';
+import sendTimeoutSelector from '../selectors/sendTimeout';
+
 import deleteKey from '../utils/deleteKey';
 import getTimestamp from '../utils/getTimestamp';
+import sleep from '../utils/sleep';
 import uniqueID from '../utils/uniqueID';
@@ -32,13 +34,13 @@
 export default function* () {
-  yield whileConnected(function* (directLine, userID) {
-    for (let numActivitiesPosted = 0;; numActivitiesPosted++) {
-      const action = yield take(POST_ACTIVITY);
+  yield whileConnected(function* ({ directLine, userID, username }) {
+    let numActivitiesPosted = 0;
 
-      yield fork(postActivity, directLine, userID, numActivitiesPosted, action);
-    }
+    yield takeEvery(POST_ACTIVITY, function* (action) {
+      yield* postActivity(directLine, userID, username, numActivitiesPosted++, action);
+    });
   });
 }
 
-function* postActivity(directLine, userID, numActivitiesPosted, { payload: { activity } }) {
-  const locale = yield select(({ language }) => language);
+function* postActivity(directLine, userID, username, numActivitiesPosted, { meta: { method }, payload: { activity } }) {
+  const locale = yield select(languageSelector);
   const { attachments, channelData: { clientActivityID = uniqueID() } = {} } = activity;
@@ -60,2 +62,3 @@
       id: userID,
+      name: username,
       role: 'user'
@@ -78,5 +81,5 @@ },
 
-  const meta = { clientActivityID };
+  const meta = { clientActivityID, method };
 
-  yield put({ type: POST_ACTIVITY_PENDING, payload: { activity }, meta });
+  yield put({ type: POST_ACTIVITY_PENDING, meta, payload: { activity } });
 
@@ -103,3 +106,3 @@ try {
 
-    const sendTimeout = yield select(({ sendTimeout }) => sendTimeout);
+    const sendTimeout = yield select(sendTimeoutSelector);
 
@@ -106,0 +109,0 @@ const { send: { echoBack } } = yield race({

src/sagas/sendFilesToPostActivitySaga.js

 import {
   put,
-  take
+  takeEvery
 } from 'redux-saga/effects';
 
-import mime from 'mime';
+import mime from '../utils/mime-wrapper';
 
@@ -12,3 +12,2 @@ import whileConnected from './effects/whileConnected';
 import postActivity from '../actions/postActivity';
-import stopSpeakingActivity from '../actions/stopSpeakingActivity';
 
@@ -18,23 +17,27 @@ const getType = mime.getType.bind(mime);
 export default function* () {
-  yield whileConnected(function* () {
-    for (;;) {
-      const { payload: { files } } = yield take(SEND_FILES);
+  yield whileConnected(sendFilesToPostActivity);
+}
 
-      if (files.length) {
-        yield put(postActivity({
-          attachments: [].map.call(files, file => ({
-            contentType: getType(file.name) || 'application/octet-stream',
-            contentUrl: file.url,
-            name: file.name
-          })),
-          channelData: {
-            attachmentSizes: [].map.call(files, file => file.size)
-          },
-          type: 'message'
-        }));
+function* sendFilesToPostActivity() {
+  yield takeEvery(
+    ({ payload, type }) => (
+      type === SEND_FILES
+      && payload.files.length
+    ),
+    postActivityWithFiles
+  );
+}
 
-        yield put(stopSpeakingActivity());
-      }
-    }
-  });
+function* postActivityWithFiles({ payload: { files } }) {
+  yield put(postActivity({
+    attachments: [].map.call(files, ({ name, url }) => ({
+      contentType: getType(name) || 'application/octet-stream',
+      contentUrl: url,
+      name: name
+    })),
+    channelData: {
+      attachmentSizes: [].map.call(files, ({ size }) => size)
+    },
+    type: 'message'
+  }));
 }

src/sagas/sendMessageToPostActivitySaga.js

 import {
   put,
-  take
+  takeEvery
 } from 'redux-saga/effects';
@@ -10,25 +10,20 @@
 import postActivity from '../actions/postActivity';
-import startSpeakingActivity from '../actions/startSpeakingActivity';
-import stopSpeakingActivity from '../actions/stopSpeakingActivity';
 
 export default function* () {
-  yield whileConnected(function* () {
-    for (;;) {
-      const { payload: { text, via } } = yield take(SEND_MESSAGE);
+  yield whileConnected(sendMessageToPostActivity);
+}
 
-      if (text) {
-        yield put(postActivity({
-          text,
-          textFormat: 'plain',
-          type: 'message'
-        }));
+function* sendMessageToPostActivity() {
+  yield takeEvery(({ payload, type }) => (
+    type === SEND_MESSAGE
+    && payload.text
+  ), postActivityWithMessage);
+}
 
-        if (via === 'speech') {
-          yield put(startSpeakingActivity());
-        } else {
-          yield put(stopSpeakingActivity());
-        }
-      }
-    }
-  });
+function* postActivityWithMessage({ payload: { method, text } }) {
+  yield put(postActivity({
+    text,
+    textFormat: 'plain',
+    type: 'message'
+  }, method));
 }

src/sagas/sendPostBackToPostActivitySaga.js

 import {
   put,
-  take
+  takeEvery
 } from 'redux-saga/effects';
 
-import whileConnected from './effects/whileConnected';
-
 import { SEND_POST_BACK } from '../actions/sendPostBack';
 import postActivity from '../actions/postActivity';
+import whileConnected from './effects/whileConnected';
 
 export default function* () {
-  yield whileConnected(function* () {
-    for (;;) {
-      const { payload: { value } } = yield take(SEND_POST_BACK);
+  yield whileConnected(sendPostBackToPostActivity);
+}
 
-      if (value) {
-        yield put(postActivity({
-          channelData: {
-            postBack: true
-          },
-          text: typeof value === 'string' ? value : undefined,
-          type: 'message',
-          value: typeof value !== 'string' ? value : undefined
-        }));
-      }
-    }
-  });
+function* sendPostBackToPostActivity() {
+  yield takeEvery(
+    ({ payload, type }) => (
+      type === SEND_POST_BACK
+      && payload.value
+    ),
+    postActivityWithPostBack
+  );
 }
+
+function* postActivityWithPostBack({ payload: { value } }) {
+  yield put(postActivity({
+    channelData: {
+      postBack: true
+    },
+    text: typeof value === 'string' ? value : undefined,
+    type: 'message',
+    value: typeof value !== 'string' ? value : undefined
+  }));
+}

src/sagas/startDictateAfterSpeakActivitySaga.js

 import {
-  cancel,
-  fork,
   put,
   select,
-  take
+  takeEvery
 } from 'redux-saga/effects';
 
-import whileConnected from './effects/whileConnected';
-
 import { MARK_ACTIVITY } from '../actions/markActivity';
-import { START_SPEAKING_ACTIVITY } from '../actions/startSpeakingActivity';
-import { STOP_SPEAKING_ACTIVITY } from '../actions/stopSpeakingActivity';
 import startDictate from '../actions/startDictate';
 
-export default function* () {
-  yield whileConnected(function* (_, userID) {
-    for (;;) {
-      yield take(START_SPEAKING_ACTIVITY);
+import speakingActivity from '../definitions/speakingActivity';
 
-      const task = yield fork(startDictateAfterSpeakActivitySaga, userID);
+import whileConnected from './effects/whileConnected';
+import whileSpeakIncomingActivity from './effects/whileSpeakIncomingActivity';
 
-      yield take(STOP_SPEAKING_ACTIVITY);
-      yield cancel(task);
-    }
+import { ofID as activitiesOfID } from '../selectors/activities';
+
+export default function* () {
+  yield whileConnected(function* () {
+    yield whileSpeakIncomingActivity(startDictateAfterSpeakActivity);
   });
 }
 
-function* startDictateAfterSpeakActivitySaga() {
-  for (;;) {
-    const { payload: { activityID } } = yield take(({ payload, type }) => type === MARK_ACTIVITY && payload.name === 'speak' && payload.value === false);
-    const activities = yield select(({ activities }) => activities);
+function* startDictateAfterSpeakActivity() {
+  yield takeEvery(
+    ({ payload, type }) => (
+      type === MARK_ACTIVITY
+      && payload.name === 'speak'
+      && payload.value === false
+    ),
+    startDictateAfterAllActivitiesSpoken
+  );
+}
 
-    if (!activities.some(activity => activity.id !== activityID && activity.channelData && activity.channelData.speak === true)) {
-      yield put(startDictate());
-    }
+function* startDictateAfterAllActivitiesSpoken({ payload: { activityID } }) {
+  const activities = yield select(activitiesOfID(activityID));
+  const [spokenActivity] = activities;
+
+  if (
+    spokenActivity
+    && spokenActivity.inputHint !== 'ignoringInput'
+    // Checks if there are no more activities that will be synthesis
+    && !activities.some(
+      activity => activity.id !== activityID && speakingActivity(activity)
+    )
+  ) {
+    // We honor input hint based on this article
+    // https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-howto-add-input-hints?view=azure-bot-service-4.0&tabs=cs
+    yield put(startDictate());
   }
 }

src/sagas/submitSendBoxSaga.js

 import {
   put,
   select,
-  take
+  takeEvery
 } from 'redux-saga/effects';
 
-import whileConnected from './effects/whileConnected';
-
 import { SUBMIT_SEND_BOX } from '../actions/submitSendBox';
@@ -13,14 +11,19 @@ import sendMessage from '../actions/sendMessage';
 
+import whileConnected from './effects/whileConnected';
+
+import sendBoxValueSelector from '../selectors/sendBoxValue';
+
 export default function* () {
-  yield whileConnected(function* () {
-    for (;;) {
-      const { payload: { via } } = yield take(SUBMIT_SEND_BOX);
-      const sendBoxValue = yield select(({ sendBoxValue }) => sendBoxValue);
+  yield whileConnected(submitSendBox);
+}
 
-      if (sendBoxValue) {
-        yield put(sendMessage(sendBoxValue, via));
-        yield put(setSendBox('', 'keyboard'));
-      }
+function* submitSendBox() {
+  yield takeEvery(SUBMIT_SEND_BOX, function* ({ payload: { method } }) {
+    const sendBoxValue = yield select(sendBoxValueSelector);
+
+    if (sendBoxValue) {
+      yield put(sendMessage(sendBoxValue, method));
+      yield put(setSendBox(''));
     }
   });
 }

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

363255

increased by28.68%

Number of package files

190

increased by28.38%

Lines of code

5503

increased by28.91%

Worsened metrics

Dependency count

8

increased by14.29%

Dependency changes

• + Addedmath-random@^1.0.4

• + Addedmath-random@1.0.4(transitive)