Use async emitter for sockets stuff

Author: goto-bus-stop

src/SocketServer.js

@@ -512,12 +512,12 @@ class SocketServer {
   /**
    * Get a LostConnection for a user, if one exists.
    *
-   * @param {User} user
+   * @param {string} sessionID
    * @private
    */
-  getLostConnection(user) {
+  getLostConnection(sessionID) {
     return this.#connections.find((connection) => (
-      connection instanceof LostConnection && connection.user.id === user.id
+      connection instanceof LostConnection && connection.sessionID === sessionID
     ));
   }
 
@@ -534,7 +534,7 @@ class SocketServer {
     connection.on('close', () => {
       this.remove(connection);
     });
-    connection.on('authenticate', async (user, sessionID, lastEventID) => {
+    connection.on('authenticate', async ({ user, sessionID, lastEventID }) => {
       const isReconnect = await connection.isReconnect(sessionID);
       this.#logger.info({ userId: user.id, isReconnect, lastEventID }, 'authenticated socket');
       if (isReconnect) {
@@ -575,11 +575,7 @@ class SocketServer {
     });
     connection.on(
       'command',
-      /**
-       * @param {string} command
-       * @param {import('type-fest').JsonValue} data
-       */
-      (command, data) => {
+      ({ command, data }) => {
         this.#logger.trace({ userId: user.id, command, data }, 'command');
         if (has(this.#clientActions, command)) {
           // Ignore incorrect input

src/sockets/AuthedConnection.js

@@ -1,4 +1,4 @@
-import EventEmitter from 'node:events';
+import Emittery from 'emittery';
 import Ultron from 'ultron';
 import WebSocket from 'ws';
 import sjson from 'secure-json-parse';
@@ -8,7 +8,13 @@ import { fromJson, json } from '../utils/sqlite.js';
 const PING_TIMEOUT = 5_000;
 const DEAD_TIMEOUT = 30_000;
 
-class AuthedConnection extends EventEmitter {
+/**
+ * @augments {Emittery<{
+ *   command: { command: string, data: import('type-fest').JsonValue },
+ *   close: { banned: boolean, lastEventID: string | null },
+ * }>}
+ */
+class AuthedConnection extends Emittery {
   #events;
 
   #logger;
@@ -20,6 +26,8 @@ class AuthedConnection extends EventEmitter {
   /** @type {string|null} */
   #lastEventID = null;
 
+  banned = false;
+
   /**
    * @param {import('../Uwave.js').default} uw
    * @param {import('ws').WebSocket} socket
@@ -97,7 +105,7 @@ class AuthedConnection extends EventEmitter {
     this.#lastMessage = Date.now();
     const { command, data } = sjson.safeParse(raw) ?? {};
     if (command) {
-      this.emit('command', command, data);
+      this.emit('command', { command, data });
     }
   }
 

src/sockets/GuestConnection.js

@@ -1,12 +1,18 @@
-import EventEmitter from 'node:events';
+import Emittery from 'emittery';
 import { ulid } from 'ulid';
 import Ultron from 'ultron';
 import WebSocket from 'ws';
 
 const PING_TIMEOUT = 5_000;
 const DEAD_TIMEOUT = 30_000;
 
-class GuestConnection extends EventEmitter {
+/**
+ * @augments {Emittery<{
+ *  close: undefined,
+ *  authenticate: { user: import('../schema.js').User, sessionID: string, lastEventID: string | null }
+ * }>}
+ */
+class GuestConnection extends Emittery {
   #events;
 
   #logger;
@@ -69,7 +75,7 @@ class GuestConnection extends EventEmitter {
       throw new Error('You have been banned');
     }
 
-    this.emit('authenticate', userModel, sessionID, null);
+    await this.emit('authenticate', { user: userModel, sessionID, lastEventID: null });
   }
 
   /**

src/sockets/LostConnection.js

@@ -1,6 +1,9 @@
-import EventEmitter from 'node:events';
+import Emittery from 'emittery';
 
-class LostConnection extends EventEmitter {
+/**
+ * @augments {Emittery<{ close: undefined }>}
+ */
+class LostConnection extends Emittery {
   #logger;
 
   #expiresAt;