Merge pull request tidepool-org#609 from tidepool-org/pazaan/medtroni…

…c600-comms-errors [WIP] Comms error handling bug fix
jweismann · May 3, 2018 · 0f97866 · 0f97866
2 parents 081caca + d86c191
commit 0f97866
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tidepool-uploader",
   "productName": "tidepool-uploader",
-  "version": "2.2.5-600series-qa.20",
+  "version": "2.2.5-600series-qa.21",
   "description": "Tidepool Project Universal Uploader",
   "main": "./main.js",
   "author": {

diff --git a/lib/drivers/medtronic600/medtronic600Driver.js b/lib/drivers/medtronic600/medtronic600Driver.js
@@ -761,6 +761,9 @@ class MultipacketSession {
 
   addSegment(segment) {
     debug(`*** Got a Multipacket Segment: ${segment.packetNumber + 1} of ${this.packetsToFetch}, count: ${this.segmentsFilled + 1}`);
+    if (this.packetsToFetch === this.segmentsFilled) {
+      throw new InvalidStateError('Segments already filled. Should not be getting duplicates.');
+    }
 
     if (segment.segmentPayload != null) {
       // multiByteSegments don't always come back in a consecutive order.
@@ -988,6 +991,14 @@ class TransmitPacketRequest extends NGPRequest {
           this.ngpRetries += 1;
         }
         debug(`Multipacket retry: ${this.ngpRetries}`);
+        if (err instanceof TimeoutError) {
+          debug('Got timeout waiting for message.');
+        } else if (err instanceof InvalidMessageError) {
+          debug('Invalid Message');
+        } else {
+          debug('Unknown error occurred while reading Multipacket message.');
+          throw new InvalidStateError('Software Error. Contact Tidepool support.');
+        }
 
         if (this.ngpRetries > NGPRequest.MAX_RETRIES) {
           throw new RetryError('Exceeded retries for TransmitPacketRequest');
@@ -998,6 +1009,7 @@ class TransmitPacketRequest extends NGPRequest {
             if (nextMissingSegment !== undefined) {
               fetchMoreData = true;
               debug('Requesting missing packets');
+              this.ngpRetries = 0;
               await Timer.wait(TransmitPacketRequest.MULTIPACKET_ACK_DELAY_MS);
               await new MultipacketResendPacketsCommand(
                 this.pumpSession,
@@ -1009,15 +1021,6 @@ class TransmitPacketRequest extends NGPRequest {
             }
           }
         }
-
-        if (err instanceof TimeoutError) {
-          debug(`Got timeout waiting for message. On retry ${this.ngpRetries}`);
-        } else if (err instanceof InvalidMessageError) {
-          debug('Invalid Message');
-        } else {
-          debug('Unknown error occurred while reading Multipacket message.');
-          debug(err);
-        }
       }
     }
     /* eslint-enable no-use-before-define */

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tidepool-uploader",
-  "version": "2.2.5-600series-qa.20",
+  "version": "2.2.5-600series-qa.21",
   "description": "Tidepool Project Universal Uploader",
   "private": true,
   "main": "main.js",