From 491ff1e58a56c541b6ef717487368bf02318285e Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Sat, 23 Oct 2021 17:03:43 -0400
Subject: [PATCH] Be more paranoid about cleaning up listeners

---
 packages/skin-database/shooter.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/skin-database/shooter.js b/packages/skin-database/shooter.js
index 9ba28103..33c6e690 100644
--- a/packages/skin-database/shooter.js
+++ b/packages/skin-database/shooter.js
@@ -32,6 +32,7 @@ export default class Shooter {
     this._browser = await puppeteer.launch();
     this._page = await this._browser.newPage();
     this._page.setViewport({ width: 275, height: 116 * 3 });
+
     this._page.on("console", (consoleMessage) => {
       if (
         consoleMessage.text() ===
@@ -42,10 +43,6 @@ export default class Shooter {
 
       this._log("page log:", consoleMessage.text());
     });
-    this._page.on("error", (e) => {
-      this._log(`Page error: ${e.toString()}`);
-    });
-
     const url = `${this._url}/?screenshot=1`;
     await this._page.goto(url);
     await this._page.waitForSelector("#main-window", { timeout: 2000 });
@@ -147,8 +144,13 @@ export default class Shooter {
 
   async dispose() {
     await this._ensureInitialized();
+    this._page.removeAllListeners();
     await this._page.close();
+    this._browser.removeAllListeners();
     await this._browser.close();
+
+    this._page = null;
+    this._browser = null;
     this._initialized = false;
   }
 }