yolkbot 1.4.5 → 1.4.6

package/dist/dispatches/ResetGameDispatch.js

@@ -1 +1,19 @@
-import o from"../comm/CommOut.js";import m from"../constants/CommCode.js";import{GameAction as r}from"../constants/index.js";export class ResetGameDispatch{validate(){return!0}check(e){return e.game.isGameOwner}execute(e){const t=new o;t.packInt8(m.gameAction);t.packInt8(r.Reset);t.send(e.game.socket)}}export default ResetGameDispatch;
+import CommOut from "../comm/CommOut.js";
+import CommCode from "../constants/CommCode.js";
+import { GameAction } from "../constants/index.js";
+
+export class ResetGameDispatch {
+  validate() {
+    return true;
+  }
+  check(bot) {
+    return bot.game.isGameOwner;
+  }
+  execute(bot) {
+    const out = new CommOut;
+    out.packInt8(CommCode.gameAction);
+    out.packInt8(GameAction.Reset);
+    out.send(bot.game.socket);
+  }
+}
+export default ResetGameDispatch;

package/dist/dispatches/SaveLoadoutDispatch.js

@@ -1 +1,105 @@
-import W from"../comm/CommOut.js";import X from"../constants/CommCode.js";import{findItemById as J,GunList as Z,ItemType as N}from"../constants/index.js";const Q=(q)=>J(q)&&J(q).unlock==="default",U=(q,z)=>J(q)&&J(q).item_type_id===z;export class SaveLoadoutDispatch{constructor(q){this.changes={classIdx:q.gunId,hatId:q.hatId,stampId:q.stampId,grenadeId:q.grenadeId,meleeId:q.meleeId,colorIdx:q.eggColor,primaryId:q.primaryIds,secondaryId:q.secondaryIds};this.changes=Object.fromEntries(Object.entries(this.changes).filter(([,z])=>!!z))}validate(q){const z=this.changes;if(z.colorIdx&&z.colorIdx>=7&&!q.account.vip)return!1;if(z.colorIdx&&z.colorIdx>=14)return!1;if(U(z.hatId,N.Hat)&&!Q(z.hatId)&&!q.account.ownedItemIds.includes(z.hatId))return!1;if(U(z.stampId,N.Stamp)&&!Q(z.stampId)&&!q.account.ownedItemIds.includes(z.stampId))return!1;if(U(z.grenadeId,N.Grenade)&&!Q(z.grenadeId)&&!q.account.ownedItemIds.includes(z.grenadeId))return!1;if(U(z.meleeId,N.Melee)&&!Q(z.meleeId)&&!q.account.ownedItemIds.includes(z.meleeId))return!1;if(typeof z.classIdx==="number"&&z.classIdx>6||z.classIdx<0)return!1;if(this.changes.primaryId)for(let M=0;M<7;M++){const E=this.changes.primaryId[M];if(!U(E,N.Primary)||!Q(E)&&!q.account.ownedItemIds.includes(E))return!1}if(this.changes.secondaryId)for(let M=0;M<7;M++){const E=this.changes.secondaryId[M];if(!U(E,N.Secondary)||!Q(E)&&!q.account.ownedItemIds.includes(E))return!1}return!0}check(q){return!q.me.playing}execute(q){if(q.me&&this.changes.classIdx&&this.changes.classIdx!==q.me.selectedGun)q.me.weapons[0]=new Z[this.changes.classIdx];q.state.weaponIdx=this.changes.classIdx||q.state.weaponIdx;const z={...q.account.loadout,...this.changes},M=q.api.queryServices({cmd:"saveLoadout",save:!0,firebaseId:q.account.firebaseId,sessionId:q.account.sessionId,loadout:z});q.account.loadout=z;if(q.me)M.then(()=>{if(q.state.inGame){const H=new W;H.packInt8(X.changeCharacter);H.packInt8(this.changes?.classIdx||q.me.selectedGun);H.send(q.game.socket)}const E=q.intents.includes(q.Intents.COSMETIC_DATA);Object.entries(this.changes).forEach(([H,F])=>{if(H==="classIdx")q.me.selectedGun=F;else if(H==="hatId")q.me.character.hat=E?J(F):F;else if(H==="stampId")q.me.character.stamp=E?J(F):F;else if(H==="grenadeId")q.me.character.grenade=E?J(F):F;else if(H==="meleeId")q.me.character.melee=E?J(F):F;else if(H==="colorIdx")q.me.character.eggColor=F;else if(H==="primaryId")q.me.character.primaryGun=E?J(F[q.me.selectedGun]):F;else if(H==="secondaryId")q.me.character.secondaryGun=E?J(F[q.me.selectedGun]):F})})}}export default SaveLoadoutDispatch;
+import CommOut from "../comm/CommOut.js";
+import CommCode from "../constants/CommCode.js";
+import { findItemById, GunList, ItemType } from "../constants/index.js";
+const isDefault = (itemId) => findItemById(itemId) && findItemById(itemId).unlock === "default";
+const isType = (itemId, type) => findItemById(itemId) && findItemById(itemId).item_type_id === type;
+
+export class SaveLoadoutDispatch {
+  constructor(opts) {
+    this.changes = {
+      classIdx: opts.gunId,
+      hatId: opts.hatId,
+      stampId: opts.stampId,
+      grenadeId: opts.grenadeId,
+      meleeId: opts.meleeId,
+      colorIdx: opts.eggColor,
+      primaryId: opts.primaryIds,
+      secondaryId: opts.secondaryIds
+    };
+    this.changes = Object.fromEntries(Object.entries(this.changes).filter(([, v]) => !!v));
+  }
+  validate(bot) {
+    const load = this.changes;
+    if (load.colorIdx && load.colorIdx >= 7 && !bot.account.vip)
+      return false;
+    if (load.colorIdx && load.colorIdx >= 14)
+      return false;
+    if (isType(load.hatId, ItemType.Hat) && !isDefault(load.hatId) && !bot.account.ownedItemIds.includes(load.hatId))
+      return false;
+    if (isType(load.stampId, ItemType.Stamp) && !isDefault(load.stampId) && !bot.account.ownedItemIds.includes(load.stampId))
+      return false;
+    if (isType(load.grenadeId, ItemType.Grenade) && !isDefault(load.grenadeId) && !bot.account.ownedItemIds.includes(load.grenadeId))
+      return false;
+    if (isType(load.meleeId, ItemType.Melee) && !isDefault(load.meleeId) && !bot.account.ownedItemIds.includes(load.meleeId))
+      return false;
+    if (typeof load.classIdx === "number" && load.classIdx > 6 || load.classIdx < 0)
+      return false;
+    if (this.changes.primaryId) {
+      for (let i = 0;i < 7; i++) {
+        const testingId = this.changes.primaryId[i];
+        if (!isType(testingId, ItemType.Primary) || !isDefault(testingId) && !bot.account.ownedItemIds.includes(testingId)) {
+          return false;
+        }
+      }
+    }
+    if (this.changes.secondaryId) {
+      for (let i = 0;i < 7; i++) {
+        const testingId = this.changes.secondaryId[i];
+        if (!isType(testingId, ItemType.Secondary) || !isDefault(testingId) && !bot.account.ownedItemIds.includes(testingId)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  check(bot) {
+    return !bot.me.playing;
+  }
+  execute(bot) {
+    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
+    };
+    const saveLoadout = bot.api.queryServices({
+      cmd: "saveLoadout",
+      save: true,
+      firebaseId: bot.account.firebaseId,
+      sessionId: bot.account.sessionId,
+      loadout
+    });
+    bot.account.loadout = loadout;
+    if (bot.me)
+      saveLoadout.then(() => {
+        if (bot.state.inGame) {
+          const out = new CommOut;
+          out.packInt8(CommCode.changeCharacter);
+          out.packInt8(this.changes?.classIdx || bot.me.selectedGun);
+          out.send(bot.game.socket);
+        }
+        const findCosmetics = bot.intents.includes(bot.Intents.COSMETIC_DATA);
+        Object.entries(this.changes).forEach(([changeKey, changeValue]) => {
+          if (changeKey === "classIdx")
+            bot.me.selectedGun = changeValue;
+          else if (changeKey === "hatId")
+            bot.me.character.hat = findCosmetics ? findItemById(changeValue) : changeValue;
+          else if (changeKey === "stampId")
+            bot.me.character.stamp = findCosmetics ? findItemById(changeValue) : changeValue;
+          else if (changeKey === "grenadeId")
+            bot.me.character.grenade = findCosmetics ? findItemById(changeValue) : changeValue;
+          else if (changeKey === "meleeId")
+            bot.me.character.melee = findCosmetics ? findItemById(changeValue) : changeValue;
+          else if (changeKey === "colorIdx")
+            bot.me.character.eggColor = changeValue;
+          else if (changeKey === "primaryId")
+            bot.me.character.primaryGun = findCosmetics ? findItemById(changeValue[bot.me.selectedGun]) : changeValue;
+          else if (changeKey === "secondaryId")
+            bot.me.character.secondaryGun = findCosmetics ? findItemById(changeValue[bot.me.selectedGun]) : changeValue;
+        });
+      });
+  }
+}
+export default SaveLoadoutDispatch;

package/dist/dispatches/SpawnDispatch.js

@@ -1 +1,22 @@
-import r from"../comm/CommOut.js";import n from"../constants/CommCode.js";export class SpawnDispatch{validate(){return!0}check(e){if(e.me.playing)return!1;if(e.lastDeathTime+6000<Date.now())return!1;if(e.intents.includes(e.Intents.OBSERVE_GAME))return!1;return!0}execute(e){const t=new r;t.packInt8(n.requestRespawn);t.send(e.game.socket);e.state.buffer=[]}}export default SpawnDispatch;
+import CommOut from "../comm/CommOut.js";
+import CommCode from "../constants/CommCode.js";
+
+export class SpawnDispatch {
+  validate() {
+    return true;
+  }
+  check(bot) {
+    if (bot.me.playing)
+      return false;
+    if (bot.intents.includes(bot.Intents.OBSERVE_GAME))
+      return false;
+    return true;
+  }
+  execute(bot) {
+    const out = new CommOut;
+    out.packInt8(CommCode.requestRespawn);
+    out.send(bot.game.socket);
+    bot.state.buffer = [];
+  }
+}
+export default SpawnDispatch;

package/dist/dispatches/SwapWeaponDispatch.js

@@ -1 +1,25 @@
-import t from"../comm/CommOut.js";import m from"../constants/CommCode.js";export class SwapWeaponDispatch{constructor(e){this.manualWeapon=e}validate(){return typeof this.manualWeapon==="number"||typeof this.manualWeapon>"u"}check(e){return e.me.playing&&!e.state.reloading&&!e.state.swappingGun&&!e.state.usingMelee}execute(e){let n=+!e.me.activeGun;if(typeof this.manualWeapon==="number")n=this.manualWeapon;e.me.activeGun=n;const a=new t;a.packInt8(m.swapWeapon);a.packInt8(e.me.activeGun);a.send(e.game.socket)}}export default SwapWeaponDispatch;
+import CommOut from "../comm/CommOut.js";
+import CommCode from "../constants/CommCode.js";
+
+export class SwapWeaponDispatch {
+  constructor(manualWeapon) {
+    this.manualWeapon = manualWeapon;
+  }
+  validate() {
+    return typeof this.manualWeapon === "number" || typeof this.manualWeapon === "undefined";
+  }
+  check(bot) {
+    return bot.me.playing && !bot.state.reloading && !bot.state.swappingGun && !bot.state.usingMelee;
+  }
+  execute(bot) {
+    let chosenWeapon = +!bot.me.activeGun;
+    if (typeof this.manualWeapon === "number")
+      chosenWeapon = this.manualWeapon;
+    bot.me.activeGun = chosenWeapon;
+    const out = new CommOut;
+    out.packInt8(CommCode.swapWeapon);
+    out.packInt8(bot.me.activeGun);
+    out.send(bot.game.socket);
+  }
+}
+export default SwapWeaponDispatch;

package/dist/dispatches/SwitchTeamDispatch.js

@@ -1 +1,33 @@
-import B from"../comm/CommOut.js";import E from"../constants/CommCode.js";export class SwitchTeamDispatch{validate(){return!0}check(f){if(!f.state.inGame||f.me.playing)return!1;if(f.game.gameModeId===0)return!1;if(f.intents.includes(f.Intents.OBSERVE_GAME))return!1;if(f.game.isPrivate)return!f.game.options.noTeamChange;const k=f.players,x=f.me.team,z=k.filter((q)=>q.team===x).length,A=k.filter((q)=>q.team!==x).length;if(A>z)return!1;if(z===A)return!1;return!0}execute(f){const k=new B;k.packInt8(E.switchTeam);k.send(f.game.socket)}}export default SwitchTeamDispatch;
+import CommOut from "../comm/CommOut.js";
+import CommCode from "../constants/CommCode.js";
+
+export class SwitchTeamDispatch {
+  validate() {
+    return true;
+  }
+  check(bot) {
+    if (!bot.state.inGame || bot.me.playing)
+      return false;
+    if (bot.game.gameModeId === 0)
+      return false;
+    if (bot.intents.includes(bot.Intents.OBSERVE_GAME))
+      return false;
+    if (bot.game.isPrivate)
+      return !bot.game.options.noTeamChange;
+    const players = bot.players;
+    const myTeam = bot.me.team;
+    const playersWithMyTeam = players.filter((player) => player.team === myTeam).length;
+    const playersWithOtherTeam = players.filter((player) => player.team !== myTeam).length;
+    if (playersWithOtherTeam > playersWithMyTeam)
+      return false;
+    if (playersWithMyTeam === playersWithOtherTeam)
+      return false;
+    return true;
+  }
+  execute(bot) {
+    const out = new CommOut;
+    out.packInt8(CommCode.switchTeam);
+    out.send(bot.game.socket);
+  }
+}
+export default SwitchTeamDispatch;

package/dist/dispatches/ThrowGrenadeDispatch.js

@@ -1 +1,21 @@
-import r from"../comm/CommOut.js";import o from"../constants/CommCode.js";export class ThrowGrenadeDispatch{constructor(e=1){this.power=e}validate(){return typeof this.power==="number"&&this.power>=0&&this.power<=1}check(e){return e.me.playing&&!e.state.reloading&&!e.state.swappingGun&&!e.state.usingMelee}execute(e){const t=new r;t.packInt8(o.throwGrenade);t.packFloat(this.power);t.send(e.game.socket)}}export default ThrowGrenadeDispatch;
+import CommOut from "../comm/CommOut.js";
+import CommCode from "../constants/CommCode.js";
+
+export class ThrowGrenadeDispatch {
+  constructor(power = 1) {
+    this.power = power;
+  }
+  validate() {
+    return typeof this.power === "number" && this.power >= 0 && this.power <= 1;
+  }
+  check(bot) {
+    return bot.me.playing && !bot.state.reloading && !bot.state.swappingGun && !bot.state.usingMelee;
+  }
+  execute(bot) {
+    const out = new CommOut;
+    out.packInt8(CommCode.throwGrenade);
+    out.packFloat(this.power);
+    out.send(bot.game.socket);
+  }
+}
+export default ThrowGrenadeDispatch;

package/dist/dispatches/index.js

@@ -1 +1,74 @@
-import BanPlayerDispatch from"./BanPlayerDispatch.js";import BootPlayerDispatch from"./BootPlayerDispatch.js";import ChatDispatch from"./ChatDispatch.js";import FireDispatch from"./FireDispatch.js";import GameOptionsDispatch from"./GameOptionsDispatch.js";import GoToAmmoDispatch from"./GoToAmmoDispatch.js";import GoToCoopDispatch from"./GoToCoopDispatch.js";import GoToGrenadeDispatch from"./GoToGrenadeDispatch.js";import GoToPlayerDispatch from"./GoToPlayerDispatch.js";import GoToSpatulaDispatch from"./GoToSpatulaDispatch.js";import LookAtDispatch from"./LookAtDispatch.js";import LookAtPosDispatch from"./LookAtPosDispatch.js";import MeleeDispatch from"./MeleeDispatch.js";import MovementDispatch from"./MovementDispatch.js";import PauseDispatch from"./PauseDispatch.js";import ReloadDispatch from"./ReloadDispatch.js";import ReportPlayerDispatch from"./ReportPlayerDispatch.js";import ResetGameDispatch from"./ResetGameDispatch.js";import SaveLoadoutDispatch from"./SaveLoadoutDispatch.js";import SpawnDispatch from"./SpawnDispatch.js";import SwapWeaponDispatch from"./SwapWeaponDispatch.js";import SwitchTeamDispatch from"./SwitchTeamDispatch.js";import ThrowGrenadeDispatch from"./ThrowGrenadeDispatch.js";export{BanPlayerDispatch,BootPlayerDispatch,ChatDispatch,FireDispatch,GameOptionsDispatch,GoToAmmoDispatch,GoToCoopDispatch,GoToGrenadeDispatch,GoToPlayerDispatch,GoToSpatulaDispatch,LookAtDispatch,LookAtPosDispatch,MeleeDispatch,MovementDispatch,PauseDispatch,ReloadDispatch,ReportPlayerDispatch,ResetGameDispatch,SaveLoadoutDispatch,SpawnDispatch,SwapWeaponDispatch,SwitchTeamDispatch,ThrowGrenadeDispatch};export default {BanPlayerDispatch,BootPlayerDispatch,ChatDispatch,FireDispatch,GameOptionsDispatch,GoToAmmoDispatch,GoToCoopDispatch,GoToGrenadeDispatch,GoToPlayerDispatch,GoToSpatulaDispatch,LookAtDispatch,LookAtPosDispatch,MeleeDispatch,MovementDispatch,PauseDispatch,ReloadDispatch,ReportPlayerDispatch,ResetGameDispatch,SaveLoadoutDispatch,SpawnDispatch,SwapWeaponDispatch,SwitchTeamDispatch,ThrowGrenadeDispatch};
+import BanPlayerDispatch from "./BanPlayerDispatch.js";
+import BootPlayerDispatch from "./BootPlayerDispatch.js";
+import ChatDispatch from "./ChatDispatch.js";
+import FireDispatch from "./FireDispatch.js";
+import GameOptionsDispatch from "./GameOptionsDispatch.js";
+import GoToAmmoDispatch from "./GoToAmmoDispatch.js";
+import GoToCoopDispatch from "./GoToCoopDispatch.js";
+import GoToGrenadeDispatch from "./GoToGrenadeDispatch.js";
+import GoToPlayerDispatch from "./GoToPlayerDispatch.js";
+import GoToSpatulaDispatch from "./GoToSpatulaDispatch.js";
+import LookAtDispatch from "./LookAtDispatch.js";
+import LookAtPosDispatch from "./LookAtPosDispatch.js";
+import MeleeDispatch from "./MeleeDispatch.js";
+import MovementDispatch from "./MovementDispatch.js";
+import PauseDispatch from "./PauseDispatch.js";
+import ReloadDispatch from "./ReloadDispatch.js";
+import ReportPlayerDispatch from "./ReportPlayerDispatch.js";
+import ResetGameDispatch from "./ResetGameDispatch.js";
+import SaveLoadoutDispatch from "./SaveLoadoutDispatch.js";
+import SpawnDispatch from "./SpawnDispatch.js";
+import SwapWeaponDispatch from "./SwapWeaponDispatch.js";
+import SwitchTeamDispatch from "./SwitchTeamDispatch.js";
+import ThrowGrenadeDispatch from "./ThrowGrenadeDispatch.js";
+
+export {
+  BanPlayerDispatch,
+  BootPlayerDispatch,
+  ChatDispatch,
+  FireDispatch,
+  GameOptionsDispatch,
+  GoToAmmoDispatch,
+  GoToCoopDispatch,
+  GoToGrenadeDispatch,
+  GoToPlayerDispatch,
+  GoToSpatulaDispatch,
+  LookAtDispatch,
+  LookAtPosDispatch,
+  MeleeDispatch,
+  MovementDispatch,
+  PauseDispatch,
+  ReloadDispatch,
+  ReportPlayerDispatch,
+  ResetGameDispatch,
+  SaveLoadoutDispatch,
+  SpawnDispatch,
+  SwapWeaponDispatch,
+  SwitchTeamDispatch,
+  ThrowGrenadeDispatch
+};
+export default {
+  BanPlayerDispatch,
+  BootPlayerDispatch,
+  ChatDispatch,
+  FireDispatch,
+  GameOptionsDispatch,
+  GoToAmmoDispatch,
+  GoToCoopDispatch,
+  GoToGrenadeDispatch,
+  GoToPlayerDispatch,
+  GoToSpatulaDispatch,
+  LookAtDispatch,
+  LookAtPosDispatch,
+  MeleeDispatch,
+  MovementDispatch,
+  PauseDispatch,
+  ReloadDispatch,
+  ReportPlayerDispatch,
+  ResetGameDispatch,
+  SaveLoadoutDispatch,
+  SpawnDispatch,
+  SwapWeaponDispatch,
+  SwitchTeamDispatch,
+  ThrowGrenadeDispatch
+};

package/dist/env/fetch.js

@@ -1,15 +1,102 @@
-import{socksConnect as B}from"wwws";const H=(o,{method:f,pathname:k,hostname:u,port:g,headers:a,body:d},L)=>{let m="";for(const[l,t]of Object.entries(a))m+=`${l}: ${t}\r
-`;if(d&&!("Content-Length"in a))m+=`Content-Length: ${Buffer.byteLength(d)}\r
-`;let r=`${f} ${k} HTTP/1.1\r
-Host: ${u}:${g}\r
-${m}Connection: close\r
+import { socksConnect } from "wwws";
+import globals from "./globals.js";
+const sendHttpRequest = (socket, { method, pathname, hostname, port, headers, body }, resolve) => {
+  let reqHeaders = "";
+  for (const [k, v] of Object.entries(headers))
+    reqHeaders += `${k}: ${v}\r
+`;
+  if (body && !("Content-Length" in headers))
+    reqHeaders += `Content-Length: ${Buffer.byteLength(body)}\r
+`;
+  let req = `${method} ${pathname} HTTP/1.1\r
+Host: ${hostname}:${port}\r
+${reqHeaders}Connection: close\r
 \r
-`;if(d)r+=d;o.write(r);let n="";o.on("data",(l)=>{n+=l.toString();if(/transfer-encoding:\s*chunked/i.test(n)){if(n.includes(`\r
+`;
+  if (body)
+    req += body;
+  socket.write(req);
+  let response = "";
+  socket.on("data", (data) => {
+    response += data.toString();
+    if (/transfer-encoding:\s*chunked/i.test(response)) {
+      if (response.includes(`\r
 0\r
 \r
-`))o.end()}else{const t=n.match(/content-length:\s*(?<len>\d+)/i);if(t){const c=parseInt(t.groups.len,10),i=n.indexOf(`\r
+`))
+        socket.end();
+    } else {
+      const contentLengthMatch = response.match(/content-length:\s*(?<len>\d+)/i);
+      if (contentLengthMatch) {
+        const contentLength = parseInt(contentLengthMatch.groups.len, 10);
+        const bodyStart = response.indexOf(`\r
 \r
-`)+4;if(n.slice(i).length>=c)o.end()}}});o.on("end",()=>{const l=/transfer-encoding:\s*chunked/i.test(n);let t=n.split(`\r
+`) + 4;
+        const body3 = response.slice(bodyStart);
+        if (body3.length >= contentLength)
+          socket.end();
+      }
+    }
+  });
+  socket.on("end", () => {
+    const isChunked = /transfer-encoding:\s*chunked/i.test(response);
+    let parsedBody = response.split(`\r
 \r
-`)[1];if(l){const c=t,i=[];let e=0;while(e<c.length){const s=c.indexOf(`\r
-`,e);if(s===-1)break;const p=c.slice(e,s).trim(),h=parseInt(p,16);if(h===0)break;e=s+2;i.push(c.slice(e,e+h));e+=h+2}t=i.join("")}L({json:()=>JSON.parse(t),text:()=>t})})},y=(o,{method:f="GET",proxy:k,headers:u={},body:g=null}={})=>new Promise((a)=>{if(typeof process>"u"||!process.getBuiltinModule)return fetch(o,{method:f,headers:u,body:g}).then(a);const d=process.getBuiltinModule("node:dns"),L=process.getBuiltinModule("node:net"),m=process.getBuiltinModule("node:tls"),{hostname:r,port:n,pathname:l,protocol:t,search:c}=new URL(o),i=t==="https:",e=l+c,s=n?parseInt(n):i?443:80;if(!k)return d.lookup(r,(w,x)=>{if(w)throw w;const $=i?m.connect({port:s,host:x,servername:r}):L.connect({port:s,host:x});$.on("connect",()=>H($,{method:f,pathname:e,hostname:r,port:s,headers:u,body:g},a))});const p=new URL(k),h=p.protocol.replace(":","");if(h!=="socks5"&&h!=="socks5h")throw Error("iFetch only supports socks5 & socks5h proxies");B({proxy:{hostname:p.hostname,port:Number(p.port),username:p.username,password:p.password},destHost:r,destPort:s,useTLS:i,resolveDnsLocally:p.protocol==="socks5"}).then((w)=>H(w,{method:f,pathname:e,hostname:r,port:s,headers:u,body:g},a))});export default y;
+`)[1];
+    if (isChunked) {
+      const body2 = parsedBody;
+      const chunks = [];
+      let i = 0;
+      while (i < body2.length) {
+        const rnIdx = body2.indexOf(`\r
+`, i);
+        if (rnIdx === -1)
+          break;
+        const sizeHex = body2.slice(i, rnIdx).trim();
+        const size = parseInt(sizeHex, 16);
+        if (size === 0)
+          break;
+        i = rnIdx + 2;
+        chunks.push(body2.slice(i, i + size));
+        i += size + 2;
+      }
+      parsedBody = chunks.join("");
+    }
+    resolve({ json: () => JSON.parse(parsedBody), text: () => parsedBody });
+  });
+};
+const iFetch = (url, { method = "GET", proxy, headers = {}, body = null } = {}) => new Promise((resolve) => {
+  if (typeof process === "undefined" || !process.getBuiltinModule)
+    return globals.fetch(url, { method, headers, body }).then(resolve);
+  const dns = process.getBuiltinModule("node:dns");
+  const net = process.getBuiltinModule("node:net");
+  const tls = process.getBuiltinModule("node:tls");
+  const { hostname, port: rawPort, pathname: path, protocol, search } = new URL(url);
+  const isHttps = protocol === "https:";
+  const pathname = path + search;
+  const port = rawPort ? parseInt(rawPort) : isHttps ? 443 : 80;
+  if (!proxy)
+    return dns.lookup(hostname, { family: 4 }, (err, host) => {
+      if (err)
+        throw err;
+      const socket = isHttps ? tls.connect({ port, host, servername: hostname }) : net.connect({ port, host });
+      socket.on("connect", () => sendHttpRequest(socket, { method, pathname, hostname, port, headers, body }, resolve));
+    });
+  const proxyInfo = new URL(proxy);
+  const scheme = proxyInfo.protocol.replace(":", "");
+  if (scheme !== "socks5" && scheme !== "socks5h")
+    throw new Error("iFetch only supports socks5 & socks5h proxies");
+  socksConnect({
+    proxy: {
+      hostname: proxyInfo.hostname,
+      port: Number(proxyInfo.port),
+      username: proxyInfo.username,
+      password: proxyInfo.password
+    },
+    destHost: hostname,
+    destPort: port,
+    useTLS: isHttps,
+    resolveDnsLocally: proxyInfo.protocol === "socks5"
+  }).then((socket) => sendHttpRequest(socket, { method, pathname, hostname, port, headers, body }, resolve));
+});
+export default iFetch;

package/dist/env/globals.js

@@ -1 +1,15 @@
-import r from"./fetch.js";const e={},o=typeof window<"u"&&typeof HTMLElement<"u",n=typeof WebSocketPair<"u"&&typeof Cloudflare<"u",t=typeof process<"u"&&process.moduleLoadList?.length>0,s=typeof Deno<"u",i=typeof process<"u"&&!!process.versions?.bun;if(!o&&!n&&!t&&!s&&!i)throw Error("yolkbot doesn't know how to run in this environment. Please open an issue on GitHub with information on where you run yolkbot.");e.isBrowser=o;e.isIsolated=!t&&!s&&!i;import{WWWebSocket as d}from"wwws";e.fetch=o||n?globalThis.fetch:r;e.WebSocket=o||n?globalThis.WebSocket:d;export default e;
+import iFetch from "./fetch.js";
+const globals = {};
+const isBrowser = typeof window !== "undefined" && typeof HTMLElement !== "undefined";
+const isWorker = typeof WebSocketPair !== "undefined" && typeof Cloudflare !== "undefined";
+const isNode = typeof process !== "undefined" && process.moduleLoadList?.length > 0;
+const isDeno = typeof Deno !== "undefined";
+const isBun = typeof process !== "undefined" && !!process.versions?.bun;
+if (!isBrowser && !isWorker && !isNode && !isDeno && !isBun)
+  throw new Error("yolkbot doesn't know how to run in this environment. Please open an issue on GitHub with information on where you run yolkbot.");
+globals.isBrowser = isBrowser;
+globals.isIsolated = !isNode && !isDeno && !isBun;
+import { WWWebSocket } from "wwws";
+globals.fetch = isBrowser || isWorker ? (...args) => globalThis.fetch(...args) : iFetch;
+globals.WebSocket = isBrowser || isWorker ? globalThis.WebSocket : WWWebSocket;
+export default globals;

package/dist/index.js

@@ -1,2 +1,14 @@
-const o="\x1B[31m",t="\x1B[32m",r="\x1B[0m";console.error(["\x1B[31m","how NOT to import yolkbot:",'> import yolkbot from "yolkbot";',"\x1B[32m","how to PROPERLY import yolkbot:",'> import yolkbot from "yolkbot/bot";',"please adjust your code.","\x1B[0m"].join(`
-`));
+const red = "\x1B[31m";
+const green = "\x1B[32m";
+const reset = "\x1B[0m";
+console.error([
+  red,
+  "how NOT to import yolkbot:",
+  '> import yolkbot from "yolkbot";',
+  green,
+  "how to PROPERLY import yolkbot:",
+  '> import yolkbot from "yolkbot/bot";',
+  "please adjust your code.",
+  reset
+].join(`
+`));

package/dist/matchmaker.js

@@ -1 +1,141 @@
-import r from"./api.js";import{validate as h}from"./wasm/direct.js";import c from"./env/globals.js";import f from"./socket.js";export class Matchmaker{connected=!1;onceConnected=[];regionList=[];proxy=null;sessionId="";onListeners=new Map;onceListeners=new Map;#e=!1;#t=!1;constructor(s={}){this.#e=s.noExitOnError||!1;if(!s.instance)s.instance="shellshock.io";if(!s.protocol)s.protocol="wss";if(s.api)this.api=s.api;else this.api=new r({proxy:s.proxy,protocol:s.protocol,instance:s.instance,connectionTimeout:s.connectionTimeout});if(s.sessionId||s.noLogin)this.sessionId=s.sessionId;else this.#n();if(s.proxy&&c.isBrowser)this.#i("proxies do not work and hence are not supported in the browser");else if(s.proxy)this.proxy=s.proxy;this.#o(s.instance,s.protocol,s.noLogin,s.connectionTimeout)}async#o(s,i,e,t){this.ws=new f(`${i}://${s}/matchmaker/`,this.proxy);this.ws.connectionTimeout=t||5000;if(!await this.ws.tryConnect())return this.#i("WebSocket did not connect...");this.ws.onmessage=async(o)=>{const n=JSON.parse(o.data);if(n.command==="validateUUID")return this.ws.send(JSON.stringify({command:"validateUUID",hash:await h(n.uuid)}));this.#s("msg",n)};this.ws.onclose=()=>{this.connected=!1;if(!this.#t)this.#o(s,i,e,t)};this.connected=!0;if(this.sessionId||e)this.onceConnected.forEach((o)=>o())}async#n(){const s=await this.api.loginAnonymously();if(!s||typeof s==="string")this.#s("authFail",s);this.sessionId=s.sessionId;if(this.connected)this.onceConnected.forEach((i)=>i())}send(s){this.ws.send(JSON.stringify(s))}async waitForConnect(){return new Promise((s)=>{if(this.connected)s();else this.onceConnected.push(s)})}async getRegions(){await this.waitForConnect();const s=this;return new Promise((i)=>{const e=(t)=>{if(t.command==="regionList"){this.regionList=t.regionList;this.off("msg",e);i(t.regionList)}};this.on("msg",e);this.ws.onerror=(t)=>s.#i("failed to get regions",t);this.ws.send(JSON.stringify({command:"regionList"}))})}close(){this.#t=!0;this.connected=!1;this.ws.close()}on(s,i){if(!this.onListeners.has(s))this.onListeners.set(s,[]);this.onListeners.get(s).push(i)}once(s,i){if(!this.onceListeners.has(s))this.onceListeners.set(s,[]);this.onceListeners.get(s).push(i)}off(s,i){if(this.onListeners.has(s))this.onListeners.set(s,this.onListeners.get(s).filter((e)=>e!==i));if(this.onceListeners.has(s))this.onceListeners.set(s,this.onceListeners.get(s).filter((e)=>e!==i))}#s(s,...i){if(this.onListeners.has(s))this.onListeners.get(s).forEach((e)=>e(...i));if(this.onceListeners.has(s)){this.onceListeners.get(s).forEach((e)=>e(...i));this.onceListeners.delete(s)}}#i(s){if(this.onListeners.has("error"))this.#s("error",s);else if(this.#e)console.error(s);else throw Error(s)}}export default Matchmaker;
+import API from "./api.js";
+import { validate } from "./wasm/direct.js";
+import globals from "./env/globals.js";
+import yolkws from "./socket.js";
+
+export class Matchmaker {
+  connected = false;
+  onceConnected = [];
+  regionList = [];
+  proxy = null;
+  sessionId = "";
+  onListeners = new Map;
+  onceListeners = new Map;
+  #noExitOnError = false;
+  #forceClose = false;
+  constructor(params = {}) {
+    this.#noExitOnError = params.noExitOnError || false;
+    if (!params.instance)
+      params.instance = "shellshock.io";
+    if (!params.protocol)
+      params.protocol = "wss";
+    if (params.api)
+      this.api = params.api;
+    else
+      this.api = new API({
+        proxy: params.proxy,
+        protocol: params.protocol,
+        instance: params.instance,
+        connectionTimeout: params.connectionTimeout
+      });
+    if (params.sessionId || params.noLogin)
+      this.sessionId = params.sessionId;
+    else
+      this.#createSessionId();
+    if (params.proxy && globals.isBrowser)
+      this.#processError("proxies do not work and hence are not supported in the browser");
+    else if (params.proxy)
+      this.proxy = params.proxy;
+    this.#createSocket(params.instance, params.protocol, params.noLogin, params.connectionTimeout);
+  }
+  async#createSocket(instance, protocol, noLogin, connectionTimeout) {
+    this.ws = new yolkws(`${protocol}://${instance}/matchmaker/`, this.proxy);
+    this.ws.connectionTimeout = connectionTimeout || 5000;
+    const didConnect = await this.ws.tryConnect();
+    if (!didConnect)
+      return this.#processError("WebSocket did not connect...");
+    this.ws.onmessage = async (e) => {
+      const data = JSON.parse(e.data);
+      if (data.command === "validateUUID")
+        return this.ws.send(JSON.stringify({ command: "validateUUID", hash: await validate(data.uuid) }));
+      this.#emit("msg", data);
+    };
+    this.ws.onclose = () => {
+      this.connected = false;
+      if (!this.#forceClose)
+        this.#createSocket(instance, protocol, noLogin, connectionTimeout);
+    };
+    this.connected = true;
+    if (this.sessionId || noLogin)
+      this.onceConnected.forEach((func) => func());
+  }
+  async#createSessionId() {
+    const anonLogin = await this.api.loginAnonymously();
+    if (!anonLogin || typeof anonLogin === "string")
+      this.#emit("authFail", anonLogin);
+    this.sessionId = anonLogin.sessionId;
+    if (this.connected)
+      this.onceConnected.forEach((func) => func());
+  }
+  send(msg) {
+    this.ws.send(JSON.stringify(msg));
+  }
+  async waitForConnect() {
+    return new Promise((res) => {
+      if (this.connected) {
+        res();
+      } else {
+        this.onceConnected.push(res);
+      }
+    });
+  }
+  async getRegions() {
+    await this.waitForConnect();
+    const that = this;
+    return new Promise((res) => {
+      const listener = (data2) => {
+        if (data2.command === "regionList") {
+          this.regionList = data2.regionList;
+          this.off("msg", listener);
+          res(data2.regionList);
+        }
+      };
+      this.on("msg", listener);
+      this.ws.onerror = (e2) => that.#processError("failed to get regions", e2);
+      this.ws.send(JSON.stringify({ command: "regionList" }));
+    });
+  }
+  close() {
+    this.#forceClose = true;
+    this.connected = false;
+    this.ws.close();
+  }
+  on(event, callback) {
+    if (!this.onListeners.has(event)) {
+      this.onListeners.set(event, []);
+    }
+    this.onListeners.get(event).push(callback);
+  }
+  once(event, callback) {
+    if (!this.onceListeners.has(event)) {
+      this.onceListeners.set(event, []);
+    }
+    this.onceListeners.get(event).push(callback);
+  }
+  off(event, callback) {
+    if (this.onListeners.has(event)) {
+      this.onListeners.set(event, this.onListeners.get(event).filter((func) => func !== callback));
+    }
+    if (this.onceListeners.has(event)) {
+      this.onceListeners.set(event, this.onceListeners.get(event).filter((func) => func !== callback));
+    }
+  }
+  #emit(event, ...args) {
+    if (this.onListeners.has(event)) {
+      this.onListeners.get(event).forEach((func) => func(...args));
+    }
+    if (this.onceListeners.has(event)) {
+      this.onceListeners.get(event).forEach((func) => func(...args));
+      this.onceListeners.delete(event);
+    }
+  }
+  #processError(error) {
+    if (this.onListeners.has("error"))
+      this.#emit("error", error);
+    else if (this.#noExitOnError)
+      console.error(error);
+    else
+      throw new Error(error);
+  }
+}
+export default Matchmaker;