From dc187f0036875345ab489d14889c488eead24dc2 Mon Sep 17 00:00:00 2001
From: Pagan Gazzard <page@balena.io>
Date: Sat, 16 May 2020 13:22:45 +0100
Subject: [PATCH] Catch errors in the target state poll so polling will always
 continue

Change-type: patch
---
 src/api-binder.ts | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/api-binder.ts b/src/api-binder.ts
index f09045e4..7c6fc855 100644
--- a/src/api-binder.ts
+++ b/src/api-binder.ts
@@ -612,30 +612,34 @@ export class APIBinder {
 	}
 
 	private async pollTargetState(skipFirstGet: boolean = false): Promise<void> {
-		const appUpdatePollInterval = await this.config.get(
-			'appUpdatePollInterval',
-		);
-
-		// We add a random jitter up to `maxApiJitterDelay` to
-		// space out poll requests
-		let pollInterval =
-			Math.random() * constants.maxApiJitterDelay + appUpdatePollInterval;
-
-		if (!skipFirstGet) {
-			try {
+		let appUpdatePollInterval;
+		try {
+			appUpdatePollInterval = await this.config.get('appUpdatePollInterval');
+			if (!skipFirstGet) {
 				await this.getAndSetTargetState(false);
 				this.targetStateFetchErrors = 0;
-			} catch (e) {
-				pollInterval = Math.min(
-					appUpdatePollInterval,
-					15000 * 2 ** this.targetStateFetchErrors,
-				);
-				++this.targetStateFetchErrors;
 			}
-		}
 
-		await Bluebird.delay(pollInterval);
-		await this.pollTargetState();
+			// We add a random jitter up to `maxApiJitterDelay` to
+			// space out poll requests
+			const pollInterval =
+				Math.random() * constants.maxApiJitterDelay + appUpdatePollInterval;
+
+			await Bluebird.delay(pollInterval);
+		} catch (e) {
+			const pollInterval = Math.min(
+				// If we failed fetching the appUpdatePollInterval then there won't have been any network
+				// requests so we default it to a low value of 10s since we don't need to worry about too
+				// many network requests
+				appUpdatePollInterval ?? 10000,
+				15000 * 2 ** this.targetStateFetchErrors,
+			);
+			++this.targetStateFetchErrors;
+
+			await Bluebird.delay(pollInterval);
+		} finally {
+			await this.pollTargetState();
+		}
 	}
 
 	private async pinDevice({ app, commit }: DevicePinInfo) {