From 3151648ef7a81606f163611a094f10494ab439c5 Mon Sep 17 00:00:00 2001
From: Colin Diesh <colin.diesh@gmail.com>
Date: Mon, 12 Dec 2022 18:52:58 -0700
Subject: [PATCH] Simplify RPC watchWorker (#3394)

---
 packages/core/rpc/BaseRpcDriver.ts | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/packages/core/rpc/BaseRpcDriver.ts b/packages/core/rpc/BaseRpcDriver.ts
index 70b19b57a3..25afd55da5 100644
--- a/packages/core/rpc/BaseRpcDriver.ts
+++ b/packages/core/rpc/BaseRpcDriver.ts
@@ -43,22 +43,13 @@ export async function watchWorker(
   rpcDriverClassName: string,
 ) {
   // after first ping succeeds, apply wait for timeout
-  return new Promise((_resolve, reject) => {
-    function delay() {
-      setTimeout(async () => {
-        try {
-          await worker.call('ping', [], {
-            timeout: pingTime * 2,
-            rpcDriverClassName,
-          })
-          delay()
-        } catch (e) {
-          reject(e)
-        }
-      }, pingTime)
-    }
-    delay()
-  })
+  while (true) {
+    await worker.call('ping', [], {
+      timeout: pingTime * 2,
+      rpcDriverClassName,
+    })
+    await new Promise(resolve => setTimeout(resolve, pingTime))
+  }
 }
 
 function detectHardwareConcurrency() {