@quakejs/master 1.0.19 → 1.0.20

package/master-client.js

@@ -17,13 +17,14 @@ class MasterClient extends MasterBase {
     session.closed.catch(() => {});
 
     (async () => {
+      let resendTimeout;
+
       try {
         await session.ready;
 
+        /* send until a response is received */
         const writer = session.datagrams.writable.getWriter();
-        let resendTimeout;
 
-        /* send until a response is received */
         const send = () => {
           writer.write(this.encode('subscribe')).catch(() => {});
 
@@ -33,12 +34,12 @@ class MasterClient extends MasterBase {
         send();
 
         /* read responses */
-        for await (const value of session.datagrams.readable) {
+        for await (const packet of session.datagrams.readable) {
           clearTimeout(resendTimeout);
 
-          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) {
@@ -47,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 {
@@ -70,10 +71,11 @@ class MasterClient extends MasterBase {
       await session.ready;
 
       /* send request multiple times until something is read back */
+      const writer = session.datagrams.writable.getWriter();
+
       const send = () => {
         begin = performance.now();
 
-        const writer = session.datagrams.writable.getWriter();
         writer.write(this.encode('getinfo')).catch(() => {});
 
         resendTimeout = setTimeout(send, 3000);
@@ -82,12 +84,12 @@ class MasterClient extends MasterBase {
       send();
 
       /* read response */
-      for await (const value of session.datagrams.readable) {
+      for await (const packet of session.datagrams.readable) {
         clearTimeout(resendTimeout);
 
-        console.log(`${addr}:${port} ---> ${this.pretty(value)}`);
+        console.log(`${addr}:${port} ---> ${this.pretty(packet)}`);
 
-        const msg = this.decode(value);
+        const msg = this.decode(packet);
 
         if (!msg || msg.type !== 'infoResponse') {
           throw new Error('invalid response type');
@@ -125,10 +127,11 @@ class MasterClient extends MasterBase {
       await session.ready;
 
       /* send request multiple times until something is read back */
+      const writer = session.datagrams.writable.getWriter();
+
       const send = () => {
         begin = performance.now();
 
-        const writer = session.datagrams.writable.getWriter();
         writer.write(this.encode('getstatus')).catch(() => {});
 
         resendTimeout = setTimeout(send, 3000);
@@ -137,12 +140,12 @@ class MasterClient extends MasterBase {
       send();
 
       /* read response */
-      for await (const value of session.datagrams.readable) {
+      for await (const packet of session.datagrams.readable) {
         clearTimeout(resendTimeout);
 
-        console.log(`${addr}:${port} ---> ${this.pretty(value)}`);
+        console.log(`${addr}:${port} ---> ${this.pretty(packet)}`);
 
-        const msg = this.decode(value);
+        const msg = this.decode(packet);
 
         if (!msg || msg.type !== 'statusResponse') {
           throw new Error('invalid response type');

package/master-server.js

@@ -145,11 +145,11 @@ class MasterServer extends MasterBase {
       try {
         await this.#h3.ready;
 
-        const sessionStream = await this.#h3.sessionStream('/');
+        const stream = await this.#h3.sessionStream('/');
 
         console.log(`listening on ${this.#h3.host}:${this.#h3.port}`);
 
-        for await (const session of sessionStream) {
+        for await (const session of stream) {
           /* prevent unhandled rejections before main loop */
           session.ready.catch(() => {});
           session.closed.catch(() => {});
@@ -169,11 +169,11 @@ class MasterServer extends MasterBase {
                 writer.write(data).catch(e => {});
               };
 
-              for await (const value of session.datagrams.readable) {
-                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;
 
@@ -183,7 +183,7 @@ class MasterServer extends MasterBase {
                   }
                 }
 
-                const msg = this.decode(value);
+                const msg = this.decode(packet);
 
                 switch (msg?.type) {
                   case 'heartbeat':

package/package.json

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