@quakejs/master 1.0.8 → 1.0.10

package/master-base.js

@@ -1,26 +1,3 @@
-function generateChallenge () {
-  const CHALLENGE_CHARS = [
-    '!', '#', '$', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', '<', '=', '>', '?', '@',
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-    '[', ']', '^', '_', '`',
-    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '{', '|', '}', '~'
-  ];
-  const CHALLENGE_MIN_LENGTH = 9;
-  const CHALLENGE_MAX_LENGTH = 12;
-
-  let challenge = '';
-  let length = CHALLENGE_MIN_LENGTH - 1;
-
-  length += parseInt(Math.random() * (CHALLENGE_MAX_LENGTH - CHALLENGE_MIN_LENGTH + 1), 10);
-
-  for (let i = 0; i < length; i++) {
-    challenge += CHALLENGE_CHARS[Math.floor(Math.random() * CHALLENGE_CHARS.length)];
-  }
-
-  return challenge;
-}
-
 function parseInfoString (str) {
   const info = {};
   let i = 0;
@@ -112,14 +89,24 @@ class Subscribe extends Message {
 class GetInfo extends Message {
   static id = 'getinfo';
 
-  constructor (msg) {
+  constructor (from) {
     super();
 
-    this.challenge = generateChallenge();
+    if (typeof from === 'string') {
+      this.challenge = from.substring(12);
+    } else {
+      this.challenge = from.challenge;
+    }
   }
 
   toString () {
-    return `${this.type} ${this.challenge}`;
+    let str = this.type;
+
+    if (this.challenge) {
+      str += ` ${this.challenge}`;
+    }
+
+    return str;
   }
 }
 
@@ -328,6 +315,29 @@ class MasterBase {
 
     return out;
   }
+
+  generateChallenge () {
+    const CHALLENGE_CHARS = [
+      '!', '#', '$', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', '<', '=', '>', '?', '@',
+      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+      '[', ']', '^', '_', '`',
+      'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+      '{', '|', '}', '~'
+    ];
+    const CHALLENGE_MIN_LENGTH = 9;
+    const CHALLENGE_MAX_LENGTH = 12;
+
+    let challenge = '';
+    let length = CHALLENGE_MIN_LENGTH - 1;
+
+    length += parseInt(Math.random() * (CHALLENGE_MAX_LENGTH - CHALLENGE_MIN_LENGTH + 1), 10);
+
+    for (let i = 0; i < length; i++) {
+      challenge += CHALLENGE_CHARS[Math.floor(Math.random() * CHALLENGE_CHARS.length)];
+    }
+
+    return challenge;
+  }
 }
 
 export default MasterBase;

package/master-server.js

@@ -118,11 +118,11 @@ class MasterServer extends MasterBase {
       return;
     }
 
-    const req = this.encode('getinfo');
+    session.lastChallenge = this.generateChallenge();
 
-    console.log(`${session.addr}:${session.port} <--- ${this.pretty(req)}`);
+    const req = this.encode('getinfo', { challenge: session.lastChallenge });
 
-    session.lastChallenge = req.challenge;
+    console.log(`${session.addr}:${session.port} <--- ${this.pretty(req)}`);
 
     session.write(req);
   }
@@ -199,7 +199,7 @@ class MasterServer extends MasterBase {
                 this.#handleInfoResponse(session, msg);
                 break;
               default:
-                console.error('invalid message');
+                console.error('Invalid message');
                 break;
             }
           }

package/package.json

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