From 5adf962eb5b7fe6f07141dec3d137c42ff2c811d Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Thu, 21 Jun 2018 10:39:52 +1000
Subject: [PATCH] Dispose of attach addon event listeners

---
 src/addons/attach/Interfaces.ts |  6 +++++-
 src/addons/attach/attach.ts     | 22 ++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/addons/attach/Interfaces.ts b/src/addons/attach/Interfaces.ts
index ab809af9..ab5846f5 100644
--- a/src/addons/attach/Interfaces.ts
+++ b/src/addons/attach/Interfaces.ts
@@ -5,9 +5,13 @@
  * Implements the attach method, that attaches the terminal to a WebSocket stream.
  */
 
-import { Terminal } from 'xterm';
+import { Terminal, IDisposable } from 'xterm';
 
 export interface IAttachAddonTerminal extends Terminal {
+  _core: {
+    register<T extends IDisposable>(d: T): void;
+  };
+
   __socket?: WebSocket;
   __attachSocketBuffer?: string;
 
diff --git a/src/addons/attach/attach.ts b/src/addons/attach/attach.ts
index e6d92b56..e94c0b46 100644
--- a/src/addons/attach/attach.ts
+++ b/src/addons/attach/attach.ts
@@ -5,7 +5,7 @@
  * Implements the attach method, that attaches the terminal to a WebSocket stream.
  */
 
-import { Terminal } from 'xterm';
+import { Terminal, IDisposable } from 'xterm';
 import { IAttachAddonTerminal } from './Interfaces';
 
 /**
@@ -87,14 +87,28 @@ export function attach(term: Terminal, socket: WebSocket, bidirectional: boolean
     socket.send(data);
   };
 
-  socket.addEventListener('message', addonTerminal.__getMessage);
+  addonTerminal._core.register(addSocketListener(socket, 'message', addonTerminal.__getMessage));
 
   if (bidirectional) {
     addonTerminal.on('data', addonTerminal.__sendData);
   }
 
-  socket.addEventListener('close', () => detach(addonTerminal, socket));
-  socket.addEventListener('error', () => detach(addonTerminal, socket));
+  addonTerminal._core.register(addSocketListener(socket, 'close', () => detach(addonTerminal, socket)));
+  addonTerminal._core.register(addSocketListener(socket, 'error', () => detach(addonTerminal, socket)));
+}
+
+function addSocketListener(socket: WebSocket, type: string, handler: (this: WebSocket, ev: Event) => any): IDisposable {
+  socket.addEventListener(type, handler);
+  return {
+    dispose: () => {
+      if (!handler) {
+        // Already disposed
+        return;
+      }
+      socket.removeEventListener(type, handler);
+      handler = null;
+    }
+  };
 }
 
 /**