fix(core): dont close client on promise rejections

ulixee · Oct 8, 2020 · 37f1169 · 37f1169
1 parent d2aa22f
commit 37f1169
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/client/index.ts b/client/index.ts
@@ -76,7 +76,7 @@ export function SecretAgentClientGenerator(
     process.on('unhandledRejection', async (error: Error) => {
       // keep core node behavior intact
       process.stderr.write(`${error.stack}\n`);
-      await SecretAgent.shutdown(error);
+      await SecretAgent.recordUnhandledError(error);
     });
   }
 

diff --git a/client/lib/CoreClient.ts b/client/lib/CoreClient.ts
@@ -42,11 +42,11 @@ export default class CoreClient {
     return coreTabs;
   }
 
-  public async shutdown(error?: Error): Promise<void> {
+  public async shutdown(fatalError?: Error): Promise<void> {
     const tabIds = Object.keys(this.tabsById);
     this.commandQueue.clearPending();
-    if (tabIds.length || error) {
-      await this.commandQueue.run('disconnect', tabIds, error);
+    if (tabIds.length || fatalError) {
+      await this.commandQueue.run('disconnect', tabIds, fatalError);
     }
     for (const tabId of tabIds) {
       delete this.tabsById[tabId];

diff --git a/core/index.ts b/core/index.ts
@@ -290,8 +290,8 @@ export default class Core implements ICore {
     });
   }
 
-  public static async disconnect(tabIds?: string[], clientError?: Error) {
-    if (clientError) this.logUnhandledError(clientError);
+  public static async disconnect(tabIds?: string[], fatalError?: Error) {
+    if (fatalError) this.logUnhandledError(fatalError, true);
     return this.startQueue.run(async () => {
       const promises: Promise<void>[] = [];
       for (const key of tabIds ?? Object.keys(Core.byTabId)) {
@@ -310,13 +310,17 @@ export default class Core implements ICore {
     });
   }
 
-  public static logUnhandledError(clientError: Error) {
-    log.error('UnhandledError', { clientError, sessionId: null });
+  public static logUnhandledError(clientError: Error, fatalError = false) {
+    if (fatalError) {
+      log.error('UnhandledError(fatal)', { clientError, sessionId: null });
+    } else {
+      log.error('UnhandledErrorOrRejection', { clientError, sessionId: null });
+    }
   }
 
-  public static async shutdown(fatalError?: Error, force = false) {
+  public static async shutdown(force = false) {
     // runs own queue, don't put inside this loop
-    await Core.disconnect(null, fatalError);
+    await Core.disconnect();
     return this.startQueue.run(async () => {
       log.info('Core.shutdown');
       clearTimeout(Core.autoShutdownTimer);
@@ -338,12 +342,13 @@ export default class Core implements ICore {
 
   public static registerExceptionHandlers() {
     process.on('uncaughtException', async (error: Error) => {
-      await Core.shutdown(error);
+      await Core.logUnhandledError(error, true);
+      await Core.shutdown();
       process.exit(1);
     });
 
     process.on('unhandledRejection', async (error: Error) => {
-      await Core.shutdown(error);
+      await Core.logUnhandledError(error, false);
     });
   }
 

diff --git a/session-state/test/api.test.ts b/session-state/test/api.test.ts
@@ -99,7 +99,7 @@ describe('basic Replay API tests', () => {
     expect(paintEvents[0]).toHaveLength(1);
     expect(paintEvents[1]).toHaveLength(13);
 
-    await Core.shutdown(null, true);
+    await Core.shutdown(true);
     api.destroy();
   }, 20e3);
 });
diff --git a/testing/helpers.ts b/testing/helpers.ts
@@ -328,7 +328,7 @@ export async function afterEach() {
 
 export async function afterAll() {
   await closeAll(true);
-  await Core.shutdown(null, true);
+  await Core.shutdown(true);
 }
 
 async function closeAll(isFinal = false) {