yolkbot 0.1.0 → 0.1.1-alpha.11

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "yolkbot",
     "description": "create a shell shockers (self) bot in under 10 lines.",
-    "version": "0.1.0",
+    "version": "0.1.1-alpha.11",
     "keywords": [
         "shell shockers",
         "shellshock.io",
@@ -35,10 +35,6 @@
             "import": "./src/api.js",
             "types": "./src/types/api.d.ts"
         },
-        "./bot": {
-            "import": "./src/bot.js",
-            "types": "./src/types/bot.d.ts"
-        },
         "./browser": "./build/browser.js",
         "./comm": "./src/comm/index.js",
         "./matchmaker": {
@@ -48,6 +44,18 @@
         "./packets": "./src/packet.js",
         "./pathing/*": "./src/pathing/*.js",
         "./pathing/*.js": "./src/pathing/*.js",
+        "./bot": {
+            "import": "./src/bot.js",
+            "types": "./src/types/bot.d.ts"
+        },
+        "./bot/*": {
+            "import": "./src/bot/*.js",
+            "types": "./src/types/bot/*.d.ts"
+        },
+        "./bot/*.js": {
+            "import": "./src/bot/*.js",
+            "types": "./src/types/bot/*.d.ts"
+        },
         "./constants": {
             "import": "./src/constants/index.js",
             "types": "./src/types/constants/index.d.ts"

package/src/api.js

@@ -2,10 +2,10 @@ import axios from 'axios';
 
 import yolkws from './socket.js';
 
-import { FirebaseKey, IsBrowser, UserAgent } from '#constants';
+import { FirebaseKey, ProxiesEnabled, UserAgent } from '#constants';
 
 let SocksProxyAgent;
-if (!IsBrowser) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
+if (ProxiesEnabled) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
 
 const queryServices = async (request, proxy = '', instance = 'shellshock.io') => {
     let ws;
@@ -91,7 +91,7 @@ async function loginWithCredentials(email, password, prox = '', instance = 'shel
                     'user-agent': UserAgent,
                     'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
                 },
-                httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
+                httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
             })
             body = request.data
             token = body.idToken;
@@ -143,7 +143,7 @@ async function loginWithRefreshToken(refreshToken, prox = '', instance = 'shells
                     'user-agent': UserAgent,
                     'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
                 },
-                httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
+                httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
             })
             body = request.data
             token = body.id_token;
@@ -185,7 +185,7 @@ async function loginAnonymously(prox = '', instance = 'shellshock.io') {
             'user-agent': UserAgent,
             'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
         },
-        httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
+        httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
     });
 
     const token = body.idToken;

package/src/bot.js

@@ -21,6 +21,7 @@ import {
     ItemTypes,
     Movements,
     PlayTypes,
+    ProxiesEnabled,
     ShellStreaks
 } from '#constants';
 
@@ -41,7 +42,8 @@ const intents = {
     BUFFERS: 4,
     PING: 5,
     COSMETIC_DATA: 6,
-    PLAYER_HEALTH: 7
+    PLAYER_HEALTH: 7,
+    PACKET_HOOK: 8
 }
 
 export class Bot {
@@ -49,7 +51,7 @@ export class Bot {
     Intents = intents;
 
     constructor(params = {}) {
-        if (params.proxy && IsBrowser)
+        if (params.proxy && !ProxiesEnabled)
             throw new Error('proxies do not work and hence are not supported in the browser');
 
         this.intents = params.intents || [];
@@ -249,7 +251,7 @@ export class Bot {
         this.account.password = pass;
 
         const loginData = await createAccount(email, pass, this.proxy, this.instance);
-        return this.#processLoginData(loginData);
+        return await this.#processLoginData(loginData);
     }
 
     async login(email, pass) {
@@ -257,12 +259,12 @@ export class Bot {
         this.account.password = pass;
 
         const loginData = await loginWithCredentials(email, pass, this.proxy, this.instance);
-        return this.#processLoginData(loginData);
+        return await this.#processLoginData(loginData);
     }
 
     async loginWithRefreshToken(refreshToken) {
         const loginData = await loginWithRefreshToken(refreshToken, this.proxy, this.instance);
-        return this.#processLoginData(loginData);
+        return await this.#processLoginData(loginData);
     }
 
     async loginAnonymously() {
@@ -270,10 +272,10 @@ export class Bot {
         delete this.account.password;
 
         const loginData = await loginAnonymously(this.proxy, this.instance);
-        return this.#processLoginData(loginData);
+        return await this.#processLoginData(loginData);
     }
 
-    #processLoginData(loginData) {
+    async #processLoginData(loginData) {
         if (typeof loginData == 'string') {
             this.emit('authFail', loginData);
             return false;
@@ -297,6 +299,29 @@ export class Bot {
         this.account.sessionId = loginData.sessionId;
         this.account.vip = loginData.upgradeProductId && !loginData.upgradeIsExpired;
 
+        if (this.intents.includes(this.Intents.STATS)) this.account.stats = {
+            lifetime: loginData.statsLifetime,
+            monthly: loginData.statsCurrent
+        };
+
+        if (this.intents.includes(this.Intents.CHALLENGES)) {
+            this.account.challenges = [];
+
+            const { Challenges } = await import('./constants/challenges.js');
+
+            for (const challenge of loginData.challenges) {
+                const challengeData = Challenges.find(c => c.id == challenge.challengeId);
+                if (!challengeData) continue;
+
+                delete challenge.playerId;
+
+                this.account.challenges.push({
+                    ...challengeData,
+                    ...challenge
+                });
+            }
+        }
+
         return this.account;
     }
 
@@ -410,7 +435,7 @@ export class Bot {
                 this.game.socket.onmessage = (msg) => this._packetQueue.push(msg.data);
 
                 if (this.autoUpdate)
-                    setInterval(() => this.update(), this.updateInterval);
+                    this.updateIntervalId = setInterval(() => this.update(), this.updateInterval);
 
                 if (this.intents.includes(this.Intents.PING)) {
                     const out = CommOut.getBuffer();
@@ -699,7 +724,7 @@ export class Bot {
 
             return data;
         } else {
-            const data = await (await fetch(`https://${this.instance}/maps/${name}.json?${hash}`)).json();
+            const data = await (await fetch(`https://esm.sh/gh/yolkorg/maps/maps/${name}.json`)).json();
             return data;
         }
     }
@@ -875,7 +900,15 @@ export class Bot {
         const climbing = CommIn.unPackInt8U();
 
         const player = this.players[id];
-        if (!player) return;
+        if (!player || player.id == this.me.id) {
+            for (let i2 = 0; i2 < 3 /* FramesBetweenSyncs */; i2++) {
+                CommIn.unPackInt8U();
+                CommIn.unPackRadU();
+                CommIn.unPackRad();
+                CommIn.unPackInt8U();
+            }
+            return;
+        }
 
         if (player.position.x !== x) player.position.x = x;
         if (player.position.z !== z) player.position.z = z;
@@ -888,24 +921,13 @@ export class Bot {
         if (this.intents.includes(this.Intents.BUFFERS)) {
             if (!player.buffer) return;
 
-            if (player.id == this.me.id) {
-                for (let i2 = 0; i2 < 3 /* FramesBetweenSyncs */; i2++) {
-                    CommIn.unPackInt8U();
-                    CommIn.unPackRadU();
-                    CommIn.unPackRad();
-                    CommIn.unPackInt8U();
-                }
-                return;
-            }
-
-            let yaw, pitch;
             for (let i2 = 0; i2 < 3; i2++) {
                 player.buffer[i2].controlKeys = CommIn.unPackInt8U();
 
-                yaw = CommIn.unPackRadU();
+                const yaw = CommIn.unPackRadU();
                 if (!isNaN(yaw)) player.buffer[i2].yaw_ = yaw
 
-                pitch = CommIn.unPackRad();
+                const pitch = CommIn.unPackRad();
                 if (!isNaN(pitch)) player.buffer[i2].pitch_ = pitch
 
                 CommIn.unPackInt8U();
@@ -1476,9 +1498,28 @@ export class Bot {
         }
     }
 
+    #processChallengeCompletePacket() {
+        const id = CommIn.unPackInt8U();
+        const challengeId = CommIn.unPackInt8U();
+
+        const player = this.players[id];
+        if (!player) return;
+
+        if (!this.intents.includes(this.Intents.CHALLENGES))
+            return this.emit('challengeComplete', player, challengeId);
+
+        const challenge = this.account.challenges.find(c => c.id == challengeId);
+        this.emit('challengeComplete', player, challenge);
+
+        if (player.id == this.me.id) this.refreshChallenges();
+    }
+
     #handlePacket(packet) {
         CommIn.init(packet);
 
+        if (this.intents.includes(this.Intents.PACKET_HOOK))
+            this.emit('packet', packet);
+
         let lastCommand = 0;
         let abort = false;
 
@@ -1487,91 +1528,91 @@ export class Bot {
 
             switch (cmd) {
                 case CommCode.syncThem:
-                    this.#processSyncThemPacket(packet);
+                    this.#processSyncThemPacket();
                     break;
 
                 case CommCode.fire:
-                    this.#processFirePacket(packet);
+                    this.#processFirePacket();
                     break;
 
                 case CommCode.hitThem:
-                    this.#processHitThemPacket(packet);
+                    this.#processHitThemPacket();
                     break;
 
                 case CommCode.syncMe:
-                    this.#processSyncMePacket(packet);
+                    this.#processSyncMePacket();
                     break;
 
                 case CommCode.hitMe:
-                    this.#processHitMePacket(packet);
+                    this.#processHitMePacket();
                     break;
 
                 case CommCode.swapWeapon:
-                    this.#processSwapWeaponPacket(packet);
+                    this.#processSwapWeaponPacket();
                     break;
 
                 case CommCode.collectItem:
-                    this.#processCollectPacket(packet);
+                    this.#processCollectPacket();
                     break;
 
                 case CommCode.respawn:
-                    this.#processRespawnPacket(packet);
+                    this.#processRespawnPacket();
                     break;
 
                 case CommCode.die:
-                    this.#processDeathPacket(packet);
+                    this.#processDeathPacket();
                     break;
 
                 case CommCode.pause:
-                    this.#processPausePacket(packet);
+                    this.#processPausePacket();
                     break;
 
                 case CommCode.chat:
-                    this.#processChatPacket(packet);
+                    this.#processChatPacket();
                     break;
 
                 case CommCode.addPlayer:
-                    this.#processAddPlayerPacket(packet);
+                    this.#processAddPlayerPacket();
                     break;
 
                 case CommCode.removePlayer:
-                    this.#processRemovePlayerPacket(packet);
+                    this.#processRemovePlayerPacket();
                     break;
 
                 case CommCode.eventModifier:
-                    this.#processEventModifierPacket(packet);
+                    this.#processEventModifierPacket();
                     break;
 
                 case CommCode.metaGameState:
-                    this.#processGameStatePacket(packet);
+                    this.#processGameStatePacket();
                     break;
 
                 case CommCode.beginShellStreak:
-                    this.#processBeginStreakPacket(packet);
+                    this.#processBeginStreakPacket();
                     break;
 
                 case CommCode.endShellStreak:
-                    this.#processEndStreakPacket(packet);
+                    this.#processEndStreakPacket();
                     break;
 
                 case CommCode.hitMeHardBoiled:
-                    this.#processHitShieldPacket(packet);
+                    this.#processHitShieldPacket();
                     break;
 
                 case CommCode.gameOptions:
-                    this.#processGameOptionsPacket(packet);
+                    this.#processGameOptionsPacket();
                     break;
 
                 case CommCode.ping:
-                    this.#processPingPacket(packet);
+                    this.#processPingPacket();
                     break;
 
                 case CommCode.switchTeam:
-                    this.#processSwitchTeamPacket(packet);
+                    this.#processSwitchTeamPacket();
                     break;
 
                 case CommCode.changeCharacter:
-                    this.#processChangeCharacterPacket(packet);
+                    this.#processChangeCharacterPacket();
                     break;
 
                 case CommCode.reload:
@@ -1595,11 +1636,15 @@ export class Bot {
                     break;
 
                 case CommCode.updateBalance:
-                    this.#processUpdateBalancePacket(packet);
+                    this.#processUpdateBalancePacket();
+                    break;
+
+                case CommCode.challengeCompleted:
+                    this.#processChallengeCompletePacket();
                     break;
 
                 case CommCode.gameAction:
-                    this.#processGameActionPacket(packet);
+                    this.#processGameActionPacket();
                     break;
 
                 case CommCode.requestGameOptions:
@@ -1607,7 +1652,7 @@ export class Bot {
                     break;
 
                 case CommCode.respawnDenied:
-                    this.#processRespawnDeniedPacket(packet);
+                    this.#processRespawnDeniedPacket();
                     break;
 
                 // we do not plan to implement these
@@ -1620,11 +1665,6 @@ export class Bot {
                     CommIn.unPackLongString();
                     break;
 
-                case CommCode.challengeCompleted:
-                    CommIn.unPackInt8U();
-                    CommIn.unPackInt8U();
-                    break;
-
                 default:
                     console.error(`handlePacket: I got but did not handle a: ${Object.keys(CommCode).find(k => CommCode[k] === cmd)}`);
                     if (lastCommand) console.error(`handlePacket: It may be a result of the ${lastCommand} command.`);
@@ -1716,7 +1756,7 @@ export class Bot {
         return this.pathing.nodeList.hasLineOfSight(this.me.position, target.position);
     }
 
-    getBestTarget() {
+    getBestTarget(customFilter) {
         const options = Object.values(this.players)
             .filter((player) => player)
             .filter((player) => player !== this.me)
@@ -1724,7 +1764,8 @@ export class Bot {
             .filter((player) => player.hp > 0)
             .filter((player) => player.name !== this.me.name)
             .filter((player) => this.me.team === 0 || player.team !== this.me.team)
-            .filter((player) => this.canSee(player));
+            .filter((player) => this.canSee(player))
+            .filter((player) => !!customFilter(player));
 
         let minDistance = 200;
         let targetPlayer = null;
@@ -1831,7 +1872,7 @@ export class Bot {
         if (this.intents.includes(this.Intents.PLAYER_HEALTH))
             clearInterval(this.healthIntervalId);
 
-        clearInterval(this.updateInterval);
+        clearInterval(this.updateIntervalId);
 
         this.game.socket.close();
         this.matchmaker.close();