@quakejs/master 1.0.18 → 1.0.20

package/master-client.js

@@ -17,19 +17,14 @@ class MasterClient extends MasterBase {
     session.closed.catch(() => {});
 
     (async () => {
-      try {
-        const sessionClosed = session.closed.then(
-          () => ({ done: true, value: null }),
-          (err) => { throw err; }
-        );
+      let resendTimeout;
 
+      try {
         await session.ready;
 
+        /* send until a response is received */
         const writer = session.datagrams.writable.getWriter();
-        const reader = session.datagrams.readable.getReader();
-        let resendTimeout;
 
-        /* send until a response is received */
         const send = () => {
           writer.write(this.encode('subscribe')).catch(() => {});
 
@@ -39,21 +34,12 @@ class MasterClient extends MasterBase {
         send();
 
         /* read responses */
-        while (true) {
-          const { done, value } = await Promise.race([
-            reader.read(),
-            sessionClosed
-          ]);
-
+        for await (const packet of session.datagrams.readable) {
           clearTimeout(resendTimeout);
 
-          if (done) {
-            break;
-          }
-
-          console.log(`${host}:${port} ---> ${this.pretty(value)}`);
+          console.log(`${host}:${port} ---> ${this.pretty(packet)}`);
 
-          const msg = this.decode(value);
+          const msg = this.decode(packet);
 
           if (msg && msg.type === 'getserversResponse') {
             for (const server of msg.servers) {
@@ -62,7 +48,7 @@ class MasterClient extends MasterBase {
           }
         }
 
-        console.log(`Disconnected from master server`);
+        console.log('Disconnected from master server');
       } catch (e) {
         console.error('Disconnected from master server due to error', e);
       } finally {
@@ -80,18 +66,13 @@ class MasterClient extends MasterBase {
     session.closed.catch(() => {});
 
     try {
-      const sessionClosed = session.closed.then(
-        () => ({ done: true, value: null }),
-        (err) => { throw err; }
-      );
+      let begin;
 
       await session.ready;
 
+      /* send request multiple times until something is read back */
       const writer = session.datagrams.writable.getWriter();
-      const reader = session.datagrams.readable.getReader();
-      let begin;
 
-      /* send request multiple times until something is read back */
       const send = () => {
         begin = performance.now();
 
@@ -103,28 +84,23 @@ class MasterClient extends MasterBase {
       send();
 
       /* read response */
-      const { done, value } = await Promise.race([
-        reader.read(),
-        sessionClosed
-      ]);
-
-      clearTimeout(resendTimeout);
+      for await (const packet of session.datagrams.readable) {
+        clearTimeout(resendTimeout);
 
-      if (done) {
-        throw new Error('stream closed');
-      }
+        console.log(`${addr}:${port} ---> ${this.pretty(packet)}`);
 
-      console.log(`${addr}:${port} ---> ${this.pretty(value)}`);
+        const msg = this.decode(packet);
 
-      const msg = this.decode(value);
+        if (!msg || msg.type !== 'infoResponse') {
+          throw new Error('invalid response type');
+        }
 
-      if (!msg || msg.type !== 'infoResponse') {
-        throw new Error('invalid response type');
-      }
+        msg.info.ping = Math.min((performance.now() - begin) >>> 0, 999);
 
-      msg.info.ping = Math.min((performance.now() - begin) >>> 0, 999);
+        res = msg.info;
 
-      res = msg.info;
+        break;
+      }
     } catch (e) {
       console.error('getinfo failed', e);
       throw e;
@@ -146,18 +122,13 @@ class MasterClient extends MasterBase {
     session.closed.catch(() => {});
 
     try {
-      const sessionClosed = session.closed.then(
-        () => ({ done: true, value: null }),
-        (err) => { throw err; }
-      );
+      let begin;
 
       await session.ready;
 
+      /* send request multiple times until something is read back */
       const writer = session.datagrams.writable.getWriter();
-      const reader = session.datagrams.readable.getReader();
-      let begin;
 
-      /* send request multiple times until something is read back */
       const send = () => {
         begin = performance.now();
 
@@ -169,28 +140,23 @@ class MasterClient extends MasterBase {
       send();
 
       /* read response */
-      const { done, value } = await Promise.race([
-        reader.read(),
-        sessionClosed
-      ]);
-
-      clearTimeout(resendTimeout);
+      for await (const packet of session.datagrams.readable) {
+        clearTimeout(resendTimeout);
 
-      if (done) {
-        throw new Error('stream closed');
-      }
+        console.log(`${addr}:${port} ---> ${this.pretty(packet)}`);
 
-      console.log(`${addr}:${port} ---> ${this.pretty(value)}`);
+        const msg = this.decode(packet);
 
-      const msg = this.decode(value);
+        if (!msg || msg.type !== 'statusResponse') {
+          throw new Error('invalid response type');
+        }
 
-      if (!msg || msg.type !== 'statusResponse') {
-        throw new Error('invalid response type');
-      }
+        msg.info.ping = Math.min((performance.now() - begin) >>> 0, 999);
 
-      msg.info.ping = Math.min((performance.now() - begin) >>> 0, 999);
+        res = { info: msg.info, players: msg.players };
 
-      res = { info: msg.info, players: msg.players };
+        break;
+      }
     } catch (e) {
       console.error('getstatus failed', e);
       throw e;

package/master-server.js

@@ -145,34 +145,20 @@ class MasterServer extends MasterBase {
       try {
         await this.#h3.ready;
 
-        const sessionStream = await this.#h3.sessionStream('/');
-        const sessionReader = sessionStream.getReader();
+        const stream = await this.#h3.sessionStream('/');
 
         console.log(`listening on ${this.#h3.host}:${this.#h3.port}`);
 
-        while (true) {
-          const { done, value } = await sessionReader.read();
-          const session = value;
-
-          if (done) {
-            break;
-          }
-
+        for await (const session of stream) {
           /* prevent unhandled rejections before main loop */
           session.ready.catch(() => {});
           session.closed.catch(() => {});
 
           (async () => {
             try {
-              const sessionClosed = session.closed.then(
-                () => ({ done: true, value: null }),
-                (err) => { throw err; }
-              );
-
               await session.ready;
 
               const writer = session.datagrams.writable.getWriter();
-              const reader = session.datagrams.readable.getReader();
               const [addr, port] = session.peerAddress.split(':');
               let first = true;
 
@@ -183,20 +169,11 @@ class MasterServer extends MasterBase {
                 writer.write(data).catch(e => {});
               };
 
-              while (true) {
-                const { done, value } = await Promise.race([
-                  reader.read(),
-                  sessionClosed
-                ]);
-
-                if (done) {
-                  break;
-                }
-
-                console.log(`${session.addr}:${session.port} ---> ${this.pretty(value)}`);
+              for await (const packet of session.datagrams.readable) {
+                console.log(`${session.addr}:${session.port} ---> ${this.pretty(packet)}`);
 
                 if (first) {
-                  const str = String.fromCharCode.apply(null, value);
+                  const str = String.fromCharCode.apply(null, packet);
 
                   first = false;
 
@@ -206,7 +183,7 @@ class MasterServer extends MasterBase {
                   }
                 }
 
-                const msg = this.decode(value);
+                const msg = this.decode(packet);
 
                 switch (msg?.type) {
                   case 'heartbeat':
@@ -227,8 +204,9 @@ class MasterServer extends MasterBase {
                 }
               }
             } catch (e) {
-              console.error(`Client ${session.addr}:${session.port} terminated`, e);
+              console.error(`Session ${session.addr}:${session.port} terminated`, e);
             } finally {
+              console.log(`Removing client ${session.addr}:${session.port}`);
               this.#removeClient(session);
             }
           })();

package/package.json

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