fix(core): add a onQueueEmpty callback

nrwl · Mar 10, 2023 · 78c23e3 · 78c23e3
1 parent 2c3c5ff
commit 78c23e3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/packages/nx/src/daemon/client/client.ts b/packages/nx/src/daemon/client/client.ts
@@ -88,6 +88,9 @@ export class DaemonClient {
   reset() {
     this.socketMessenger = null;
     this.queue = new PromisedBasedQueue();
+    this.queue.onQueueEmpty(() => {
+      this.socketMessenger.close();
+    });
     this.currentMessage = null;
     this.currentResolve = null;
     this.currentReject = null;

diff --git a/packages/nx/src/utils/promised-based-queue.ts b/packages/nx/src/utils/promised-based-queue.ts
@@ -2,6 +2,8 @@ export class PromisedBasedQueue {
   private counter = 0;
   private promise = Promise.resolve(null);
 
+  private emptyCallback: () => void = null;
+
   sendToQueue(fn: () => Promise<any>): Promise<any> {
     this.counter++;
     let res, rej;
@@ -14,19 +16,19 @@ export class PromisedBasedQueue {
       .then(async () => {
         try {
           res(await fn());
-          this.counter--;
+          this._promiseResolved();
         } catch (e) {
           rej(e);
-          this.counter--;
+          this._promiseResolved();
         }
       })
       .catch(async () => {
         try {
           res(await fn());
-          this.counter--;
+          this._promiseResolved();
         } catch (e) {
           rej(e);
-          this.counter--;
+          this._promiseResolved();
         }
       });
     return r;
@@ -35,4 +37,15 @@ export class PromisedBasedQueue {
   isEmpty() {
     return this.counter === 0;
   }
+
+  onQueueEmpty(callback: () => void): void {
+    this.emptyCallback = callback;
+  }
+
+  private _promiseResolved() {
+    this.counter--;
+    if (this.isEmpty()) {
+      this.emptyCallback();
+    }
+  }
 }