Fixed an issue with error handling in task waiter

src/features/serverTasks/serverTaskWaiter.test.ts

@@ -0,0 +1,23 @@
+import { Client } from "../../client";
+import { processConfiguration } from "../../clientConfiguration.test";
+import { ServerTaskDetails } from "./serverTaskDetails";
+import { ServerTaskWaiter } from "./serverTaskWaiter";
+
+describe("push build information", () => {
+    jest.setTimeout(100000);
+
+    test("wait for non-existent task exits correctly", async () => {
+        const client = await Client.create(processConfiguration());
+        const serverTaskWaiter = new ServerTaskWaiter(client, "Default");
+
+        const startTime = new Date();
+
+        await expect(() => {
+            return serverTaskWaiter.waitForServerTaskToComplete("ServerTasks-99999", 1000, 10000);
+        }).rejects.toThrow();
+
+        const endTime = new Date();
+        const timeDiff = endTime.getTime() - startTime.getTime();
+        expect(timeDiff).toBeLessThan(6000);
+    });
+});

src/features/serverTasks/serverTaskWaiter.ts

@@ -44,21 +44,23 @@ export class ServerTaskWaiter {
         }, timeout);
 
         while (!stop) {
-            if (pollingCallback) {
-                const taskDetails = await spaceServerTaskRepository.getDetails(serverTaskId);
-                pollingCallback(taskDetails);
+            try {
+                if (pollingCallback) {
+                    const taskDetails = await spaceServerTaskRepository.getDetails(serverTaskId);
+                    pollingCallback(taskDetails);
 
-                if (taskDetails.Task.IsCompleted) {
-                    clearTimeout(t);
-                    return taskDetails.Task;
-                }
-            } else {
-                const task = await spaceServerTaskRepository.getById(serverTaskId);
+                    if (taskDetails.Task.IsCompleted) {
+                        return taskDetails.Task;
+                    }
+                } else {
+                    const task = await spaceServerTaskRepository.getById(serverTaskId);
 
-                if (task.IsCompleted) {
-                    clearTimeout(t);
-                    return task;
+                    if (task.IsCompleted) {
+                        return task;
+                    }
                 }
+            } finally {
+                clearTimeout(t);
             }
 
             await sleep(statusCheckSleepCycle);