yolkbot 0.1.2-alpha.3 → 0.1.2-alpha.4

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "yolkbot",
     "description": "create a shell shockers bot in under 10 lines.",
-    "version": "0.1.2-alpha.3",
+    "version": "0.1.2-alpha.4",
     "keywords": [
         "shell shockers",
         "shellshock.io",

package/src/bot.js

@@ -387,97 +387,6 @@ export class Bot {
         });
     }
 
-    async #onGameMesssage(msg) {
-        CommIn.init(msg.data);
-
-        let out;
-        const cmd = CommIn.unPackInt8U();
-
-        switch (cmd) {
-            case CommCode.socketReady:
-                out = CommOut.getBuffer();
-                out.packInt8(CommCode.joinGame);
-
-                out.packString(this.state.name); // name
-                out.packString(this.game.raw.uuid); // game id
-
-                out.packInt8(0); // hidebadge
-                out.packInt8(0); // weapon choice
-
-                out.packInt32(this.account.session); // session int
-                out.packString(this.account.firebaseId); // firebase id
-                out.packString(this.account.sessionId); // session id
-
-                out.send(this.game.socket);
-                break;
-
-            case CommCode.gameJoined: {
-                this.me.id = CommIn.unPackInt8U();
-                // console.log("My id is:", this.me.id);
-                this.me.team = CommIn.unPackInt8U();
-                // console.log("My team is:", this.me.team);
-                this.game.gameModeId = CommIn.unPackInt8U(); // aka gameType
-                this.game.gameMode = GameModesById[this.game.gameModeId];
-                // console.log("Gametype:", this.game.gameMode, this.game.gameModeId);
-                this.game.mapIdx = CommIn.unPackInt8U();
-                this.game.map = Maps[this.game.mapIdx];
-                if (this.intents.includes(this.Intents.PATHFINDING)) {
-                    this.game.map.raw = await this.#fetchMap(this.game.map.filename, this.game.map.hash);
-                    this.pathing.nodeList = new NodeList(this.game.map.raw);
-                    if (this.game.gameModeId === GameModes.kotc) this.#initKotcZones();
-                }
-                // console.log("Map:", this.game.map);
-                this.game.playerLimit = CommIn.unPackInt8U();
-                // console.log("Player limit:", this.game.playerLimit);
-                this.game.isGameOwner = CommIn.unPackInt8U() == 1;
-                // console.log("Is game owner:", this.game.isGameOwner);
-                this.game.isPrivate = CommIn.unPackInt8U() == 1;
-                // console.log("Is private game:", this.game.isPrivate);
-
-                // console.log('Successfully joined game.');
-                this.state.joinedGame = true;
-                this.lastDeathTime = Date.now();
-
-                const out = CommOut.getBuffer();
-                out.packInt8(CommCode.clientReady);
-                out.send(this.game.socket);
-
-                this.game.socket.onmessage = (msg) => this._packetQueue.push(msg.data);
-
-                if (this.autoUpdate)
-                    this.updateIntervalId = setInterval(() => this.update(), this.updateInterval);
-
-                if (this.intents.includes(this.Intents.PING)) {
-                    const out = CommOut.getBuffer();
-                    out.packInt8(CommCode.ping);
-                    out.send(this.game.socket);
-                    this.lastPingTime = Date.now();
-                }
-                break;
-            }
-
-            case CommCode.eventModifier:
-                // console.log("Echoed eventModifier"); // why the fuck do you need to do this
-                out = CommOut.getBuffer();
-                out.packInt8(CommCode.eventModifier);
-                out.send(this.game.socket);
-                break;
-
-            case CommCode.requestGameOptions:
-                this.#processGameRequestOptionsPacket();
-                break;
-
-            default:
-                try {
-                    const inferredCode = Object.entries(CommCode).filter(([, v]) => v == cmd)[0][0];
-                    console.error('onGameMessage: Received but did not handle a:', inferredCode);
-                    // packet could potentially not exist, then [0][0] will error
-                } catch {
-                    console.error('onGameMessage: Unexpected packet received during startup: ' + cmd);
-                }
-        }
-    }
-
     // region - a region id ('useast', 'germany', etc)
     // mode - a mode name that corresponds to a GameMode id
     // map - the name of a map
@@ -571,7 +480,7 @@ export class Bot {
             this.game.socket.onerror = null;
         }
 
-        this.game.socket.onmessage = this.#onGameMesssage.bind(this);
+        this.game.socket.onmessage = (msg) => this.processPacket(msg.data);
 
         this.game.socket.onclose = (e) => {
             // console.log('Game socket closed:', e.code, Object.entries(CloseCode).filter(([, v]) => v == e.code));
@@ -1547,6 +1456,60 @@ export class Bot {
         }
     }
 
+    #processSocketReadyPacket() {
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.joinGame);
+
+        out.packString(this.state.name);
+        out.packString(this.game.raw.uuid);
+
+        out.packInt8(0); // hidebadge
+        out.packInt8(0); // weapon idx
+
+        out.packInt32(this.account.session);
+        out.packString(this.account.firebaseId);
+        out.packString(this.account.sessionId);
+
+        out.send(this.game.socket);
+    }
+
+    async #processGameJoinedPacket() {
+        this.me.id = CommIn.unPackInt8U();
+        this.me.team = CommIn.unPackInt8U();
+        this.game.gameModeId = CommIn.unPackInt8U(); // aka gameType
+        this.game.gameMode = GameModesById[this.game.gameModeId];
+        this.game.mapIdx = CommIn.unPackInt8U();
+        this.game.map = Maps[this.game.mapIdx];
+        if (this.intents.includes(this.Intents.PATHFINDING)) {
+            this.game.map.raw = await this.#fetchMap(this.game.map.filename, this.game.map.hash);
+            this.pathing.nodeList = new NodeList(this.game.map.raw);
+            if (this.game.gameModeId === GameModes.kotc) this.#initKotcZones();
+        }
+        this.game.playerLimit = CommIn.unPackInt8U();
+        this.game.isGameOwner = CommIn.unPackInt8U() == 1;
+        this.game.isPrivate = CommIn.unPackInt8U() == 1;
+
+        // console.log('Successfully joined game.');
+        this.state.joinedGame = true;
+        this.lastDeathTime = Date.now();
+
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.clientReady);
+        out.send(this.game.socket);
+
+        this.game.socket.onmessage = (msg) => this._packetQueue.push(msg.data);
+
+        if (this.autoUpdate)
+            this.updateIntervalId = setInterval(() => this.update(), this.updateInterval);
+
+        if (this.intents.includes(this.Intents.PING)) {
+            const out = CommOut.getBuffer();
+            out.packInt8(CommCode.ping);
+            out.send(this.game.socket);
+            this.lastPingTime = Date.now();
+        }
+    }
+
     processPacket(packet) {
         CommIn.init(packet);
 
@@ -1682,6 +1645,14 @@ export class Bot {
                     this.#processChallengeCompletePacket();
                     break;
 
+                case CommCode.socketReady:
+                    this.#processSocketReadyPacket();
+                    break;
+
+                case CommCode.gameJoined:
+                    this.#processGameJoinedPacket();
+                    break;
+
                 case CommCode.gameAction:
                     this.#processGameActionPacket();
                     break;