fix(client): correctly catch some canceled promise

ulixee · Feb 8, 2021 · 1d5906f · 1d5906f
1 parent cc717e0
commit 1d5906f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/client/lib/CoreCommandQueue.ts b/client/lib/CoreCommandQueue.ts
@@ -50,12 +50,7 @@ export default class CoreCommandQueue {
   }
 
   public clearPending(): void {
-    while (this.items.length) {
-      const next = this.items.shift();
-      const cancel = new CanceledPromiseError(`Canceling pending ${next.command} command`);
-      cancel.stack = next.stack;
-      next.reject();
-    }
+    this.items.length = 0;
   }
 
   // PRIVATE

diff --git a/commons/Queue.ts b/commons/Queue.ts
@@ -30,7 +30,8 @@ export default class Queue {
 
   public stop(): void {
     while (this.queue.length) {
-      const next = this.queue.pop();
+      const next = this.queue.shift();
+      if (!next) continue;
 
       this.reject(next, new CanceledPromiseError('Canceling Queue Item'));
     }

diff --git a/core/server/ConnectionToClient.ts b/core/server/ConnectionToClient.ts
@@ -10,6 +10,7 @@ import ICoreEventPayload from '@secret-agent/core-interfaces/ICoreEventPayload';
 import IWaitForOptions from '@secret-agent/core-interfaces/IWaitForOptions';
 import IAgentMeta from '@secret-agent/core-interfaces/IAgentMeta';
 import Log from '@secret-agent/commons/Logger';
+import { CanceledPromiseError } from '@secret-agent/commons/interfaces/IPendingWaitEvent';
 import Session from '../lib/Session';
 import Tab from '../lib/Tab';
 import GlobalPool from '../lib/GlobalPool';
@@ -38,6 +39,8 @@ export default class ConnectionToClient extends TypedEventEmitter<{
     // json converts args to null which breaks undefined argument handlers
     const args = payload.args.map(x => (x === null ? undefined : x));
 
+    const session = meta?.sessionId ? Session.get(meta.sessionId) : undefined;
+
     let data: any;
     let isError = false;
     try {
@@ -58,6 +61,10 @@ export default class ConnectionToClient extends TypedEventEmitter<{
         }
       }
     } catch (error) {
+      // if we're closing, don't emit errors
+      if ((this.isClosing || session?.isClosing) && error instanceof CanceledPromiseError) {
+        return;
+      }
       isError = true;
       data =
         error instanceof Error
@@ -69,10 +76,7 @@ export default class ConnectionToClient extends TypedEventEmitter<{
           : new Error(`Unknown error occurred ${error}`);
     }
 
-    let commandId: number;
-    if (meta?.sessionId) {
-      commandId = Session.get(meta.sessionId)?.sessionState?.lastCommand?.id;
-    }
+    const commandId = session?.sessionState?.lastCommand?.id;
 
     const response: ICoreResponsePayload = {
       responseId: messageId,