yolkbot 0.1.1-alpha.8 → 0.1.1

package/src/bot.js

@@ -1,8 +1,8 @@
-import { createAccount, loginAnonymously, loginWithCredentials, loginWithRefreshToken, queryServices } from '#api';
+import { createAccount, loginAnonymously, loginWithCredentials, loginWithRefreshToken, queryServices } from './api.js';
 
 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';
@@ -23,7 +23,7 @@ import {
     PlayTypes,
     ProxiesEnabled,
     ShellStreaks
-} from '#constants';
+} from './constants/index.js';
 
 import LookAtPosDispatch from './dispatches/LookAtPosDispatch.js';
 import MovementDispatch from './dispatches/MovementDispatch.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 = {
@@ -199,6 +205,9 @@ export class Bot {
             // balance is tracked
             eggBalance: 0,
 
+            // egg org side
+            eggOrgSide: 'none',
+
             // raw login
             rawLoginData: {}
         };
@@ -290,6 +299,7 @@ export class Bot {
 
         this.account.accountAge = loginData.accountAge;
         this.account.eggBalance = loginData.currentBalance;
+        this.account.eggOrgSide = loginData.eggOrgNeedsFaction === 'rew_eggfu' ? 'good' : 'evil';
         this.account.emailVerified = loginData.emailVerified;
         this.account.firebaseId = loginData.firebaseId;
         this.account.id = loginData.id;
@@ -357,7 +367,7 @@ export class Bot {
                     this.matchmaker.off('msg', listener);
 
                     this.game.raw = mes;
-                    this.game.code = code;
+                    this.game.code = mes.id;
 
                     resolve();
                 }
@@ -435,7 +445,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 +552,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 +568,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 +576,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);
         }
     }
 
@@ -624,7 +640,7 @@ export class Bot {
     }
 
     update() {
-        if (!this.state.joinedGame) throw new Error('Not playing, can\'t update. ');
+        if (!this.state.joinedGame) throw new Error('You cannot call update() if the bot is not in a game.');
 
         // process pathfinding
         if (this.pathing.followingPath && this.intents.includes(this.Intents.PATHFINDING)) this.#processPathfinding();
@@ -724,7 +740,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 +815,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 +841,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 +849,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 +993,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() {
@@ -1200,7 +1214,7 @@ export class Bot {
                 }
 
                 // secondary, always cluck9mm
-                if (player.weapons[1] && player.weapons[0].ammo) {
+                if (player.weapons[1] && player.weapons[1].ammo) {
                     player.weapons[1].ammo.rounds = player.weapons[1].ammo.capacity;
                     player.weapons[1].ammo.store = player.weapons[1].ammo.storeMax;
                 }
@@ -1302,7 +1316,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 +1368,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 +1390,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 +1527,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 +1554,7 @@ export class Bot {
             this.emit('packet', packet);
 
         let lastCommand = 0;
+        let lastCode = 0;
         let abort = false;
 
         while (CommIn.isMoreDataAvailable() && !abort) {
@@ -1627,6 +1661,11 @@ export class Bot {
                     this.#processThrowGrenadePacket();
                     break;
 
+                // egg org
+                case CommCode.eggOrgUpdate:
+                    this.#processEggOrgUpdatePacket();
+                    break;
+
                 case CommCode.spawnItem:
                     this.#processSpawnItemPacket();
                     break;
@@ -1655,9 +1694,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 +1709,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 +1727,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 +1752,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 +1788,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 +1806,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 +1814,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 +1918,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
+};

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

@@ -82,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',
@@ -107,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'