fix: empty null rejection on early hero terminate

ulixee · May 30, 2022 · 6159a79 · 6159a79
1 parent 65ed29d
commit 6159a79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/client/lib/CoreCommandQueue.ts b/client/lib/CoreCommandQueue.ts
@@ -186,7 +186,7 @@ export default class CoreCommandQueue {
     this.flushOnTimeout = null;
 
     if (this.connection.disconnectPromise) {
-      return Promise.resolve(null);
+      throw new DisconnectedError(this.connection.transport.host);
     }
     for (const arg of args) {
       if (Array.isArray(arg)) {

diff --git a/client/lib/Hero.ts b/client/lib/Hero.ts
@@ -562,6 +562,7 @@ export default class Hero extends AwaitedEventTarget<{
 
     return this.#coreSessionPromise.then(coreSession => {
       if (coreSession instanceof CoreSession) return coreSession;
+      if (coreSession === null) return null;
       throw coreSession;
     });
   }