yolkbot 0.1.1-alpha.3 → 0.1.1-alpha.31

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "yolkbot",
     "description": "create a shell shockers (self) bot in under 10 lines.",
-    "version": "0.1.1-alpha.3",
+    "version": "0.1.1-alpha.31",
     "keywords": [
         "shell shockers",
         "shellshock.io",
@@ -22,7 +22,7 @@
     },
     "type": "module",
     "files": [
-        "build/*.js",
+        "browser/build/*.js",
         "data/*.*",
         "src/**/*",
         "package.json",
@@ -35,11 +35,7 @@
             "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",
+        "./browser": "./browser/build/module.js",
         "./comm": "./src/comm/index.js",
         "./matchmaker": {
             "import": "./src/matchmaker.js",
@@ -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/GamePlayer.js

@@ -1,4 +1,4 @@
-import { GunList } from '#constants';
+import { GunList, ShellStreaks, SocialMedias } from '#constants';
 import { Cluck9mm } from '../constants/guns.js';
 
 export class GamePlayer {
@@ -6,28 +6,31 @@ export class GamePlayer {
         this.id = id;
         this.team = team;
 
-        this.data = playerData;
+        this.raw = playerData;
 
         this.name = playerData.name_;
         this.uniqueId = playerData.uniqueId_;
 
         this.playing = playerData.playing_;
 
-        this.social = playerData.social_ && JSON.parse(playerData.social_);
+        this.socials = playerData.social_ && JSON.parse(playerData.social_);
+        if (this.socials) this.socials.forEach((social) => social.type = SocialMedias[social.id]);
+
+        this.isVip = playerData.upgradeProductId_ > 0;
         this.showBadge = !playerData.hideBadge_ || false;
 
         this.position = {
-            x: this.data.x_,
-            y: this.data.y_,
-            z: this.data.z_
+            x: playerData.x_,
+            y: playerData.y_,
+            z: playerData.z_
         };
 
         this.jumping = false;
         this.climbing = false;
 
         this.view = {
-            yaw: this.data.yaw_,
-            pitch: this.data.pitch_
+            yaw: playerData.yaw_,
+            pitch: playerData.pitch_
         };
 
         this.character = {
@@ -40,15 +43,14 @@ export class GamePlayer {
             melee: playerData.meleeItem_
         }
 
-        this.activeGun = this.data.weaponIdx_;
+        this.activeGun = playerData.weaponIdx_;
         this.selectedGun = 0;
         this.weapons = [{}, {}];
 
         if (this.character.primaryGun) {
-            const weaponClass = GunList[this.character.primaryGun.exclusive_for_class];
-            this.selectedGun = this.character.primaryGun.exclusive_for_class;
+            this.selectedGun = playerData.charClass_;
 
-            this.weapons[0] = new weaponClass();
+            this.weapons[0] = new GunList[this.selectedGun]();
             this.weapons[1] = new Cluck9mm();
         }
 
@@ -60,11 +62,11 @@ export class GamePlayer {
             2: {}
         };
 
-        this.kills = 0;
-        this.hp = 100;
+        this.streak = playerData.score_;
+        this.hp = playerData.hp_;
 
-        this.hpShield = 0;
-        this.streakRewards = [];
+        this.hpShield = playerData.shield_;
+        this.streakRewards = Object.values(ShellStreaks).filter(streak => playerData.activeShellStreaks_ & streak);
 
         this.randomSeed = 0;
         this.serverStateIdx = 0;

package/src/bot.js

@@ -2,7 +2,7 @@ import { createAccount, loginAnonymously, loginWithCredentials, loginWithRefresh
 
 import CommIn from './comm/CommIn.js';
 import CommOut from './comm/CommOut.js';
-import { CommCode } from './comm/Codes.js';
+import { CommCode } from './constants/codes.js';
 
 import GamePlayer from './bot/GamePlayer.js';
 import Matchmaker from './matchmaker.js';
@@ -21,6 +21,7 @@ import {
     ItemTypes,
     Movements,
     PlayTypes,
+    ProxiesEnabled,
     ShellStreaks
 } from '#constants';
 
@@ -50,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 || [];
@@ -434,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();
@@ -560,6 +561,7 @@ export class Bot {
         this.game.socket.onclose = (e) => {
             // console.log('Game socket closed:', e.code, Object.entries(CloseCode).filter(([, v]) => v == e.code));
             this.emit('close', e.code);
+            this.quit(true, true);
         }
     }
 
@@ -723,7 +725,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;
         }
     }
@@ -798,25 +800,21 @@ export class Bot {
 
     #processAddPlayerPacket() {
         const id_ = CommIn.unPackInt8U();
-        const uniqueId = CommIn.unPackString();
-        const name = CommIn.unPackString();
-        const safename = CommIn.unPackString(); // ??? (a)
-        const charClass = CommIn.unPackInt8U();
         const findCosmetics = this.intents.includes(this.Intents.COSMETIC_DATA);
         const playerData = {
             id_: id_,
-            uniqueId_: uniqueId,
-            name_: name,
-            safename_: safename,
-            charClass_: charClass,
+            uniqueId_: CommIn.unPackString(),
+            name_: CommIn.unPackString(),
+            safename_: CommIn.unPackString(),
+            charClass_: CommIn.unPackInt8U(),
             team_: CommIn.unPackInt8U(),
-            primaryWeaponItem_: findItemById(CommIn.unPackInt16U()),
+            primaryWeaponItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
             secondaryWeaponItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
             shellColor_: CommIn.unPackInt8U(),
             hatItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
             stampItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
-            unknownInt8: CommIn.unPackInt8(), // c
-            otherUnknownInt8: CommIn.unPackInt8(),
+            _unused: CommIn.unPackInt8(),
+            _unused2: CommIn.unPackInt8(),
             grenadeItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
             meleeItem_: findCosmetics ? findItemById(CommIn.unPackInt16U()) : CommIn.unPackInt16U(),
             x_: CommIn.unPackFloat(),
@@ -828,6 +826,7 @@ export class Bot {
             yaw_: CommIn.unPackRadU(),
             pitch_: CommIn.unPackRad(),
             score_: CommIn.unPackInt32U(),
+            // the following are all stats
             kills_: CommIn.unPackInt16U(),
             deaths_: CommIn.unPackInt16U(),
             streak_: CommIn.unPackInt16U(),
@@ -835,6 +834,7 @@ export class Bot {
             totalDeaths_: CommIn.unPackInt32U(),
             bestGameStreak_: CommIn.unPackInt16U(),
             bestOverallStreak_: CommIn.unPackInt16U(),
+            // end stats
             shield_: CommIn.unPackInt8U(),
             hp_: CommIn.unPackInt8U(),
             playing_: CommIn.unPackInt8U(),
@@ -978,15 +978,15 @@ export class Bot {
 
         if (killed) {
             killed.playing = false;
-            killed.kills = 0;
+            killed.streak = 0;
             killed.lastDeathTime = Date.now();
-            // console.log(`Player ${killed.name} died.`);
+            killed.hp = 100;
+            killed.hpShield = 0;
         }
 
-        if (killer) { killer.kills++; }
-        // console.log(`Player ${killer.name} is on a streak of ${killer.kills} kills.`);
+        if (killer) killer.streak++;
 
-        this.emit('playerDeath', killed, killer); // killed, killer
+        this.emit('playerDeath', killed, killer);
     }
 
     #processFirePacket() {
@@ -1301,7 +1301,7 @@ export class Bot {
         if (action == GameActions.reset) {
             // console.log('owner reset game');
 
-            this.me.kills = 0;
+            Object.values(this.players).forEach((player) => player.streak = 0);
 
             if (this.game.gameModeId !== GameModes.ffa) this.game.teamScore = [0, 0, 0];
 
@@ -1353,7 +1353,7 @@ export class Bot {
         const oldTeam = player.team;
 
         player.team = toTeam;
-        player.kills = 0;
+        player.streak = 0;
 
         this.emit('playerSwitchTeam', player, oldTeam, toTeam);
     }
@@ -1375,8 +1375,7 @@ export class Bot {
 
         const findCosmetics = this.intents.includes(this.Intents.COSMETIC_DATA);
 
-        const primaryWeaponItem = findItemById(primaryWeaponIdx);
-
+        const primaryWeaponItem = findCosmetics ? findItemById(primaryWeaponIdx) : primaryWeaponIdx;
         const secondaryWeaponItem = findCosmetics ? findItemById(secondaryWeaponIdx) : secondaryWeaponIdx;
         const hatItem = findCosmetics ? findItemById(hatIdx) : hatIdx;
         const stampItem = findCosmetics ? findItemById(stampIdx) : stampIdx;
@@ -1520,6 +1519,7 @@ export class Bot {
             this.emit('packet', packet);
 
         let lastCommand = 0;
+        let lastCode = 0;
         let abort = false;
 
         while (CommIn.isMoreDataAvailable() && !abort) {
@@ -1665,13 +1665,14 @@ export class Bot {
                     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.`);
+                    console.error(`handlePacket: I got but did not handle a: ${Object.keys(CommCode).find(k => CommCode[k] === cmd)} ${cmd}`);
+                    if (lastCommand) console.error(`handlePacket: It may be a result of the ${lastCommand} command (${lastCode}).`);
                     abort = true
                     break;
             }
 
             lastCommand = Object.keys(CommCode).find(k => CommCode[k] === cmd);
+            lastCode = cmd;
         }
     }
 
@@ -1755,7 +1756,7 @@ export class Bot {
         return this.pathing.nodeList.hasLineOfSight(this.me.position, target.position);
     }
 
-    getBestTarget() {
+    getBestTarget(customFilter = () => true) {
         const options = Object.values(this.players)
             .filter((player) => player)
             .filter((player) => player !== this.me)
@@ -1763,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;
@@ -1866,15 +1868,18 @@ export class Bot {
         return result;
     }
 
-    quit(noCleanup = false) {
+    quit(noCleanup = false, finishDispatches = false) {
         if (this.intents.includes(this.Intents.PLAYER_HEALTH))
             clearInterval(this.healthIntervalId);
 
-        clearInterval(this.updateInterval);
+        clearInterval(this.updateIntervalId);
 
         this.game.socket.close();
         this.matchmaker.close();
 
+        if (!finishDispatches) this._dispatches = [];
+        this._packetQueue = [];
+
         if (!noCleanup) {
             delete this.account;
             delete this.game;

package/src/comm/Codes.js

@@ -74,76 +74,6 @@ const CommCode = {
 
 */
 
-const CommCode = {
-    swapWeapon: 0,
-    joinGame: 0,
-    refreshGameState: 0,
-    spawnItem: 0,
-    observeGame: 0,
-    ping: 0,
-    bootPlayer: 0,
-    banPlayer: 0,
-    loginRequired: 0,
-    gameLocked: 0,
-    reportPlayer: 0,
-    banned: 0,
-    createPrivateGame: 0,
-    switchTeam: 0,
-    changeCharacter: 0,
-    pause: 0,
-    gameOptions: 0,
-    gameAction: 0,
-    requestGameOptions: 0,
-    gameJoined: 0,
-    socketReady: 0,
-    addPlayer: 0,
-    removePlayer: 0,
-    fire: 0,
-    melee: 0,
-    throwGrenade: 0,
-    info: 0,
-    eventModifier: 0,
-    hitThem: 0,
-    hitMe: 0,
-    collectItem: 0,
-    chlgPlayerRerollInGame: 0,
-    playerInGameReward: 0,
-    playerRewards: 0,
-    chat: 0,
-    syncThem: 0,
-    syncAmmo: 0,
-    die: 0,
-    beginShellStreak: 0,
-    endShellStreak: 0,
-    startReload: 0,
-    announcement: 0,
-    updateBalance: 0,
-    reload: 0,
-    respawn: 0,
-    respawnDenied: 0,
-    pong: 0,
-    clientReady: 0,
-    requestRespawn: 0,
-    joinPublicGame: 0,
-    joinPrivateGame: 0,
-    switchTeamFail: 0,
-    expireUpgrade: 0,
-    metaGameState: 0,
-    syncMe: 0,
-    explode: 0,
-    keepAlive: 0,
-    musicInfo: 0,
-    hitMeHardBoiled: 0,
-    playerInfo: 0,
-    challengeCompleted: 0
-};
-
-let ih = 1;
-
-Object.keys(CommCode).forEach(e => {
-    CommCode[e] = ih++;
-});
-
 const CloseCode = {
     gameNotFound: 4000,
     gameFull: 4001,
@@ -166,7 +96,4 @@ const CloseCode = {
     locked: 4023
 }
 
-export {
-    CommCode,
-    CloseCode
-}
+export { CloseCode }

package/src/comm/index.js

@@ -3,7 +3,7 @@ import CommOut from './CommOut.js';
 import OutBuffer from './OutBuffer.js';
 import Pool from './Pool.js';
 
-import { CommCode } from './Codes.js';
+import { CommCode } from '../constants/codes.js';
 import { CloseCode } from './Codes.js';
 
 export {

package/src/constants/codes.js

@@ -0,0 +1,40 @@
+/* eslint-disable */
+export const CommCodes = {
+    "syncMe": 54,
+    "swapWeapon": 0,
+    "pause": 15,
+    "eventModifier": 27,
+    "gameOptions": 16,
+    "reload": 43,
+    "changeCharacter": 14,
+    "melee": 24,
+    "updateBalance": 42,
+    "gameAction": 17,
+    "requestGameOptions": 18,
+    "musicInfo": 57,
+    "challengeCompleted": 60,
+    "throwGrenade": 25,
+    "switchTeam": 13,
+    "ping": 5,
+    "endShellStreak": 39,
+    "metaGameState": 53,
+    "die": 37,
+    "socketReady": 20,
+    "joinGame": 1,
+    "gameJoined": 19,
+    "clientReady": 47,
+    "reportPlayer": 10,
+    "bootPlayer": 6,
+    "hitThem": 28,
+    "spawnItem": 3,
+    "collectItem": 30,
+    "beginShellStreak": 38,
+    "hitMe": 29,
+    "requestRespawn": 48,
+    "chat": 34,
+    "removePlayer": 22,
+    "respawnDenied": 45,
+    "syncThem": 35,
+    "respawn": 44,
+    "keepAlive": 56
+};

package/src/constants/guns.js

@@ -38,7 +38,9 @@ const Eggk47 = class _Eggk47 extends Gun {
         this.shortReloadTime = 160;
 
         this.weaponName = 'EggK-47';
+        this.internalName = 'Eggk47';
         this.standardMeshName = 'eggk47';
+
         this.rof = 3;
         this.recoil = 7;
         this.automatic = true;
@@ -67,8 +69,10 @@ const DozenGauge = class _DozenGauge extends Gun {
         this.longReloadTime = 155;
         this.shortReloadTime = 155;
 
-        this.weaponName = 'Dozen Gauge';
+        this.weaponName = 'Scrambler';
+        this.internalName = 'Dozen Gauge';
         this.standardMeshName = 'dozenGauge';
+
         this.rof = 8;
         this.recoil = 10;
         this.automatic = false;
@@ -121,8 +125,10 @@ const CSG1 = class _CSG1 extends Gun {
         this.shortReloadTime = 165;
         this.highPrecision = true;
 
-        this.weaponName = 'CSG-1';
+        this.weaponName = 'Free Ranger';
+        this.internalName = 'CSG-1';
         this.standardMeshName = 'csg1';
+
         this.rof = 13;
         this.recoil = 13;
         this.automatic = false;
@@ -159,7 +165,9 @@ const Cluck9mm = class _Cluck9mm extends Gun {
         this.shortReloadTime = 160;
 
         this.weaponName = 'Cluck 9mm';
+        this.internalName = 'Cluck 9mm';
         this.standardMeshName = 'cluck9mm';
+
         this.rof = 4;
         this.recoil = 6;
         this.automatic = false;
@@ -199,7 +207,9 @@ const RPEGG = class _RPEGG extends Gun {
         this.shortReloadTime = 170;
 
         this.weaponName = 'RPEGG';
+        this.internalName = 'Eggsploder';
         this.standardMeshName = 'rpegg';
+
         this.rof = 40;
         this.recoil = 60;
         this.automatic = false;
@@ -236,7 +246,9 @@ const SMG = class _SMG extends Gun {
         this.shortReloadTime = 190;
 
         this.weaponName = 'Whipper';
+        this.internalName = 'SMEGG';
         this.standardMeshName = 'smg';
+
         this.rof = 10;
         this.recoil = 7;
         this.automatic = true;
@@ -276,7 +288,9 @@ const M24 = class _M24 extends Gun {
         this.shortReloadTime = 144;
 
         this.weaponName = 'Crackshot';
+        this.internalName = 'M2DZ';
         this.standardMeshName = 'm24';
+
         this.rof = 60;
         this.recoil = 40;
         this.automatic = false;
@@ -316,7 +330,9 @@ const AUG = class _AUG extends Gun {
         this.shortReloadTime = 160;
 
         this.weaponName = 'Tri-Hard';
+        this.internalName = 'AUG';
         this.standardMeshName = 'aug';
+
         this.rof = 15;
         this.recoil = 18;
         this.automatic = false;

package/src/constants/index.js

@@ -71,6 +71,8 @@ export const PlayTypes = {
     joinPrivate: 2
 }
 
+export const ProxiesEnabled = !IsBrowser && typeof Bun == 'undefined';
+
 export const ShellStreaks = {
     HardBoiled: 1,
     EggBreaker: 2,
@@ -80,6 +82,16 @@ export const ShellStreaks = {
     MiniEgg: 32
 }
 
+export const SocialMedias = {
+    0: 'Facebook',
+    1: 'Instagram',
+    2: 'Tiktok',
+    3: 'Discord',
+    4: 'Youtube',
+    5: 'Twitter',
+    6: 'Twitch'
+}
+
 export const SocialRewards = {
     Discord: 'rew_1200',
     Tiktok: 'rew_1208',
@@ -105,5 +117,5 @@ export const URLRewards = [
     'WelcomeBack'
 ]
 
-export const UserAgent =
+export const UserAgent = IsBrowser ? undefined :
     'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36'