From f30b415fc9a14e2f5a76b4214594afac0b169522 Mon Sep 17 00:00:00 2001
From: Evan Simkowitz <esimkowitz@users.noreply.github.com>
Date: Sun, 29 Dec 2024 16:43:06 -0500
Subject: [PATCH] handle IDisposables to prevent memory leak

---
 frontend/app/view/term/termwrap.ts | 40 +++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/frontend/app/view/term/termwrap.ts b/frontend/app/view/term/termwrap.ts
index c7d724e5c..f6fc911c7 100644
--- a/frontend/app/view/term/termwrap.ts
+++ b/frontend/app/view/term/termwrap.ts
@@ -59,6 +59,7 @@ export class TermWrap {
     handleResize_debounced: () => void;
     hasResized: boolean;
     onSearchResultsDidChange?: (result: { resultIndex: number; resultCount: number }) => void;
+    toDispose: TermTypes.IDisposable[] = [];
 
     constructor(
         blockId: string,
@@ -98,9 +99,11 @@ export class TermWrap {
         );
         if (WebGLSupported && waveOptions.useWebGl) {
             const webglAddon = new WebglAddon();
-            webglAddon.onContextLoss(() => {
-                webglAddon.dispose();
-            });
+            this.toDispose.push(
+                webglAddon.onContextLoss(() => {
+                    webglAddon.dispose();
+                })
+            );
             this.terminal.loadAddon(webglAddon);
             if (!loggedWebGL) {
                 console.log("loaded webgl!");
@@ -142,20 +145,22 @@ export class TermWrap {
 
     async initTerminal() {
         const copyOnSelectAtom = getSettingsKeyAtom("term:copyonselect");
-        this.terminal.onData(this.handleTermData.bind(this));
-        this.terminal.onSelectionChange(
-            debounce(50, () => {
-                if (!globalStore.get(copyOnSelectAtom)) {
-                    return;
-                }
-                const selectedText = this.terminal.getSelection();
-                if (selectedText.length > 0) {
-                    navigator.clipboard.writeText(selectedText);
-                }
-            })
+        this.toDispose.push(this.terminal.onData(this.handleTermData.bind(this)));
+        this.toDispose.push(
+            this.terminal.onSelectionChange(
+                debounce(50, () => {
+                    if (!globalStore.get(copyOnSelectAtom)) {
+                        return;
+                    }
+                    const selectedText = this.terminal.getSelection();
+                    if (selectedText.length > 0) {
+                        navigator.clipboard.writeText(selectedText);
+                    }
+                })
+            )
         );
         if (this.onSearchResultsDidChange != null) {
-            this.searchAddon.onDidChangeResults(this.onSearchResultsDidChange.bind(this));
+            this.toDispose.push(this.searchAddon.onDidChangeResults(this.onSearchResultsDidChange.bind(this)));
         }
         this.mainFileSubject = getFileSubject(this.blockId, TermFileName);
         this.mainFileSubject.subscribe(this.handleNewFileSubjectData.bind(this));
@@ -169,6 +174,11 @@ export class TermWrap {
 
     dispose() {
         this.terminal.dispose();
+        this.toDispose.forEach((d) => {
+            try {
+                d.dispose();
+            } catch (_) {}
+        });
         this.mainFileSubject.release();
     }