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

package/src/dispatches/SaveLoadoutDispatch.js

@@ -70,10 +70,12 @@ export class SaveLoadoutDispatch {
     }
 
     execute(bot) {
-        if (this.changes.classIdx && this.changes.classIdx !== bot.me.selectedGun) {
+        if (bot.me && this.changes.classIdx && this.changes.classIdx !== bot.me.selectedGun) {
             bot.me.weapons[0] = new GunList[this.changes.classIdx]();
         }
 
+        bot.state.weaponIdx = this.changes.classIdx || bot.state.weaponIdx;
+
         const loadout = {
             ...bot.account.loadout,
             ...this.changes
@@ -89,7 +91,7 @@ export class SaveLoadoutDispatch {
 
         bot.account.loadout = loadout;
 
-        saveLoadout.then(() => {
+        if (bot.me) saveLoadout.then(() => {
             if (bot.state.joinedGame) {
                 const out = CommOut.getBuffer();
                 out.packInt8(CommCode.changeCharacter);

package/src/globals.js

@@ -5,11 +5,11 @@ if (typeof process !== 'undefined') {
     globals.SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
     globals.ProxyAgent = (await import('undici')).ProxyAgent;
     globals.WebSocket = (await import('ws')).default;
-} else {
-    globals.fetch = fetch;
+} else if (typeof window !== 'undefined') {
+    globals.fetch = fetch.bind(window);
     globals.SocksProxyAgent = undefined;
     globals.ProxyAgent = class {};
     globals.WebSocket = WebSocket;
-}
+} else throw new Error('unknown environment...could not detect node.js or browser...open an issue in the yolkbot github');
 
 export default globals;

package/src/matchmaker.js

@@ -103,7 +103,7 @@ export class Matchmaker {
             this.on('msg', listener);
 
             this.ws.onerror = (e2) => {
-                throw new Error('Failed to get regions', e2);
+                throw new Error('failed to get regions', e2);
             }
 
             this.ws.send(JSON.stringify({ command: 'regionList' }));
@@ -116,17 +116,15 @@ export class Matchmaker {
         // params.region
         // params.mode -> params.gameType
         // params.isPublic -> params.playType
-        if (!params.region) { throw new Error('did not specify a region in findGame, use <Matchmaker>.getRegions() for a list') }
+        if (!params.region) throw new Error('did not specify a region in findGame, use <Matchmaker>.getRegions() for a list')
 
         if (this.regionList) {
             const region = this.regionList.find(r => r.id == params.region);
-            if (!region) {
-                throw new Error('did not find region in regionList, if you are attempting to force a region, avoid calling getRegions()')
-            }
+            if (!region) throw new Error('did not find region in regionList, if you are attempting to force a region, avoid calling getRegions()')
         } // else { console.log('regionList not found, not validating findGame region, use <Matchmaker>.regionList() to check region') }
 
-        if (!params.mode) { throw new Error('did not specify a mode in findGame') }
-        if (GameModes[params.mode] === undefined) { throw new Error('invalid mode in findGame, see GameModes for a list') }
+        if (!params.mode) throw new Error('did not specify a mode in findGame')
+        if (GameModes[params.mode] === undefined) throw new Error('invalid mode in findGame, see GameModes for a list')
 
         return new Promise((res) => {
             const opts = {

package/src/types/api.d.ts

@@ -16,6 +16,7 @@ export interface QueryResponse {
 }
 
 export function queryServices(request: QueryRequest, proxy?: string, instance?: string): Promise<QueryResponse | string>;
-export function loginWithCredentials(email: string, password: string, prox?: string, instance?: string): Promise<QueryResponse | string>;
-export function loginWithRefreshToken(refreshToken: string, prox?: string, instance?: string): Promise<QueryResponse | string>;
-export function loginAnonymously(prox?: string, instance?: string): Promise<QueryResponse | string>;
+export function loginWithCredentials(email: string, password: string, proxy?: string, instance?: string): Promise<QueryResponse | string>;
+export function loginWithRefreshToken(refreshToken: string, proxy?: string, instance?: string): Promise<QueryResponse | string>;
+export function loginAnonymously(proxy?: string, instance?: string): Promise<QueryResponse | string>;
+export function createAccount(email: string, password: string, proxy?: string, instance?: string): Promise<QueryResponse | string>;

package/src/types/bot.d.ts

@@ -66,6 +66,8 @@ export interface Account {
     firebaseId: string;
     sessionId: string;
     session: string;
+    email: string;
+    password: string;
     cw: ChiknWinnerStatus;
     loadout: {
         hatId: number | null;
@@ -170,10 +172,12 @@ export interface Pathing {
 
 export interface BotState {
     name: string;
+    weaponIdx: number;
     reloading: boolean;
     swappingGun: boolean;
     usingMelee: boolean;
     shotsFired: number;
+    quit: boolean;
 }
 
 export interface ChiknWinnerResponse {
@@ -190,7 +194,8 @@ type intents = {
     PING: 5,
     COSMETIC_DATA: 6,
     PLAYER_HEALTH: 7,
-    PACKET_HOOK: 8
+    PACKET_HOOK: 8,
+    MONITOR: 9
 }
 
 export class Bot {
@@ -227,11 +232,12 @@ export class Bot {
     createPrivateGame(opts: { region: string; mode: string; map: string }): Promise<RawGameData>;
     join(botName: string, data: string | RawGameData): Promise<void>;
 
+    processPacket(data: number[]): void;
     dispatch(disp: ADispatch): void;
     update(): void;
 
     canSee(player: GamePlayer): boolean;
-    getBestTarget(customFilter: (player: GamePlayer) => boolean): GamePlayer | undefined;
+    getBestTarget(customFilter?: (player: GamePlayer) => boolean): GamePlayer | undefined;
 
     onAny(cb: Function): void;
 
@@ -272,7 +278,7 @@ export class Bot {
     on(event: 'tick', cb: () => void): void;
 
     checkChiknWinner(): Promise<ChiknWinnerStatus>;
-    playChiknWinner(): Promise<ChiknWinnerResponse | string>;
+    playChiknWinner(doPrematureCooldownCheck: boolean): Promise<ChiknWinnerResponse | string>;
     resetChiknWinner(): Promise<ChiknWinnerStatus>;
 
     refreshBalance(): Promise<number>;