@quakejs/master 1.0.4 → 1.0.6

package/master-base.js

@@ -93,7 +93,7 @@ class Heartbeat extends Message {
   }
 
   toString () {
-    return `${this.type}`;
+    return `${this.type} ${this.game}`;
   }
 }
 

package/master-server.js

@@ -21,6 +21,32 @@ class MasterServer extends MasterBase {
     this.#h3 = new Http3Server(opts);
   }
 
+  #removeServer (id) {
+    delete this.#servers[id];
+
+    console.log(`${id} timed out, ${Object.keys(this.#servers).length} server(s) currently registered`);
+  }
+
+  #pruneServers () {
+    const now = Date.now();
+
+    for (const [id, server] of Object.entries(this.#servers)) {
+      const delta = now - server.lastUpdate;
+
+      if (delta > MasterServer.#SERVER_PRUNE_INTERVAL) {
+        this.#removeServer(id);
+      }
+    }
+  }
+
+  #sendServers (session, servers) {
+    const res = this.encode('getserversResponse', { servers });
+
+    console.log(`${session.addr}:${session.port} <--- ${this.pretty(res)}`);
+
+    session.write(res);
+  }
+
   #removeClient (session) {
     const idx = this.#clients.indexOf(session);
 
@@ -63,47 +89,21 @@ class MasterServer extends MasterBase {
     }
   }
 
-  #removeServer (id) {
-    delete this.#servers[id];
-
-    console.log(`${id} timed out, ${Object.keys(this.#servers).length} server(s) currently registered`);
-  }
-
-  #pruneServers () {
-    const now = Date.now();
-
-    for (const [id, server] of Object.entries(this.#servers)) {
-      const delta = now - server.lastUpdate;
-
-      if (delta > MasterServer.#SERVER_PRUNE_INTERVAL) {
-        this.#removeServer(id);
-      }
-    }
-  }
-
-  #sendServers (session, servers) {
-    const msg = this.encode('getserversResponse', { servers });
-
-    console.log(`${session.addr}:${session.port} <--- ${this.pretty(msg)}`);
-
-    session.write(msg);
-  }
-
-  #handleInfoResponse (session, info) {
-    if (info.challenge !== session.lastChallenge) {
-      console.error(`Invalid challenge ${info.challenge}, expected ${session.lastChallenge}`);
+  #handleInfoResponse (session, msg) {
+    if (msg.info.challenge !== session.lastChallenge) {
+      console.error(`Invalid challenge ${msg.info.challenge}, expected ${session.lastChallenge}`);
       return;
     }
 
-    this.#updateServer(session.addr, session.port, info);
+    this.#updateServer(session.addr, session.port, msg.info);
   }
 
-  #handleGetServers (session, req) {
-    /* FIXME honor req.protocol and req.keywords */
+  #handleGetServers (session, msg) {
+    /* FIXME honor protocol and keywords */
     this.#sendServers(session, Object.values(this.#servers));
   }
 
-  #handleSubscribe (session) {
+  #handleSubscribe (session, msg) {
     if (!this.#addClient(session)) {
       return;
     }
@@ -112,17 +112,17 @@ class MasterServer extends MasterBase {
     this.#sendServers(session, Object.values(this.#servers));
   }
 
-  #handleHeartbeat (session, game) {
-    if (game !== 'QuakeArena-1') {
-      console.log(`Invalid game ${game}, expected QuakeArena-1`);
+  #handleHeartbeat (session, msg) {
+    if (msg.game !== 'QuakeArena-1') {
+      console.log(`Invalid game ${msg.game}, expected QuakeArena-1`);
       return;
     }
 
-    const msg = this.encode('getinfo');
+    const req = this.encode('getinfo');
 
-    console.log(`${session.addr}:${session.port} <--- ${this.pretty(msg)}`);
+    console.log(`${session.addr}:${session.port} <--- ${this.pretty(req)}`);
 
-    session.lastChallenge = msg.challenge;
+    session.lastChallenge = req.challenge;
 
     session.write(msg);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quakejs/master",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "type": "module",
   "main": "index.js",
   "bin": {

package/server.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 import crypto from 'node:crypto';
 import fs from 'node:fs/promises';
 import util from 'node:util';