src/snek/static/event-handler.js

@@ -3,15 +3,8 @@ export class EventHandler {
     this.subscribers = {};
   }
 
-  addEventListener(type, handler, { once = false } = {}) {
+  addEventListener(type, handler) {
     if (!this.subscribers[type]) this.subscribers[type] = [];
-    if (once) {
-      const originalHandler = handler;
-      handler = (...args) => {
-        originalHandler(...args);
-        this.removeEventListener(type, handler);
-      };
-    }
     this.subscribers[type].push(handler);
   }
 
@@ -19,15 +12,4 @@ export class EventHandler {
     if (this.subscribers[type])
       this.subscribers[type].forEach((handler) => handler(...data));
   }
-
-  removeEventListener(type, handler) {
-    if (!this.subscribers[type]) return;
-    this.subscribers[type] = this.subscribers[type].filter(
-      (h) => h !== handler
-    );
-
-    if (this.subscribers[type].length === 0) {
-      delete this.subscribers[type];
-    }
-  }
 }

src/snek/static/socket.js

@@ -142,9 +142,10 @@ export class Socket extends EventHandler {
       method,
       args,
     };
+    const me = this;
     return new Promise((resolve) => {
-      this.addEventListener(call.callId, (data) => resolve(data), { once: true});
-      this.sendJson(call);
+      me.addEventListener(call.callId, (data) => resolve(data));
+      me.sendJson(call);
     });
   }
 }