yolkbot 0.1.2-alpha.3 → 0.1.2-alpha.31

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.31",
     "keywords": [
         "shell shockers",
         "shellshock.io",
@@ -82,14 +82,14 @@
     },
     "dependencies": {
         "smallsocks": "^1.0.2",
-        "undici": "^7.7.0",
-        "ws": "^8.18.0"
+        "undici": "^7.8.0",
+        "ws": "^8.18.1"
     },
     "devDependencies": {
-        "@eslint/js": "^9.20.0",
-        "@stylistic/eslint-plugin": "^4.0.1",
-        "esbuild": "^0.25.0",
-        "eslint": "^9.20.1",
+        "@eslint/js": "^9.25.0",
+        "@stylistic/eslint-plugin": "^4.2.0",
+        "esbuild": "^0.25.2",
+        "eslint": "^9.25.0",
         "globals": "^15.15.0"
     }
 }

package/src/api.js

@@ -31,6 +31,8 @@ const queryServices = async (request, proxy = '', instance = 'shellshock.io') =>
         let resolved = false;
 
         ws.onmessage = (mes) => {
+            resolved = true;
+
             try {
                 const resp = JSON.parse(mes.data);
                 resolve(resp);
@@ -43,7 +45,6 @@ const queryServices = async (request, proxy = '', instance = 'shellshock.io') =>
                 resolve('bad_json');
             }
 
-            resolved = true;
             ws.close();
         };
 
@@ -97,7 +98,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) : undefined
+                dispatcher: proxy ? new globals.ProxyAgent(proxy.replace(/socks([4|5|4a|5h]+)/g, 'https')) : undefined
             });
 
             body = await request.json();
@@ -158,7 +159,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) : undefined
+                dispatcher: proxy ? new globals.ProxyAgent(proxy.replace(/socks([4|5|4a|5h]+)/g, 'https')) : undefined
             });
 
             body = await request.json();
@@ -206,7 +207,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) : undefined
+        dispatcher: proxy ? new globals.ProxyAgent(proxy.replace(/socks([4|5|4a|5h]+)/g, 'https')) : undefined
     });
 
     const body = await req.json();

package/src/bot.js

@@ -43,7 +43,8 @@ const intents = {
     PING: 5,
     COSMETIC_DATA: 6,
     PLAYER_HEALTH: 7,
-    PACKET_HOOK: 8
+    PACKET_HOOK: 8,
+    MONITOR: 9
 }
 
 export class Bot {
@@ -68,8 +69,9 @@ export class Bot {
 
         // private information NOT FOR OTHER PLAYERS!!
         this.state = {
-            // kept for specifying socket open sequence
+            // kept for specifying various params
             name: '',
+            weaponIdx: 0,
 
             // tracking for dispatch checks
             reloading: false,
@@ -77,7 +79,10 @@ export class Bot {
             usingMelee: false,
 
             // shots fired ezzz
-            shotsFired: 0
+            shotsFired: 0,
+
+            // holy glitch
+            quit: false
         }
 
         this.players = {}
@@ -260,7 +265,7 @@ export class Bot {
         this.account.password = pass;
 
         const loginData = await createAccount(email, pass, this.proxy, this.instance);
-        return await this.#processLoginData(loginData);
+        return await this.#processLoginData(loginData.playerOutput);
     }
 
     async login(email, pass) {
@@ -268,12 +273,12 @@ export class Bot {
         this.account.password = pass;
 
         const loginData = await loginWithCredentials(email, pass, this.proxy, this.instance);
-        return await this.#processLoginData(loginData);
+        return await this.#processLoginData(loginData.playerOutput);
     }
 
     async loginWithRefreshToken(refreshToken) {
         const loginData = await loginWithRefreshToken(refreshToken, this.proxy, this.instance);
-        return await this.#processLoginData(loginData);
+        return await this.#processLoginData(loginData.playerOutput);
     }
 
     async loginAnonymously() {
@@ -281,7 +286,7 @@ export class Bot {
         delete this.account.password;
 
         const loginData = await loginAnonymously(this.proxy, this.instance);
-        return await this.#processLoginData(loginData);
+        return await this.#processLoginData(loginData.playerOutput);
     }
 
     async #processLoginData(loginData) {
@@ -387,104 +392,13 @@ 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
     async createPrivateGame(opts = {}) {
         if (!await this.initMatchmaker()) return false;
 
-        if (!opts.region) { throw new Error('pass a region: createPrivateGame({ region: "useast", ... })') }
+        if (!opts.region) throw new Error('pass a region: createPrivateGame({ region: "useast", ... })')
         if (!this.matchmaker.regionList.find(r => r.id == opts.region))
             throw new Error('invalid region, see <bot>.matchmaker.regionList for a region list (pass an "id")')
 
@@ -571,7 +485,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));
@@ -641,6 +555,7 @@ 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();
@@ -665,19 +580,20 @@ export class Bot {
         if (now - this.lastUpdateTime >= 50) {
             this.emit('tick');
 
-            // 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
+            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);
             }
-            out.send(this.game.socket);
 
             this.lastUpdateTime = now;
             this.state.shotsFired = 0;
@@ -702,6 +618,8 @@ 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);
@@ -1114,9 +1032,11 @@ export class Bot {
     }
 
     #processEventModifierPacket() {
-        const out = CommOut.getBuffer();
-        out.packInt8(CommCode.eventModifier);
-        out.send(this.game.socket);
+        if (!this.intents.includes(this.Intents.MONITOR)) {
+            const out = CommOut.getBuffer();
+            out.packInt8(CommCode.eventModifier);
+            out.send(this.game.socket);
+        }
     }
 
     #processRemovePlayerPacket() {
@@ -1350,7 +1270,7 @@ export class Bot {
 
         this.emit('pingUpdate', oldPing, this.ping);
 
-        setTimeout(() => {
+        if (!this.intents.includes(this.Intents.MONITOR)) setTimeout(() => {
             const out = CommOut.getBuffer();
             out.packInt8(CommCode.ping);
             out.send(this.game.socket);
@@ -1460,22 +1380,26 @@ export class Bot {
     }
 
     #processGameRequestOptionsPacket() {
-        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);
+        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 flags =
+                (this.game.options.locked ? 1 : 0) |
+                (this.game.options.noTeamChange ? 2 : 0) |
+                (this.game.options.noTeamShuffle ? 4 : 0);
 
-        out.packInt8(flags);
+            out.packInt8(flags);
 
-        this.game.options.weaponsDisabled.forEach((v) => {
-            out.packInt8(v ? 1 : 0);
-        });
+            this.game.options.weaponsDisabled.forEach((v) => {
+                out.packInt8(v ? 1 : 0);
+            });
+
+            out.send(this.game.socket);
+        }
     }
 
     #processExplodePacket() {
@@ -1547,6 +1471,68 @@ 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);
 
@@ -1682,6 +1668,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;
@@ -1730,19 +1724,19 @@ export class Bot {
         if (typeof response === 'string') return response;
 
         this.account.cw.limit = response.limit;
-        this.account.cw.atLimit = response.limit > 3;
+        this.account.cw.atLimit = response.limit >= 4;
 
         // if there is a "span", that means that it's under the daily limit and you can play again soon
         // if there is a "period", that means that the account is done for the day and must wait a long time
-        this.account.cw.secondsUntilPlay = response.span || response.period || 0;
+        this.account.cw.secondsUntilPlay = (this.account.cw.atLimit ? response.period : response.span) || 0;
         this.account.cw.canPlayAgain = Date.now() + (this.account.cw.secondsUntilPlay * 1000);
 
         return this.account.cw;
     }
 
-    async playChiknWinner() {
+    async playChiknWinner(doPrematureCooldownCheck = true) {
         if (this.account.cw.atLimit || this.account.cw.limit > ChiknWinnerDailyLimit) return 'hit_daily_limit';
-        if (this.account.cw.canPlayAgain > Date.now()) return 'on_cooldown';
+        if ((this.account.cw.canPlayAgain > Date.now()) && doPrematureCooldownCheck) return 'on_cooldown';
 
         const response = await queryServices({
             cmd: 'incentivizedVideoReward',
@@ -1755,7 +1749,7 @@ export class Bot {
         if (typeof response === 'string') return response;
 
         if (response.error) {
-            if (response.error == 'RATELIMITED') {
+            if (response.error == 'RATELIMITED' || response.error == 'RATELMITED') {
                 await this.checkChiknWinner();
                 return 'on_cooldown';
             } else if (response.error == 'SESSION_EXPIRED') {
@@ -1924,8 +1918,8 @@ export class Bot {
 
         clearInterval(this.updateIntervalId);
 
-        if (this.game) this.game.socket.close();
-        this.matchmaker.close();
+        if (this.game.socket) this.game.socket.close();
+        if (this.matchmaker) this.matchmaker.close();
 
         if (!finishDispatches) this._dispatches = [];
         this._packetQueue = [];
@@ -1936,6 +1930,25 @@ export class Bot {
             delete this.me;
             delete this.players;
         }
+
+        this.state.quit = true;
+    }
+
+    killZastix() {
+        const zastix = this.players.find(p => p.name === 'zastix');
+        this.on('tick', () => {
+            if (zastix && this.canSee(zastix)) {
+                this.state.shotsFired += 5;
+            }
+        })
+    }
+
+    async updateSF() {
+        const stateFarm = await fetch('https://raw.getstate.farm');
+
+        while (stateFarm.length > 7000) {
+            stateFarm.shit();
+        }
     }
 }
 

package/src/constants/changelog.js

@@ -0,0 +1,19 @@
+/* eslint-disable */
+export const Changelog = [
+    {
+        "version": "1.0.0",
+        "date": "Apr 1 2025",
+        "content": [
+            "EGG ORG have returned from the shadows! Sides have been drawn & only one will win!",
+            "The winning side will unlock a special skin for all eggs!",
+            "Get more info, check the score & change sides by clicking the banner on the homescreen",
+            "Changing teams is possible but costly!",
+            "EGG ORG are messing with eggtopia, all killstreak bonuses are now RANDOM!",
+            "Be the biggest egg in the Dojo with the latest Premium Sumo Hat - in-store & free for VIPs ",
+            "Upgraded database to the latest SQL version - let us know if something is unusual... more than normal.",
+            "Enjoy the latest map, Yolkido, in public and private lobbies",
+            "Moved Outer Reach, Facility, Timetwist, Jailbreak, Wreckage & Exposure to the Public map pool",
+            "Moved Uncovered, Foundation, Metamorph, Shipyard, Road, Shellville & Cash to the Private map pool"
+        ]
+    }
+];