fix: prioritize command failure over command timeout (#83)

samrum · May 28, 2021 · 14e7ebc · 14e7ebc
1 parent 0d7286c
commit 14e7ebc
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/RequestService.ts b/src/RequestService.ts
@@ -365,6 +365,12 @@ class RequestService {
 
           const requestTimestamp = new Date(requestTime).getTime();
 
+          if (status === CommandResponseStatus.failure) {
+            throw new RequestError("Command Failure")
+              .setResponse(response)
+              .setRequest(request);
+          }
+
           if (
             Date.now() >=
             requestTimestamp + this.requestPollingTimeoutSeconds * 1000
@@ -374,11 +380,7 @@ class RequestService {
               .setRequest(request);
           }
 
-          if (status === CommandResponseStatus.failure) {
-            throw new RequestError("Command Failure")
-              .setResponse(response)
-              .setRequest(request);
-          } else if (
+          if (
             status === CommandResponseStatus.inProgress &&
             type !== "connect"
           ) {
@@ -388,6 +390,7 @@ class RequestService {
               .setMethod(RequestMethod.Get)
               .setUpgradeRequired(false)
               .setCheckRequestStatus(checkRequestStatus);
+
             return this.sendRequest(request);
           }