refactor: events

app/net/client/client.js

@@ -1,33 +1,18 @@
 import {CLIENT_LATENCY} from '@/util/constants.js';
+import EventEmitter from '@/util/event-emitter.js';
 
 export default class Client {
   constructor() {
-    this.listeners = {};
+    this.emitter = new EventEmitter();
   }
   accept(packet) {
-    const listeners = this.listeners[packet.type];
+    this.emitter.invoke(packet.type, packet.payload);
-    if (!listeners) {
-      return;
-    }
-    for (const i in listeners) {
-      listeners[i](packet.payload);
-    }
   }
   addPacketListener(type, listener) {
-    if (!this.listeners[type]) {
+    this.emitter.addListener(type, listener);
-      this.listeners[type] = [];
-    }
-    this.listeners[type].push(listener);
   }
   removePacketListener(type, listener) {
-    const listeners = this.listeners[type];
+    this.emitter.removeListener(type, listener);
-    if (!listeners) {
-      return;
-    }
-    const index = listeners.indexOf(listener);
-    if (-1 !== index) {
-      listeners.splice(index, 1);
-    }
   }
   send(packet) {
     if (CLIENT_LATENCY > 0) {

app/net/server/server.js

@@ -1,38 +1,23 @@
 import {SERVER_LATENCY} from '@/util/constants.js';
+import EventEmitter from '@/util/event-emitter.js';
 
 const textDecoder = new TextDecoder();
 
 export default class Server {
   constructor() {
-    this.listeners = {};
+    this.emitter = new EventEmitter();
   }
   accept(connection, packet) {
-    const listeners = this.listeners[packet.type];
+    this.emitter.invoke(packet.type, connection, packet.payload);
-    if (!listeners) {
-      return;
-    }
-    for (const i in listeners) {
-      listeners[i](connection, packet.payload);
-    }
   }
   addPacketListener(type, listener) {
-    if (!this.listeners[type]) {
+    this.emitter.addListener(type, listener);
-      this.listeners[type] = [];
-    }
-    this.listeners[type].push(listener);
   }
   async readJson(path) {
     return JSON.parse(textDecoder.decode(await this.readData(path)));
   }
   removePacketListener(type, listener) {
-    const listeners = this.listeners[type];
+    this.emitter.removeListener(type, listener);
-    if (!listeners) {
-      return;
-    }
-    const index = listeners.indexOf(listener);
-    if (-1 !== index) {
-      listeners.splice(index, 1);
-    }
   }
   send(connection, packet) {
     if (SERVER_LATENCY > 0) {

app/react/components/ui.jsx

@@ -5,6 +5,7 @@ import {useDebug} from '@/react/context/debug.js';
 import {useEcs, useEcsTick} from '@/react/context/ecs.js';
 import {useMainEntity} from '@/react/context/main-entity.js';
 import {RESOLUTION} from '@/util/constants.js';
+import EventEmitter from '@/util/event-emitter.js';
 
 import addKeyListener from './add-key-listener.js';
 import ClientEcs from './client-ecs.js';
@@ -21,31 +22,7 @@ function emptySlots() {
   return Array(10).fill(undefined);
 }
 
-const devEventsChannel = {
+const devEventsChannel = new EventEmitter();
-  $$listeners: {},
-  addListener(type, listener) {
-    if (!this.$$listeners[type]) {
-      this.$$listeners[type] = new Set();
-    }
-    this.$$listeners[type].add(listener);
-  },
-  invoke(type, payload) {
-    const listeners = this.$$listeners[type];
-    if (!listeners) {
-      return;
-    }
-    for (const listener of listeners) {
-      listener(payload);
-    }
-  },
-  removeListener(type, listener) {
-    const listeners = this.$$listeners[type];
-    if (!listeners) {
-      return;
-    }
-    listeners.delete(listener);
-  },
-};
 
 function Ui({disconnected}) {
   // Key input.
@@ -261,9 +238,7 @@ function Ui({disconnected}) {
       return;
     }
     await ecs.apply(payload.ecs);
-    for (const listener of client.listeners[':Ecs'] ?? []) {
+    client.emitter.invoke(':Ecs', payload.ecs);
-      listener(payload.ecs);
-    }
   }, [ecs]);
   useEcsTick((payload) => {
     let localMainEntity = mainEntity;

app/util/event-emitter.js

@@ -0,0 +1,30 @@
+import fastCall from './fast-call.js';
+
+export default class EventEmitter {
+  $$listeners = {};
+  addListener(type, listener) {
+    if (!this.$$listeners[type]) {
+      this.$$listeners[type] = new Set();
+    }
+    this.$$listeners[type].add(listener);
+  }
+  invoke(type, ...args) {
+    const listeners = this.$$listeners[type];
+    if (!listeners) {
+      return;
+    }
+    for (const listener of listeners) {
+      fastCall(listener, undefined, args);
+    }
+  }
+  removeListener(type, listener) {
+    const listeners = this.$$listeners[type];
+    if (!listeners) {
+      return;
+    }
+    listeners.delete(listener);
+    if (0 === listeners.size) {
+      delete this.$$listeners[type];
+    }
+  }
+}

app/util/fast-call.js

@@ -1,4 +1,4 @@
-export default function(fn, holder, args) {
+export default function fastCall(fn, holder, args) {
   if (holder) {
     const {name} = fn;
     if ('object' === typeof holder && name in holder && holder[name] === fn) {