yolkbot 1.2.1 → 1.3.0

package/dist/types/bot.d.ts

@@ -9,7 +9,6 @@ type intents = {
     LOG_PACKETS: 10,
     NO_LOGIN: 11,
     DEBUG_BUFFER: 12,
-    DEBUG_BEST_TARGET: 14,
     NO_AFK_KICK: 16,
     LOAD_MAP: 17,
     OBSERVE_GAME: 18,
@@ -26,14 +25,13 @@ import { MapJSON } from './constants/maps';
 import { Item } from './constants/items';
 import { ADispatch } from './dispatches/index';
 import { NodeList } from './pathing/mapnode';
-import { API } from './api';
+import { AnonError, API, LoginError, QueryServicesError } from './api';
 import { Matchmaker } from './matchmaker';
 import yolkws from './socket';
 
 export interface BotParams {
     intents?: number[];
     proxy?: string;
-    httpProxy?: string;
     instance?: string;
     protocol?: string;
     apiMaxRetries?: number;
@@ -344,6 +342,10 @@ export interface FireBullet {
     dirZ: number;
 }
 
+type FindPublicErrors = 'no_region_passed' | 'invalid_region_passed' | 'no_mode_passed' | 'invalid_mode_passed' | 'matchmaker_init_fail' | 'internal_session_error';
+type CreatePrivateErrors = FindPublicErrors | 'invalid_map_passed';
+type BotLoginError = 'account_banned';
+
 export class Bot {
     static Intents: intents;
     Intents: intents;
@@ -352,7 +354,6 @@ export class Bot {
     instance: string;
     protocol: string;
     proxy: string;
-    httpProxy: string;
 
     state: BotState;
     players: Record<string, GamePlayer>;
@@ -373,24 +374,23 @@ export class Bot {
 
     constructor(params?: BotParams);
 
-    loginAnonymously(): Promise<Account | false>;
-    loginWithRefreshToken(refreshToken: string): Promise<Account | false>;
-    login(email: string, pass: string): Promise<Account | false>;
-    createAccount(email: string, pass: string): Promise<Account | false>;
+    loginAnonymously(): Promise<Account | BotLoginError | AnonError>;
+    loginWithRefreshToken(refreshToken: string): Promise<Account | BotLoginError | LoginError>;
+    login(email: string, pass: string): Promise<Account | BotLoginError | LoginError>;
+    createAccount(email: string, pass: string): Promise<Account | BotLoginError | LoginError>;
 
-    initMatchmaker(): Promise<boolean>;
+    initMatchmaker(): Promise<true | BotLoginError | AnonError | 'matchmaker_tryconnect_failed'>;
 
-    createPrivateGame(region: string, mode: number, map: string): Promise<RawGameData | string>;
-    findPublicGame(region: string, mode: number): Promise<RawGameData | string>;
+    createPrivateGame(region: string, mode: number, map: string): Promise<RawGameData | FindPublicErrors>;
+    findPublicGame(region: string, mode: number): Promise<RawGameData | CreatePrivateErrors>;
 
-    join(botName: string, data: string | RawGameData): Promise<void>;
+    join(botName: string, data: string | RawGameData): Promise<true | 'matchmaker_init_fail' | 'game_not_found' | 'websocket_tryconnect_fail' | 'invalid_game_object'>;
 
     processPacket(data: number[]): void;
     dispatch(disp: ADispatch): boolean;
     update(): void;
 
     canSee(player: GamePlayer): boolean;
-    getBestTarget(customFilter?: (player: GamePlayer) => boolean): { player: GamePlayer, inLoS: boolean } | undefined;
 
     onAny(cb: Function): void;
     off(event: string, cb: Function): void;
@@ -403,8 +403,6 @@ export class Bot {
     on(event: 'challengeComplete', cb: (player: GamePlayer, challengeId: number) => void): void;
     on(event: 'chat', cb: (player: GamePlayer | undefined, message: string, flags: number) => void): void;
     on(event: 'close', cb: (code: number) => void): void;
-    on(event: 'collectAmmo', cb: (player: GamePlayer, weapon: AnyGun) => void): void;
-    on(event: 'collectGrenade', cb: (player: GamePlayer) => void): void;
     on(event: 'error', cb: (error: string) => void): void;
     on(event: 'gameForcePause', cb: () => void): void;
     on(event: 'gameOptionsChange', cb: (oldOptions: GameOptions, newOptions: GameOptions) => void): void;
@@ -419,6 +417,8 @@ export class Bot {
     on(event: 'playerBeginStreak', cb: (player: GamePlayer, streakType: number) => void): void;
     on(event: 'playerChangeCharacter', cb: (player: GamePlayer, oldCharacter: Character, newCharacter: Character) => void): void;
     on(event: 'playerChangeGun', cb: (player: GamePlayer, oldGunId: number, newGunId: number) => void): void;
+    on(event: 'playerCollectAmmo', cb: (player: GamePlayer, weapon: AnyGun, itemId: number) => void): void;
+    on(event: 'playerCollectGrenade', cb: (player: GamePlayer, itemId: number) => void): void;
     on(event: 'playerDamage', cb: (player: GamePlayer, oldHp: number, newHp: number) => void): void;
     on(event: 'playerDeath', cb: (killed: GamePlayer, killer: GamePlayer) => void): void;
     on(event: 'playerEndStreak', cb: (player: GamePlayer, streakType: number) => void): void;
@@ -436,27 +436,28 @@ export class Bot {
     on(event: 'playerRotate', cb: (player: GamePlayer, oldView: View, newView: View) => void): void;
     on(event: 'playerSwapWeapon', cb: (player: GamePlayer, nowActive: number) => void): void;
     on(event: 'playerSwitchTeam', cb: (player: GamePlayer, oldTeam: number, newTeam: number) => void): void;
+    on(event: 'playerThrowGrenade', cb: (player: GamePlayer, position: Position, dPosition: Position) => void): void;
     on(event: 'respawnDenied', cb: () => void): void;
     on(event: 'rocketHit', cb: (pos: Position, damage: number, blastRadius: number) => void): void;
     on(event: 'selfShieldHit', cb: (newShieldHealth: number, newPlayerHealth: number, dir: { dx: number, dz: number }) => void): void;
     on(event: 'selfShieldLost', cb: (newPlayerHealth: number, dir: { dx: number, dz: number }) => void): void;
     on(event: 'sessionExpired', cb: () => void): void;
-    on(event: 'spawnItem', cb: (itemType: number, itemPosition: Position) => void): void;
+    on(event: 'spawnItem', cb: (itemType: number, itemPosition: Position, itemId: number) => void): void;
     on(event: 'tick', cb: () => void): void;
 
-    checkChiknWinner(): Promise<ChiknWinnerStatus>;
-    playChiknWinner(doPrematureCooldownCheck: boolean): Promise<ChiknWinnerResponse | string>;
-    resetChiknWinner(): Promise<ChiknWinnerStatus>;
+    checkChiknWinner(): Promise<ChiknWinnerStatus | QueryServicesError>;
+    playChiknWinner(doPrematureCooldownCheck: boolean): Promise<ChiknWinnerResponse | QueryServicesError | 'hit_daily_limit' | 'on_cooldown' | 'session_expired' | 'unknown_error'>;
+    resetChiknWinner(): Promise<ChiknWinnerStatus | QueryServicesError | 'not_enough_eggs' | 'not_at_limit' | 'unknown_error'>;
 
-    refreshChallenges(): Promise<Challenges[]>;
-    claimChallenge(challengeId: number): Promise<{ eggReward: number, updatedChallenges: Challenges[] }>;
-    rerollChallenge(challengeId: number): Promise<Challenges[]>;
+    refreshChallenges(): Promise<Challenges[] | QueryServicesError>;
+    claimChallenge(challengeId: number): Promise<{ eggReward: number, updatedChallenges: Challenges[] } | QueryServicesError>;
+    rerollChallenge(challengeId: number): Promise<Challenges[] | QueryServicesError>;
 
-    refreshBalance(): Promise<number>;
-    redeemCode(code: string): Promise<{ result: string; eggsGiven: number; itemIds: number[]; }>;
-    claimURLReward(reward: string): Promise<{ result: string; eggsGiven: number; itemIds: number[]; }>;
-    claimSocialReward(rewardTag: string): Promise<{ result: string; eggsGiven: number; itemIds: number[]; }>;
-    buyItem(itemId: number): Promise<{ result: string; currentBalance: number; itemId: number; }>;
+    refreshBalance(): Promise<number | QueryServicesError>;
+    redeemCode(code: string): Promise<{ result: string; eggsGiven: number; itemIds: number[]; } | QueryServicesError>;
+    claimURLReward(reward: string): Promise<{ result: string; eggsGiven: number; itemIds: number[]; } | QueryServicesError>;
+    claimSocialReward(rewardTag: string): Promise<{ result: string; eggsGiven: number; itemIds: number[]; } | QueryServicesError>;
+    buyItem(itemId: number): Promise<{ result: string; currentBalance: number; itemId: number; } | QueryServicesError>;
 
     leave(code?: number): void;
     logout(): void;

package/dist/types/socket.d.ts

@@ -1,7 +1,17 @@
-import NodeWebSocket from 'ws';
+type Data = string | Buffer | ArrayBuffer | Buffer[];
 
-declare class yolkws extends NodeWebSocket {
+declare class yolkws {
     constructor(url: string, proxy: string);
+
+    tryConnect($tries?: number): Promise<void>;
+
+    onmessage: (data: Data) => void;
+    onopen: () => void;
+    onclose: (code: number, reason: string) => void;
+    onerror: (err: Error) => void;
+
+    send(data: Data): void;
+    close(code?: number, reason?: string): void;
 }
 
 export default yolkws;

package/dist/util.js

@@ -1,3 +1,3 @@
 /* eslint-disable */
 
-import{IsBrowser as p}from"./constants/index.js";const x=async(c,r)=>{if(p)return await(await fetch(`https://esm.sh/gh/yolkorg/maps/maps/${c}.json?${r}`)).json();{const{existsSync:t,mkdirSync:a,readFileSync:f,writeFileSync:z}=await import("node:fs"),{join:o}=await import("node:path"),{homedir:s}=await import("node:os"),e=o(s(),".yolkbot"),n=o(e,"maps");t(e)||a(e),t(n)||a(n);const i=o(n,`${c}-${r}.json`);if(t(i))return JSON.parse(f(i,"utf-8"));const l=await(await fetch(`https://esm.sh/gh/yolkorg/maps/maps/${c}.json?${r}`)).json();return z(i,JSON.stringify(l,null,4),{flag:"w+"}),l}},m=c=>{let r=0;const t={},a=[];for(const o of c)t[o.x]||(t[o.x]={}),t[o.x][o.y]||(t[o.x][o.y]={}),t[o.x][o.y][o.z]={zone:null};const f=[{x:-1,z:0},{x:1,z:0},{x:0,z:-1},{x:0,z:1}],z=(o,s,e)=>t[o]&&t[o][s]&&t[o][s][e]?t[o][s][e]:null;for(const o of c)if(!t[o.x][o.y][o.z].zone){o.zone=++r,t[o.x][o.y][o.z].zone=o.zone;const s=[o];let e;do{e=0;for(const n of c)if(!t[n.x][n.y][n.z].zone)for(const i of f){const l=z(n.x+i.x,n.y,n.z+i.z);if(l&&l.zone===o.zone){e++,n.zone=o.zone,t[n.x][n.y][n.z].zone=o.zone,s.push(n);break}}}while(e>0);a.push(s)}return a};export{x as fetchMap,m as initKotcZones};
+var y=Object.defineProperty;var f=(s,i)=>y(s,"name",{value:i,configurable:!0});import{IsBrowser as x}from"./constants/index.js";const w=f(async(s,i)=>{if(x)return await(await fetch(`https://esm.sh/gh/yolkorg/maps/maps/${s}.json?${i}`)).json();{const{existsSync:t,mkdirSync:a,readFileSync:z,writeFileSync:p}=await import("node:fs"),{join:o}=await import("node:path"),{homedir:c}=await import("node:os"),e=o(c(),".yolkbot"),n=o(e,"maps");t(e)||a(e),t(n)||a(n);const r=o(n,`${s}-${i}.json`);if(t(r))return JSON.parse(z(r,"utf-8"));const l=await(await fetch(`https://esm.sh/gh/yolkorg/maps/maps/${s}.json?${i}`)).json();return p(r,JSON.stringify(l,null,4),{flag:"w+"}),l}},"fetchMap"),h=f(s=>{let i=0;const t={},a=[];for(const o of s)t[o.x]||(t[o.x]={}),t[o.x][o.y]||(t[o.x][o.y]={}),t[o.x][o.y][o.z]={zone:null};const z=[{x:-1,z:0},{x:1,z:0},{x:0,z:-1},{x:0,z:1}],p=f((o,c,e)=>t[o]&&t[o][c]&&t[o][c][e]?t[o][c][e]:null,"getMapCellAt");for(const o of s)if(!t[o.x][o.y][o.z].zone){o.zone=++i,t[o.x][o.y][o.z].zone=o.zone;const c=[o];let e;do{e=0;for(const n of s)if(!t[n.x][n.y][n.z].zone)for(const r of z){const l=p(n.x+r.x,n.y,n.z+r.z);if(l&&l.zone===o.zone){e++,n.zone=o.zone,t[n.x][n.y][n.z].zone=o.zone,c.push(n);break}}}while(e>0);a.push(c)}return a},"initKotcZones");export{w as fetchMap,h as initKotcZones};