sceyt-chat-react-uikit 1.9.1-beta.4 → 1.9.1-beta.5

package/index.js

@@ -17516,6 +17516,7 @@ var _marked = /*#__PURE__*/_regenerator().m(setMessageListLoading),
   _marked59 = /*#__PURE__*/_regenerator().m(MessageSaga);
 var MAX_AUTO_RESEND_ATTEMPTS = 5;
 var autoResendAttempts = new Map();
+var autoResendsInFlight = new Set();
 var loadMoreMessagesInFlight = new Set();
 var prefetchInFlight = new Set();
 var queuedPrefetchRequests = new Map();
@@ -19747,7 +19748,7 @@ function editMessage(action) {
   }, _marked14, null, [[0, 8]]);
 }
 var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connectionState) {
-  var pendingMessagesMap, channelId, _iterator3, _step3, _msg$attachments, msg, attachments, resendKey, attempts, pendingPollActionsMap, _t8, _t9, _t0;
+  var pendingMessagesMap, channelId, _iterator3, _step3, _msg$attachments, msg, attachments, resendKey, resendInFlightKey, attempts, pendingPollActionsMap, _t8, _t9, _t0;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -19755,14 +19756,14 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
         _t8 = _regeneratorKeys(pendingMessagesMap);
       case 1:
         if ((_t9 = _t8()).done) {
-          _context19.n = 13;
+          _context19.n = 15;
           break;
         }
         channelId = _t9.value;
         _iterator3 = _createForOfIteratorHelperLoose(pendingMessagesMap[channelId]);
       case 2:
         if ((_step3 = _iterator3()).done) {
-          _context19.n = 12;
+          _context19.n = 14;
           break;
         }
         msg = _step3.value;
@@ -19770,26 +19771,34 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
           return (att === null || att === void 0 ? void 0 : att.type) !== attachmentTypes.link;
         });
         resendKey = (msg === null || msg === void 0 ? void 0 : msg.tid) || (msg === null || msg === void 0 ? void 0 : msg.id);
+        resendInFlightKey = resendKey ? channelId + ":" + resendKey : null;
         if (!resendKey) {
-          _context19.n = 4;
+          _context19.n = 5;
+          break;
+        }
+        if (!autoResendsInFlight.has(resendInFlightKey)) {
+          _context19.n = 3;
           break;
         }
+        return _context19.a(3, 13);
+      case 3:
         attempts = autoResendAttempts.get(resendKey) || 0;
         if (!(attempts >= MAX_AUTO_RESEND_ATTEMPTS)) {
-          _context19.n = 3;
+          _context19.n = 4;
           break;
         }
         log.info("Skipping auto-resend of message " + resendKey + " after " + attempts + " failed attempts");
-        return _context19.a(3, 11);
-      case 3:
-        autoResendAttempts.set(resendKey, attempts + 1);
+        return _context19.a(3, 13);
       case 4:
-        _context19.p = 4;
+        autoResendAttempts.set(resendKey, attempts + 1);
+        autoResendsInFlight.add(resendInFlightKey);
+      case 5:
+        _context19.p = 5;
         if (!(msg !== null && msg !== void 0 && msg.forwardingDetails)) {
-          _context19.n = 6;
+          _context19.n = 7;
           break;
         }
-        _context19.n = 5;
+        _context19.n = 6;
         return effects.call(forwardMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -19799,15 +19808,15 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             isForward: true
           }
         });
-      case 5:
-        _context19.n = 9;
-        break;
       case 6:
+        _context19.n = 10;
+        break;
+      case 7:
         if (!(attachments && attachments.length > 0)) {
-          _context19.n = 8;
+          _context19.n = 9;
           break;
         }
-        _context19.n = 7;
+        _context19.n = 8;
         return effects.call(sendMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -19817,11 +19826,11 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             sendAttachmentsAsSeparateMessage: false
           }
         });
-      case 7:
-        _context19.n = 9;
-        break;
       case 8:
-        _context19.n = 9;
+        _context19.n = 10;
+        break;
+      case 9:
+        _context19.n = 10;
         return effects.call(sendTextMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -19830,31 +19839,37 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             channelId: channelId
           }
         });
-      case 9:
-        _context19.n = 11;
-        break;
       case 10:
-        _context19.p = 10;
+        _context19.n = 12;
+        break;
+      case 11:
+        _context19.p = 11;
         _t0 = _context19.v;
         log.error("Failed to send pending message " + (msg.tid || msg.id) + ":", _t0);
-      case 11:
+      case 12:
+        _context19.p = 12;
+        if (resendInFlightKey) {
+          autoResendsInFlight["delete"](resendInFlightKey);
+        }
+        return _context19.f(12);
+      case 13:
         _context19.n = 2;
         break;
-      case 12:
+      case 14:
         _context19.n = 1;
         break;
-      case 13:
+      case 15:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         if (!(pendingPollActionsMap && Object.keys(pendingPollActionsMap).length > 0)) {
-          _context19.n = 14;
+          _context19.n = 16;
           break;
         }
-        _context19.n = 14;
+        _context19.n = 16;
         return effects.put(resendPendingPollActionsAC(connectionState));
-      case 14:
+      case 16:
         return _context19.a(2);
     }
-  }, _callee5, null, [[4, 10]]);
+  }, _callee5, null, [[5, 11, 12, 13]]);
 });
 function resumePendingMessagesAfterReconnect(action) {
   var _action$payload2;

package/index.modern.js

@@ -17496,6 +17496,7 @@ var _marked = /*#__PURE__*/_regenerator().m(setMessageListLoading),
   _marked59 = /*#__PURE__*/_regenerator().m(MessageSaga);
 var MAX_AUTO_RESEND_ATTEMPTS = 5;
 var autoResendAttempts = new Map();
+var autoResendsInFlight = new Set();
 var loadMoreMessagesInFlight = new Set();
 var prefetchInFlight = new Set();
 var queuedPrefetchRequests = new Map();
@@ -19727,7 +19728,7 @@ function editMessage(action) {
   }, _marked14, null, [[0, 8]]);
 }
 var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connectionState) {
-  var pendingMessagesMap, channelId, _iterator3, _step3, _msg$attachments, msg, attachments, resendKey, attempts, pendingPollActionsMap, _t8, _t9, _t0;
+  var pendingMessagesMap, channelId, _iterator3, _step3, _msg$attachments, msg, attachments, resendKey, resendInFlightKey, attempts, pendingPollActionsMap, _t8, _t9, _t0;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -19735,14 +19736,14 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
         _t8 = _regeneratorKeys(pendingMessagesMap);
       case 1:
         if ((_t9 = _t8()).done) {
-          _context19.n = 13;
+          _context19.n = 15;
           break;
         }
         channelId = _t9.value;
         _iterator3 = _createForOfIteratorHelperLoose(pendingMessagesMap[channelId]);
       case 2:
         if ((_step3 = _iterator3()).done) {
-          _context19.n = 12;
+          _context19.n = 14;
           break;
         }
         msg = _step3.value;
@@ -19750,26 +19751,34 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
           return (att === null || att === void 0 ? void 0 : att.type) !== attachmentTypes.link;
         });
         resendKey = (msg === null || msg === void 0 ? void 0 : msg.tid) || (msg === null || msg === void 0 ? void 0 : msg.id);
+        resendInFlightKey = resendKey ? channelId + ":" + resendKey : null;
         if (!resendKey) {
-          _context19.n = 4;
+          _context19.n = 5;
+          break;
+        }
+        if (!autoResendsInFlight.has(resendInFlightKey)) {
+          _context19.n = 3;
           break;
         }
+        return _context19.a(3, 13);
+      case 3:
         attempts = autoResendAttempts.get(resendKey) || 0;
         if (!(attempts >= MAX_AUTO_RESEND_ATTEMPTS)) {
-          _context19.n = 3;
+          _context19.n = 4;
           break;
         }
         log.info("Skipping auto-resend of message " + resendKey + " after " + attempts + " failed attempts");
-        return _context19.a(3, 11);
-      case 3:
-        autoResendAttempts.set(resendKey, attempts + 1);
+        return _context19.a(3, 13);
       case 4:
-        _context19.p = 4;
+        autoResendAttempts.set(resendKey, attempts + 1);
+        autoResendsInFlight.add(resendInFlightKey);
+      case 5:
+        _context19.p = 5;
         if (!(msg !== null && msg !== void 0 && msg.forwardingDetails)) {
-          _context19.n = 6;
+          _context19.n = 7;
           break;
         }
-        _context19.n = 5;
+        _context19.n = 6;
         return call(forwardMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -19779,15 +19788,15 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             isForward: true
           }
         });
-      case 5:
-        _context19.n = 9;
-        break;
       case 6:
+        _context19.n = 10;
+        break;
+      case 7:
         if (!(attachments && attachments.length > 0)) {
-          _context19.n = 8;
+          _context19.n = 9;
           break;
         }
-        _context19.n = 7;
+        _context19.n = 8;
         return call(sendMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -19797,11 +19806,11 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             sendAttachmentsAsSeparateMessage: false
           }
         });
-      case 7:
-        _context19.n = 9;
-        break;
       case 8:
-        _context19.n = 9;
+        _context19.n = 10;
+        break;
+      case 9:
+        _context19.n = 10;
         return call(sendTextMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -19810,31 +19819,37 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee5(connec
             channelId: channelId
           }
         });
-      case 9:
-        _context19.n = 11;
-        break;
       case 10:
-        _context19.p = 10;
+        _context19.n = 12;
+        break;
+      case 11:
+        _context19.p = 11;
         _t0 = _context19.v;
         log.error("Failed to send pending message " + (msg.tid || msg.id) + ":", _t0);
-      case 11:
+      case 12:
+        _context19.p = 12;
+        if (resendInFlightKey) {
+          autoResendsInFlight["delete"](resendInFlightKey);
+        }
+        return _context19.f(12);
+      case 13:
         _context19.n = 2;
         break;
-      case 12:
+      case 14:
         _context19.n = 1;
         break;
-      case 13:
+      case 15:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         if (!(pendingPollActionsMap && Object.keys(pendingPollActionsMap).length > 0)) {
-          _context19.n = 14;
+          _context19.n = 16;
           break;
         }
-        _context19.n = 14;
+        _context19.n = 16;
         return put(resendPendingPollActionsAC(connectionState));
-      case 14:
+      case 16:
         return _context19.a(2);
     }
-  }, _callee5, null, [[4, 10]]);
+  }, _callee5, null, [[5, 11, 12, 13]]);
 });
 function resumePendingMessagesAfterReconnect(action) {
   var _action$payload2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sceyt-chat-react-uikit",
-  "version": "1.9.1-beta.4",
+  "version": "1.9.1-beta.5",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",