yolkbot 0.1.1-alpha.4 → 0.1.1-alpha.41

package/package.json

@@ -1,28 +1,26 @@
 {
     "name": "yolkbot",
     "description": "create a shell shockers (self) bot in under 10 lines.",
-    "version": "0.1.1-alpha.4",
+    "version": "0.1.1-alpha.41",
     "keywords": [
         "shell shockers",
         "shellshock.io",
         "blue wizard",
         "yolkbot"
     ],
-    "homepage": "https://github.com/enbyte/yolkbot#readme",
+    "homepage": "https://github.com/yolkorg/yolkbot#readme",
     "bugs": {
-        "url": "https://github.com/enbyte/yolkbot/issues"
+        "url": "https://github.com/yolkorg/yolkbot/issues"
     },
-    "author": "hijinks",
-    "contributors": [
-        "1ust"
-    ],
+    "author": "1ust",
+    "contributors": ["hijinks"],
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/enbyte/yolkbot.git"
+        "url": "git+https://github.com/yolkorg/yolkbot.git"
     },
     "type": "module",
     "files": [
-        "build/*.js",
+        "browser/build/*.js",
         "data/*.*",
         "src/**/*",
         "package.json",
@@ -35,11 +33,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 +42,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

@@ -13,6 +13,11 @@ const queryServices = async (request, proxy = '', instance = 'shellshock.io') =>
     const attempt = async () => {
         try {
             ws = new yolkws(`wss://${instance}/services/`, proxy);
+            ws.onerror = async (e) => {
+                console.error(e);
+                await new Promise((resolve) => setTimeout(resolve, 100));
+                return await attempt();
+            }
         } catch {
             await new Promise((resolve) => setTimeout(resolve, 100));
             await attempt();
@@ -23,7 +28,7 @@ const queryServices = async (request, proxy = '', instance = 'shellshock.io') =>
 
     return new Promise((resolve) => {
         ws.onopen = () => {
-            // console.log('opened')
+            ws.onerror = null;
             ws.send(JSON.stringify(request));
         }
 
@@ -88,8 +93,10 @@ async function loginWithCredentials(email, password, prox = '', instance = 'shel
                 returnSecureToken: true
             }, {
                 headers: {
+                    'origin': 'https://shellshock.io',
                     'user-agent': UserAgent,
-                    'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
+                    'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web',
+                    'x-firebase-locale': 'en'
                 },
                 httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
             })
@@ -102,6 +109,9 @@ async function loginWithCredentials(email, password, prox = '', instance = 'shel
                 console.error('loginWithCredentials: Network req failed (auth/network-request-failed), retrying, k =', k);
             } else if (error.code == 'auth/missing-email') {
                 return 'firebase_no_credentials';
+            } else if (error.code == 'ERR_BAD_REQUEST') {
+                console.error('loginWithCredentials: Error:', email, password);
+                console.error('loginWithCredentials: Error:', error.response?.data || error, 'k =', k);
             } else {
                 console.error('loginWithCredentials: Error:', email, password);
                 console.error('loginWithCredentials: Error:', error, 'k =', k);

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';
@@ -149,7 +149,13 @@ export class Bot {
             captureProgress: 0,
             numCapturing: 0,
             stageName: '',
-            capturePercent: 0.0
+            capturePercent: 0.0,
+
+            // egg org
+            eggOrg: {
+                evil: 0,
+                good: 0
+            }
         }
 
         this.account = {
@@ -435,7 +441,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();
@@ -542,6 +548,11 @@ export class Bot {
         const attempt = async () => {
             try {
                 this.game.socket = new yolkws(`wss://${this.game.raw.subdomain}.${this.instance}/game/${this.game.raw.id}`, this.proxy);
+                this.game.socket.onerror = async (e) => {
+                    console.error(e);
+                    await new Promise((resolve) => setTimeout(resolve, 100));
+                    return await attempt();
+                }
             } catch {
                 await new Promise((resolve) => setTimeout(resolve, 100));
                 await attempt();
@@ -553,7 +564,7 @@ export class Bot {
         this.game.socket.binaryType = 'arraybuffer';
 
         this.game.socket.onopen = () => {
-            // console.log('Successfully connected to game server.');
+            this.game.socket.onerror = null;
         }
 
         this.game.socket.onmessage = this.#onGameMesssage.bind(this);
@@ -561,6 +572,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);
         }
     }
 
@@ -724,7 +736,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;
         }
     }
@@ -799,25 +811,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(),
@@ -829,6 +837,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(),
@@ -836,6 +845,7 @@ export class Bot {
             totalDeaths_: CommIn.unPackInt32U(),
             bestGameStreak_: CommIn.unPackInt16U(),
             bestOverallStreak_: CommIn.unPackInt16U(),
+            // end stats
             shield_: CommIn.unPackInt8U(),
             hp_: CommIn.unPackInt8U(),
             playing_: CommIn.unPackInt8U(),
@@ -979,15 +989,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() {
@@ -1302,7 +1312,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];
 
@@ -1354,7 +1364,7 @@ export class Bot {
         const oldTeam = player.team;
 
         player.team = toTeam;
-        player.kills = 0;
+        player.streak = 0;
 
         this.emit('playerSwitchTeam', player, oldTeam, toTeam);
     }
@@ -1376,8 +1386,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;
@@ -1514,6 +1523,26 @@ export class Bot {
         if (player.id == this.me.id) this.refreshChallenges();
     }
 
+    // egg org
+    #processClientReadyPacket() {
+        this.#processEggOrgUpdatePacket();
+    }
+
+    // egg org
+    #processEggOrgUpdatePacket() {
+        const str = CommIn.unPackString();
+
+        try {
+            const eggOrgStats = JSON.parse(str);
+            this.game.eggOrg.evil = eggOrgStats[0];
+            this.game.eggOrg.good = eggOrgStats[1];
+
+            this.emit('eggOrgUpdate', this.game.eggOrg);
+        } catch {
+            // hopefully never =D
+        }
+    }
+
     #handlePacket(packet) {
         CommIn.init(packet);
 
@@ -1521,6 +1550,7 @@ export class Bot {
             this.emit('packet', packet);
 
         let lastCommand = 0;
+        let lastCode = 0;
         let abort = false;
 
         while (CommIn.isMoreDataAvailable() && !abort) {
@@ -1627,6 +1657,11 @@ export class Bot {
                     this.#processThrowGrenadePacket();
                     break;
 
+                // egg org
+                case CommCode.eggOrgUpdate:
+                    this.#processEggOrgUpdatePacket();
+                    break;
+
                 case CommCode.spawnItem:
                     this.#processSpawnItemPacket();
                     break;
@@ -1655,9 +1690,13 @@ export class Bot {
                     this.#processRespawnDeniedPacket();
                     break;
 
+                // egg org
+                case CommCode.clientReady:
+                    this.#processClientReadyPacket();
+                    break;
+
                 // we do not plan to implement these
                 // for more info, see comm/codes.js
-                case CommCode.clientReady:
                 case CommCode.expireUpgrade:
                     break;
 
@@ -1666,13 +1705,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;
         }
     }
 
@@ -1683,6 +1723,8 @@ export class Bot {
             sessionId: this.account.sessionId
         });
 
+        if (typeof response === 'string') return response;
+
         this.account.cw.limit = response.limit;
         this.account.cw.atLimit = response.limit > 3;
 
@@ -1706,6 +1748,8 @@ export class Bot {
             token: null
         }, this.proxy, this.instance);
 
+        if (typeof response === 'string') return response;
+
         if (response.error) {
             if (response.error == 'RATELIMITED') {
                 await this.checkChiknWinner();
@@ -1740,6 +1784,8 @@ export class Bot {
             sessionId: this.account.sessionId
         });
 
+        if (typeof response === 'string') return response;
+
         if (response.result !== 'SUCCESS') {
             console.error('Unknown Chikn Winner reset response', response);
             return 'unknown_error';
@@ -1756,7 +1802,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)
@@ -1764,7 +1810,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;
@@ -1867,15 +1914,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();
+        if (this.game) 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,45 @@
+/* eslint-disable */
+export const CommCode = {
+    "swapWeapon": 0,
+    "joinGame": 1,
+    "spawnItem": 3,
+    "ping": 5,
+    "bootPlayer": 6,
+    "reportPlayer": 10,
+    "switchTeam": 13,
+    "changeCharacter": 14,
+    "pause": 15,
+    "gameOptions": 16,
+    "gameAction": 17,
+    "requestGameOptions": 18,
+    "gameJoined": 19,
+    "socketReady": 20,
+    "addPlayer": 21,
+    "removePlayer": 22,
+    "fire": 23,
+    "melee": 24,
+    "throwGrenade": 25,
+    "eventModifier": 27,
+    "hitThem": 28,
+    "hitMe": 29,
+    "collectItem": 30,
+    "chat": 34,
+    "syncThem": 35,
+    "die": 37,
+    "beginShellStreak": 38,
+    "endShellStreak": 39,
+    "updateBalance": 42,
+    "reload": 43,
+    "respawn": 44,
+    "respawnDenied": 45,
+    "clientReady": 47,
+    "requestRespawn": 48,
+    "metaGameState": 53,
+    "syncMe": 54,
+    "explode": 55,
+    "keepAlive": 56,
+    "musicInfo": 57,
+    "hitMeHardBoiled": 58,
+    "challengeCompleted": 60,
+    "eggOrgUpdate": 61
+};