@quakejs/master 1.0.14 → 1.0.16

package/master-client.js

@@ -15,52 +15,59 @@ class MasterClient extends MasterBase {
     let resendTimeout;
 
     if (this.#master) {
-      this.#master.close();
-      this.#master = null;
+      try {
+        this.#master.close();
+      } catch (e) {
+        console.error(e);
+      } finally {
+        this.#master = null;
+      }
     }
 
     this.#master = new WebTransport(`${host}:${port}`);
 
-    const writer = this.#master.datagrams.writable.getWriter();
-    const reader = this.#master.datagrams.readable.getReader();
+    (async () => {
+      try {
+        await this.#master.ready;
 
-    this.#master.ready.then(async () => {
-      while (true) {
-        const { done, value } = await reader.read();
+        const writer = this.#master.datagrams.writable.getWriter();
+        const reader = this.#master.datagrams.readable.getReader();
 
-        clearTimeout(resendTimeout);
+        /* send until a response is received */
+        const send = () => {
+          writer.write(this.encode('subscribe'));
 
-        if (done) {
-          break;
-        }
+          resendTimeout = setTimeout(send, 1000);
+        };
 
-        console.log(`${host}:${port} ---> ${this.pretty(value)}`);
+        send();
 
-        const msg = this.decode(value);
+        /* read responses */
+        while (true) {
+          const { done, value } = await reader.read();
 
-        if (msg && msg.type === 'getserversResponse') {
-          for (const server of msg.servers) {
-            this.#onserver(server.addr, server.port);
-          }
-        }
-      }
-    }).catch((e) => {
-      console.error(`Stream error, connection to ${host}:${port} lost`, e);
-    });
+          clearTimeout(resendTimeout);
 
-    this.#master.closed.catch((e) => {
-      console.error(`Stream error, connection to ${host}:${port} lost`, e);
-      this.#master = null;
-    });
+          if (done) {
+            break;
+          }
 
-    /* send until a response is received */
-    const send = () => {
-      writer.write(this.encode('subscribe'));
+          console.log(`${host}:${port} ---> ${this.pretty(value)}`);
 
-      resendTimeout = setTimeout(send, 1000);
-    };
+          const msg = this.decode(value);
 
-    send();
+          if (msg && msg.type === 'getserversResponse') {
+            for (const server of msg.servers) {
+              this.#onserver(server.addr, server.port);
+            }
+          }
+        }
+      } catch (e) {
+        console.error(`Stream error, connection to ${host}:${port} lost`, e);
+      } finally {
+        this.#master = null;
+      }
+    })();
   }
 
   async getinfo (addr, port) {

package/master-server.js

@@ -23,8 +23,6 @@ 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 () {
@@ -34,11 +32,10 @@ class MasterServer extends MasterBase {
       const delta = now - server.lastUpdate;
 
       if (delta > MasterServer.#SERVER_PRUNE_INTERVAL) {
+        console.log(`server ${server.addr}:${server.port} timed out, pruning`);
         this.#removeServer(id);
       }
     }
-
-    console.log(`pruning complete, ${Object.keys(this.#servers).length} servers and ${this.#clients.length} clients remaining`);
   }
 
   #sendServers (session, servers) {
@@ -138,92 +135,98 @@ class MasterServer extends MasterBase {
       return;
     }
 
-    this.#h3.ready.then(async () => {
-      const sessionStream = await this.#h3.sessionStream('/');
-      const sessionReader = sessionStream.getReader();
-
-      console.log(`listening on ${this.#h3.host}:${this.#h3.port}`);
-
-      while (true) {
-        const { done, value } = await sessionReader.read();
-        const session = value;
-
-        if (done) {
-          break;
-        }
-
-        session.ready.then(async () => {
-          const writer = session.datagrams.createWritable().getWriter();
-          const reader = session.datagrams.readable.getReader();
-          const [addr, port] = session.peerAddress.split(':');
-          let first = true;
+    this.#listening = true;
 
-          session.addr = addr;
-          session.port = port;
+    this.#h3.startServer();
 
-          session.write = (data) => {
-            writer.write(data);
-          };
+    this.#pruneInterval = setInterval(this.#pruneServers.bind(this), MasterServer.#SERVER_PRUNE_INTERVAL);
 
-          while (true) {
-            const { done, value } = await reader.read();
+    (async () => {
+      try {
+        await this.#h3.ready;
 
-            if (done) {
-              return;
-            }
+        const sessionStream = await this.#h3.sessionStream('/');
+        const sessionReader = sessionStream.getReader();
 
-            console.log(`${session.addr}:${session.port} ---> ${this.pretty(value)}`);
+        console.log(`listening on ${this.#h3.host}:${this.#h3.port}`);
 
-            if (first) {
-              const str = String.fromCharCode.apply(null, value);
+        while (true) {
+          const { done, value } = await sessionReader.read();
+          const session = value;
 
-              first = false;
+          if (done) {
+            break;
+          }
 
-              if (str.startsWith('\xff\xff\xff\xffport')) {
-                this.#handleEmscriptenPort(session, str.substr(9));
-                continue;
+          (async () => {
+            try {
+              await session.ready;
+
+              const writer = session.datagrams.createWritable().getWriter();
+              const reader = session.datagrams.readable.getReader();
+              const [addr, port] = session.peerAddress.split(':');
+              let first = true;
+
+              session.addr = addr;
+              session.port = port;
+
+              session.write = (data) => {
+                writer.write(data);
+              };
+
+              while (true) {
+                const { done, value } = await reader.read();
+
+                if (done) {
+                  return;
+                }
+
+                console.log(`${session.addr}:${session.port} ---> ${this.pretty(value)}`);
+
+                if (first) {
+                  const str = String.fromCharCode.apply(null, value);
+
+                  first = false;
+
+                  if (str.startsWith('\xff\xff\xff\xffport')) {
+                    this.#handleEmscriptenPort(session, str.substr(9));
+                    continue;
+                  }
+                }
+
+                const msg = this.decode(value);
+
+                switch (msg?.type) {
+                  case 'heartbeat':
+                    this.#handleHeartbeat(session, msg);
+                    break;
+                  case 'subscribe':
+                    this.#handleSubscribe(session, msg);
+                    break;
+                  case 'getservers':
+                    this.#handleGetServers(session, msg);
+                    break;
+                  case 'infoResponse':
+                    this.#handleInfoResponse(session, msg);
+                    break;
+                  default:
+                    console.error('Invalid message');
+                    break;
+                }
               }
-            }
 
-            const msg = this.decode(value);
-
-            switch (msg?.type) {
-              case 'heartbeat':
-                this.#handleHeartbeat(session, msg);
-                break;
-              case 'subscribe':
-                this.#handleSubscribe(session, msg);
-                break;
-              case 'getservers':
-                this.#handleGetServers(session, msg);
-                break;
-              case 'infoResponse':
-                this.#handleInfoResponse(session, msg);
-                break;
-              default:
-                console.error('Invalid message');
-                break;
+              console.log(`Client ${session.addr}:${session.port} disconnected`);
+            } catch (e) {
+              console.error(`Client ${session.addr}:${session.port} disconnected due to error`, e);
+            } finally {
+              this.#removeClient(session);
             }
-          }
-        }).catch((e) => {
-          console.error(`Stream error, peer ${session.addr}:${session.port}`, e);
-        });
-
-        session.closed.catch((e) => {
-          console.error(`Stream error, peer ${session.addr}:${session.port}`, e);
-        }).finally(() => {
-          this.#removeClient(session);
-        });
+          })();
+        }
+      } catch (e) {
+        console.error(e);
       }
-    }).catch((e) => {
-      console.error(e);
-    });
-
-    this.#h3.startServer();
-
-    this.#pruneInterval = setInterval(this.#pruneServers.bind(this), MasterServer.#SERVER_PRUNE_INTERVAL);
-
-    this.#listening = true;
+    })();
   }
 }
 

package/package.json

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