fixing bugs

Author: FranckTala

README.md

@@ -106,7 +106,7 @@ Supported:
 Limitations:
 * All groups must have one or more messages. (i.e. No groups of size 0).
 Can't do re-grouping when a split is done on an empty array. (i.e. No empty for each pattern supported).
-If all the messages in the group do not arrive, then the group will not be emitted..
+If all the messages in the group do not arrive, then the group will not be emitted.
 * The group is dropped if there are any unexpected restarts to the container.
 * In case only a groupSize is given and no delay timer is specified. The size of the group must be known by all group members.
 * In case of using the delay timer. Messages are only emitted when all parts arrive. Emitting a message only when the first part arrives isn't supported.

lib/actions/reassemble.js

@@ -16,15 +16,14 @@ async function timer(this_) {
       incomingData[message.messageId] = message.messageData;
     });
 
-    // eslint-disable-next-line no-await-in-loop
-    await storage.deleteObjectById(groupList[i]);
-
     // eslint-disable-next-line no-await-in-loop
     await this_.emit('data', messages.newMessageWithBody({
       groupSize: results.messages.length,
       groupId: results.messages[0].groupId,
       messageData: incomingData,
     }));
+    // eslint-disable-next-line no-await-in-loop
+    await storage.deleteObjectById(groupList[i]);
   }
 }
 
@@ -105,29 +104,23 @@ async function processAction(msg, cfg) {
 
   // When delay timer option is selected
   if (mode === 'timeout') {
-    delay = msg.body.timersec;
     delay = (msg.body.timersec >= 40000) ? 40000 : msg.body.timersec;
     clearTimeout(timeHandle);
     timeHandle = setTimeout(timer, delay, this);
-    if (groupList.includes(messageGroupId)) {
-      // no action required
-    } else {
+    if (!groupList.includes(messageGroupId)) {
       groupList.push(messageGroupId);
-    }
+    } 
   }
 
   // When both groupSize and delay timer option is selected
   if (mode === 'groupSize&timeout') {
-    delay = msg.body.timersec;
     delay = (msg.body.timersec >= 40000) ? 40000 : msg.body.timersec;
     clearTimeout(timeHandle);
     timeHandle = setTimeout(timer, delay, this);
 
-    if (groupList.includes(messageGroupId)) {
-      // no action required
-    } else {
+    if (!groupList.includes(messageGroupId)) {
       groupList.push(messageGroupId);
-    }
+    } 
 
     if (messagesNumberSeen >= messageGroupSize) {
       parsedMessageGroup.messages.forEach((message) => {