yolkbot 0.1.2-alpha.17 → 0.1.2-alpha.3

package/package.json

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

package/src/api.js

@@ -97,7 +97,7 @@ async function loginWithCredentials(email, password, proxy = '', instance = 'she
                     'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web',
                     'x-firebase-locale': 'en'
                 },
-                dispatcher: proxy ? new globals.ProxyAgent(proxy.replace(/socks([4|5|4a|5h]+)/g, 'https')) : undefined
+                dispatcher: proxy ? new globals.ProxyAgent(proxy) : undefined
             });
 
             body = await request.json();
@@ -158,7 +158,7 @@ async function loginWithRefreshToken(refreshToken, proxy = '', instance = 'shell
                     'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web',
                     'x-firebase-locale': 'en'
                 },
-                dispatcher: proxy ? new globals.ProxyAgent(proxy.replace(/socks([4|5|4a|5h]+)/g, 'https')) : undefined
+                dispatcher: proxy ? new globals.ProxyAgent(proxy) : undefined
             });
 
             body = await request.json();
@@ -206,7 +206,7 @@ async function loginAnonymously(proxy = '', instance = 'shellshock.io') {
             'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web',
             'x-firebase-locale': 'en'
         },
-        dispatcher: proxy ? new globals.ProxyAgent(proxy.replace(/socks([4|5|4a|5h]+)/g, 'https')) : undefined
+        dispatcher: proxy ? new globals.ProxyAgent(proxy) : undefined
     });
 
     const body = await req.json();

package/src/bot.js

@@ -43,8 +43,7 @@ const intents = {
     PING: 5,
     COSMETIC_DATA: 6,
     PLAYER_HEALTH: 7,
-    PACKET_HOOK: 8,
-    MONITOR: 9
+    PACKET_HOOK: 8
 }
 
 export class Bot {
@@ -69,9 +68,8 @@ export class Bot {
 
         // private information NOT FOR OTHER PLAYERS!!
         this.state = {
-            // kept for specifying various params
+            // kept for specifying socket open sequence
             name: '',
-            weaponIdx: 0,
 
             // tracking for dispatch checks
             reloading: false,
@@ -79,10 +77,7 @@ export class Bot {
             usingMelee: false,
 
             // shots fired ezzz
-            shotsFired: 0,
-
-            // holy glitch
-            quit: false
+            shotsFired: 0
         }
 
         this.players = {}
@@ -392,6 +387,97 @@ 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
@@ -485,7 +571,7 @@ export class Bot {
             this.game.socket.onerror = null;
         }
 
-        this.game.socket.onmessage = (msg) => this.processPacket(msg.data);
+        this.game.socket.onmessage = this.#onGameMesssage.bind(this);
 
         this.game.socket.onclose = (e) => {
             // console.log('Game socket closed:', e.code, Object.entries(CloseCode).filter(([, v]) => v == e.code));
@@ -555,7 +641,6 @@ export class Bot {
 
     update() {
         if (!this.state.joinedGame) throw new Error('You cannot call update() if the bot is not in a game.');
-        if (this.state.quit) return;
 
         // process pathfinding
         if (this.pathing.followingPath && this.intents.includes(this.Intents.PATHFINDING)) this.#processPathfinding();
@@ -580,20 +665,19 @@ export class Bot {
         if (now - this.lastUpdateTime >= 50) {
             this.emit('tick');
 
-            if (!this.intents.includes(this.Intents.MONITOR)) {
-                const out = CommOut.getBuffer();
-                out.packInt8(CommCode.syncMe);
-                out.packInt8(Math.random() * 128 | 0); // stateIdx
-                out.packInt8(this.me.serverStateIdx); // serverStateIdx
-                for (let i = 0; i < 3; i++) {
-                    out.packInt8(this.controlKeys); // controlkeys
-                    out.packInt8(this.state.shotsFired); // shots fired
-                    out.packRadU(this.me.view.yaw); // yaw
-                    out.packRad(this.me.view.pitch); // pitch
-                    out.packInt8(100); // fixes commcode issues, does nothing
-                }
-                out.send(this.game.socket);
+            // Send out update packet
+            const out = CommOut.getBuffer();
+            out.packInt8(CommCode.syncMe);
+            out.packInt8(Math.random() * 128 | 0); // stateIdx
+            out.packInt8(this.me.serverStateIdx); // serverStateIdx
+            for (let i = 0; i < 3; i++) {
+                out.packInt8(this.controlKeys); // controlkeys
+                out.packInt8(this.state.shotsFired); // shots fired
+                out.packRadU(this.me.view.yaw); // yaw
+                out.packRad(this.me.view.pitch); // pitch
+                out.packInt8(100); // fixes commcode issues, does nothing
             }
+            out.send(this.game.socket);
 
             this.lastUpdateTime = now;
             this.state.shotsFired = 0;
@@ -618,8 +702,6 @@ export class Bot {
     #mustBeInstant = ['authFail', 'banned'];
 
     emit(event, ...args) {
-        if (this.state.quit) return;
-
         if (this._hooks[event]) {
             for (const cb of this._hooks[event]) {
                 if (this.#mustBeInstant.includes(event)) cb(...args);
@@ -1032,11 +1114,9 @@ export class Bot {
     }
 
     #processEventModifierPacket() {
-        if (!this.intents.includes(this.Intents.MONITOR)) {
-            const out = CommOut.getBuffer();
-            out.packInt8(CommCode.eventModifier);
-            out.send(this.game.socket);
-        }
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.eventModifier);
+        out.send(this.game.socket);
     }
 
     #processRemovePlayerPacket() {
@@ -1270,7 +1350,7 @@ export class Bot {
 
         this.emit('pingUpdate', oldPing, this.ping);
 
-        if (!this.intents.includes(this.Intents.MONITOR)) setTimeout(() => {
+        setTimeout(() => {
             const out = CommOut.getBuffer();
             out.packInt8(CommCode.ping);
             out.send(this.game.socket);
@@ -1380,26 +1460,22 @@ export class Bot {
     }
 
     #processGameRequestOptionsPacket() {
-        if (!this.intents.includes(this.Intents.MONITOR)) {
-            const out = CommOut.getBuffer();
-            out.packInt8(CommCode.gameOptions);
-            out.packInt8(this.game.options.gravity * 4);
-            out.packInt8(this.game.options.damage * 4);
-            out.packInt8(this.game.options.healthRegen * 4);
-
-            const flags =
-                (this.game.options.locked ? 1 : 0) |
-                (this.game.options.noTeamChange ? 2 : 0) |
-                (this.game.options.noTeamShuffle ? 4 : 0);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.gameOptions);
+        out.packInt8(this.game.options.gravity * 4);
+        out.packInt8(this.game.options.damage * 4);
+        out.packInt8(this.game.options.healthRegen * 4);
 
-            out.packInt8(flags);
+        const flags =
+            (this.game.options.locked ? 1 : 0) |
+            (this.game.options.noTeamChange ? 2 : 0) |
+            (this.game.options.noTeamShuffle ? 4 : 0);
 
-            this.game.options.weaponsDisabled.forEach((v) => {
-                out.packInt8(v ? 1 : 0);
-            });
+        out.packInt8(flags);
 
-            out.send(this.game.socket);
-        }
+        this.game.options.weaponsDisabled.forEach((v) => {
+            out.packInt8(v ? 1 : 0);
+        });
     }
 
     #processExplodePacket() {
@@ -1471,68 +1547,6 @@ export class Bot {
         }
     }
 
-    #processSocketReadyPacket() {
-        if (!this.intents.includes(this.Intents.MONITOR)) {
-            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(this.state.weaponIdx || 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();
-
-        if (!this.intents.includes(this.Intents.MONITOR)) {
-            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)) {
-            this.lastPingTime = Date.now();
-
-            if (!this.intents.includes(this.Intents.MONITOR)) {
-                const out = CommOut.getBuffer();
-                out.packInt8(CommCode.ping);
-                out.send(this.game.socket);
-            }
-        }
-    }
-
     processPacket(packet) {
         CommIn.init(packet);
 
@@ -1668,14 +1682,6 @@ export class Bot {
                     this.#processChallengeCompletePacket();
                     break;
 
-                case CommCode.socketReady:
-                    this.#processSocketReadyPacket();
-                    break;
-
-                case CommCode.gameJoined:
-                    this.#processGameJoinedPacket();
-                    break;
-
                 case CommCode.gameAction:
                     this.#processGameActionPacket();
                     break;
@@ -1749,7 +1755,7 @@ export class Bot {
         if (typeof response === 'string') return response;
 
         if (response.error) {
-            if (response.error == 'RATELIMITED' || response.error == 'RATELMITED') {
+            if (response.error == 'RATELIMITED') {
                 await this.checkChiknWinner();
                 return 'on_cooldown';
             } else if (response.error == 'SESSION_EXPIRED') {
@@ -1930,8 +1936,6 @@ export class Bot {
             delete this.me;
             delete this.players;
         }
-
-        this.state.quit = true;
     }
 }
 

package/src/dispatches/SaveLoadoutDispatch.js

@@ -70,12 +70,10 @@ export class SaveLoadoutDispatch {
     }
 
     execute(bot) {
-        if (bot.me && this.changes.classIdx && this.changes.classIdx !== bot.me.selectedGun) {
+        if (this.changes.classIdx && this.changes.classIdx !== bot.me.selectedGun) {
             bot.me.weapons[0] = new GunList[this.changes.classIdx]();
         }
 
-        bot.state.weaponIdx = this.changes.classIdx || bot.state.weaponIdx;
-
         const loadout = {
             ...bot.account.loadout,
             ...this.changes
@@ -91,7 +89,7 @@ export class SaveLoadoutDispatch {
 
         bot.account.loadout = loadout;
 
-        if (bot.me) saveLoadout.then(() => {
+        saveLoadout.then(() => {
             if (bot.state.joinedGame) {
                 const out = CommOut.getBuffer();
                 out.packInt8(CommCode.changeCharacter);

package/src/types/bot.d.ts

@@ -66,8 +66,6 @@ export interface Account {
     firebaseId: string;
     sessionId: string;
     session: string;
-    email: string;
-    password: string;
     cw: ChiknWinnerStatus;
     loadout: {
         hatId: number | null;
@@ -172,12 +170,10 @@ export interface Pathing {
 
 export interface BotState {
     name: string;
-    weaponIdx: number;
     reloading: boolean;
     swappingGun: boolean;
     usingMelee: boolean;
     shotsFired: number;
-    quit: boolean;
 }
 
 export interface ChiknWinnerResponse {
@@ -194,8 +190,7 @@ type intents = {
     PING: 5,
     COSMETIC_DATA: 6,
     PLAYER_HEALTH: 7,
-    PACKET_HOOK: 8,
-    MONITOR: 9
+    PACKET_HOOK: 8
 }
 
 export class Bot {
@@ -236,7 +231,7 @@ export class Bot {
     update(): void;
 
     canSee(player: GamePlayer): boolean;
-    getBestTarget(customFilter?: (player: GamePlayer) => boolean): GamePlayer | undefined;
+    getBestTarget(customFilter: (player: GamePlayer) => boolean): GamePlayer | undefined;
 
     onAny(cb: Function): void;