yolkbot 0.1.1-alpha.8 → 0.1.1

package/src/constants/maps.js

@@ -127,7 +127,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -335,7 +335,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -348,7 +348,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -400,7 +400,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -491,7 +491,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "14"
     },
     {
@@ -574,7 +574,7 @@ export const Maps = [
     },
     {
         "filename": "metamorph",
-        "hash": "hlpma5zbhi",
+        "hash": "l9o69l8e1b",
         "name": "Metamorph",
         "modes": {
             "FFA": true,
@@ -582,7 +582,7 @@ export const Maps = [
             "Spatula": true,
             "King": false
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "14"
     },
     {
@@ -634,7 +634,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -764,7 +764,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "14"
     },
     {
@@ -816,7 +816,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "16"
     },
     {
@@ -829,7 +829,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "18"
     },
     {
@@ -972,7 +972,7 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
         "numPlayers": "18"
     },
     {
@@ -1024,7 +1024,7 @@ export const Maps = [
             "Spatula": true,
             "King": false
         },
-        "availability": "both",
+        "availability": "private",
         "numPlayers": "12"
     },
     {
@@ -1076,7 +1076,20 @@ export const Maps = [
             "Spatula": true,
             "King": true
         },
-        "availability": "private",
+        "availability": "both",
+        "numPlayers": "18"
+    },
+    {
+        "filename": "yolkido",
+        "hash": "127ppvq4k6n",
+        "name": "Yolkido Garrison",
+        "modes": {
+            "FFA": true,
+            "Teams": true,
+            "Spatula": true,
+            "King": true
+        },
+        "availability": "both",
         "numPlayers": "18"
     }
 ];

package/src/dispatches/BootPlayerDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class BootPlayerDispatch {
     constructor(uniqueId) {
@@ -10,7 +11,10 @@ export class BootPlayerDispatch {
     }
 
     execute(bot) {
-        new packet.BootPacket(this.uniqueId).execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.bootPlayer);
+        out.packString(this.uniqueId);
+        out.send(bot.game.socket);
     }
 }
 

package/src/dispatches/ChatDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class ChatDispatch {
     constructor(msg, noLimit = false) {
@@ -17,7 +18,11 @@ export class ChatDispatch {
     }
 
     execute(bot) {
-        new packet.ChatPacket(this.msg).execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.chat);
+        out.packString(this.msg);
+        out.send(bot.game.socket);
+
         bot.lastChatTime = Date.now();
     }
 }

package/src/dispatches/GameOptionsDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 const regenScale = [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 2.25, 2.5, 2.75, 3, 3.25, 3.5, 3.75, 4];
 
@@ -21,7 +22,24 @@ export class GameOptionsDispatch {
     }
 
     execute(bot) {
-        new packet.GameOptionsPacket(bot.game.options).execute(bot.game.socket);
+        const flags =
+            (bot.game.options.locked ? 1 : 0) |
+            (bot.game.options.noTeamChange ? 2 : 0) |
+            (bot.game.options.noTeamShuffle ? 4 : 0);
+
+        const out = CommOut.getBuffer();
+
+        out.packInt8(CommCode.gameOptions);
+        out.packInt8(bot.game.options.gravity * 4);
+        out.packInt8(bot.game.options.damage * 4);
+        out.packInt8(bot.game.options.healthRegen * 4);
+        out.packInt8(flags);
+
+        bot.game.options.weaponsDisabled.forEach((v) => {
+            out.packInt8(v ? 1 : 0);
+        });
+
+        out.send(bot.game.socket);
     }
 }
 

package/src/dispatches/MeleeDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class MeleeDispatch {
     check(bot) {
@@ -6,17 +7,18 @@ export class MeleeDispatch {
     }
 
     execute(bot) {
-        new packet.MeleePacket().execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.melee);
+        out.send(bot.game.socket);
+
         bot.usingMelee = true;
 
         // gameloop every 33.33 (repeating) ms, 17 ticks, so 566.61 is the closest you get
         setTimeout(() => {
-            // new ChatDispatch('end melee, start swap gun').execute(player);
             bot.usingMelee = false
             bot.swappingGun = true
 
             setTimeout(() => {
-                // new ChatDispatch('end swap gun').execute(player);
                 bot.swappingGun = false
             }, 0.5 * bot.me.weapons[0].equipTime)
         }, 566.61);

package/src/dispatches/PauseDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class PauseDispatch {
     check(bot) {
@@ -6,8 +7,11 @@ export class PauseDispatch {
     }
 
     execute(bot) {
-        new packet.PausePacket().execute(bot.game.socket);
-        setTimeout(() => bot.me.playing = false, 3000); 
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.pause);
+        out.send(bot.game.socket);
+
+        setTimeout(() => bot.me.playing = false, 3000);
     }
 }
 

package/src/dispatches/ReloadDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class ReloadDispatch {
     check(bot) {
@@ -6,7 +7,9 @@ export class ReloadDispatch {
     }
 
     execute(bot) {
-        new packet.ReloadPacket().execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.reload);
+        out.send(bot.game.socket);
 
         const playerActiveWeapon = bot.me.weapons[bot.me.activeGun];
 

package/src/dispatches/ReportPlayerDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class ReportPlayerDispatch {
     constructor(idOrName, reasons = {}) {
@@ -39,7 +40,11 @@ export class ReportPlayerDispatch {
 
         if (!target) throw new Error('target player for ReportPlayerDispatch not found')
 
-        new packet.ReportPacket(target, this.reasonInt).execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.reportPlayer);
+        out.packString(target);
+        out.packInt8(this.reasonInt);
+        out.send(bot.game.socket);
     }
 }
 

package/src/dispatches/SaveLoadoutDispatch.js

@@ -1,9 +1,10 @@
 /* eslint-disable stylistic/max-len */
 
-import { queryServices } from '#api';
-import { findItemById, GunList, ItemTypes } from '#constants';
+import { queryServices } from '../api.js';
+import { findItemById, GunList, ItemTypes } from '../constants/index.js';
 
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 const isDefault = (itemId) => findItemById(itemId) && findItemById(itemId).unlock == 'default';
 const isType = (itemId, type) => findItemById(itemId) && findItemById(itemId).item_type_id == type;
@@ -89,8 +90,12 @@ export class SaveLoadoutDispatch {
         bot.account.loadout = loadout;
 
         saveLoadout.then(() => {
-            if (bot.state.joinedGame)
-                new packet.ChangeCharacterPacket(this.changes?.classIdx || bot.me.selectedGun).execute(bot.game.socket);
+            if (bot.state.joinedGame) {
+                const out = CommOut.getBuffer();
+                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);
 
@@ -102,7 +107,7 @@ export class SaveLoadoutDispatch {
                 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 = findItemById(changeValue[bot.me.selectedGun]);
+                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;
             })
         })

package/src/dispatches/SpawnDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class SpawnDispatch {
     check(bot) {
@@ -8,7 +9,9 @@ export class SpawnDispatch {
     }
 
     execute(bot) {
-        new packet.RespawnPacket().execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.requestRespawn);
+        out.send(bot.game.socket);
 
         bot.lastSpawnedTime = Date.now();
         bot.me.playing = true;

package/src/dispatches/SwapWeaponDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class SwapWeaponDispatch {
     check(bot) {
@@ -7,7 +8,11 @@ export class SwapWeaponDispatch {
 
     execute(bot) {
         bot.me.activeGun = +!bot.me.activeGun;
-        new packet.SwapWeaponPacket(bot.me.activeGun).execute(bot.game.socket);
+        
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.swapWeapon);
+        out.packInt8(bot.me.activeGun);
+        out.send(bot.game.socket);
     }
 }
 

package/src/dispatches/SwitchTeamDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class SwitchTeamDispatch {
     check(bot) {
@@ -24,7 +25,9 @@ export class SwitchTeamDispatch {
     }
 
     execute(bot) {
-        new packet.TeamSwitchingTraitorPacket().execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.switchTeam);
+        out.send(bot.game.socket);
     }
 }
 

package/src/dispatches/ThrowGrenadeDispatch.js

@@ -1,4 +1,5 @@
-import packet from '#packet';
+import CommOut from '../comm/CommOut.js';
+import { CommCode } from '../constants/codes.js';
 
 export class ThrowGrenadeDispatch {
     constructor(power = 1) {
@@ -15,7 +16,10 @@ export class ThrowGrenadeDispatch {
     }
 
     execute(bot) {
-        new packet.ThrowGrenadePacket(this.power).execute(bot.game.socket);
+        const out = CommOut.getBuffer();
+        out.packInt8(CommCode.throwGrenade);
+        out.packFloat(this.power);
+        out.send(bot.game.socket);
     }
 }
 

package/src/globals.js

@@ -0,0 +1,15 @@
+const globals = {};
+
+if (typeof process !== 'undefined') {
+    globals.fetch = (await import('undici')).fetch;
+    globals.SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
+    globals.ProxyAgent = (await import('undici')).ProxyAgent;
+    globals.WebSocket = (await import('ws')).default;
+} else {
+    globals.fetch = fetch;
+    globals.SocksProxyAgent = undefined;
+    globals.ProxyAgent = class {};
+    globals.WebSocket = WebSocket;
+}
+
+export default globals;

package/src/matchmaker.js

@@ -1,5 +1,5 @@
-import { loginAnonymously } from '#api';
-import { GameModes, PlayTypes, ProxiesEnabled } from '#constants';
+import { loginAnonymously } from './api.js';
+import { GameModes, PlayTypes, ProxiesEnabled } from './constants/index.js';
 
 import yolkws from './socket.js';
 
@@ -10,14 +10,11 @@ export class Matchmaker {
     proxy = null;
     sessionId = '';
 
-    forceClose = false;
-
     onListeners = new Map();
     onceListeners = new Map();
 
-    // sessionId: string, a custom session id
-    // proxy: a socks5 proxy string
-    // instance: a custom game instance
+    #forceClose = false;
+
     constructor(params = {}) {
         if (!params.instance) params.instance = 'shellshock.io';
 
@@ -34,6 +31,11 @@ export class Matchmaker {
         const attempt = async () => {
             try {
                 this.ws = new yolkws(`wss://${instance}/matchmaker/`, this.proxy);
+                this.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();
@@ -44,6 +46,8 @@ export class Matchmaker {
 
         this.ws.onopen = () => {
             this.connected = true;
+            this.ws.onerror = null;
+
             if (this.sessionId) {
                 this.onceConnected.forEach(func => func());
             }
@@ -55,7 +59,7 @@ export class Matchmaker {
         }
 
         this.ws.onclose = () => {
-            if (this.forceClose) return;
+            if (this.#forceClose) return;
 
             this.connected = false;
             this.#createSocket(instance);
@@ -159,7 +163,7 @@ export class Matchmaker {
     }
 
     close() {
-        this.forceClose = true;
+        this.#forceClose = true;
         this.ws.close();
     }
 

package/src/pathing/astar.js

@@ -1,27 +1,17 @@
-import { NodeList } from './mapnode.js';
 import { BinaryHeap } from './binaryheap.js';
 
-function printPath(path) {
-    for (const item of path) {
-        console.log(item.position);
-    }
-} // have it your way eslint
-
 export default class AStar {
     constructor(list) {
         this.list = list;
-
-        if (!typeof list == NodeList) {
-            throw new Error('AStar requires a NodeList');
-        }
     }
 
-    heuristic(pos1, pos2) { // @1ust Taxicab3D!
+    heuristic(pos1, pos2) {
         return Math.abs(pos1.x - pos2.x) + Math.abs(pos1.y - pos2.y) + Math.abs(pos1.z - pos2.z);
     }
 
     reversePath(node) {
         const path = [];
+
         while (node.parent) {
             path.push(node);
             node = node.parent;
@@ -35,7 +25,6 @@ export default class AStar {
         this.list.clean();
 
         const heap = new BinaryHeap(node => node.f);
-
         const closedSet = [];
 
         start.h = this.heuristic(start, end);
@@ -48,9 +37,7 @@ export default class AStar {
             const current = heap.pop();
 
             if (current === end) {
-                // console.log('done with astar - path found')
                 const val = this.reversePath(current);
-                printPath(val);
                 return val;
             }
 
@@ -61,29 +48,24 @@ export default class AStar {
             for (let i = 0; i < neighbors.length; i++) {
                 const neighbor = neighbors[i];
 
-                if (closedSet.includes(neighbor)) {
-                    continue;
-                }
+                if (closedSet.includes(neighbor)) continue;
 
                 const tentativeGScore = current.g + 1;
                 const visited = neighbor.visited;
+
                 if (!visited || tentativeGScore < neighbor.g) {
                     neighbor.visited = true;
                     neighbor.parent = current;
                     neighbor.g = tentativeGScore;
                     neighbor.h = this.heuristic(neighbor.position, end.position);
                     neighbor.f = neighbor.g + neighbor.h;
-                    if (!visited) {
-                        heap.push(neighbor);
-                    } else {
-                        heap.rescoreElement(neighbor);
-                    }
+
+                    if (!visited) heap.push(neighbor);
+                    else heap.rescoreElement(neighbor);
                 }
             }
         }
 
-        // console.log('done with astar - no path found')
-        // return null if no path has been found
         return null
     }
 }

package/src/pathing/binaryheap.js

@@ -34,13 +34,13 @@ class BinaryHeap {
         // To remove a value, we must search through the array to find
         // it.
         for (let i = 0; i < length; i++) {
-            if (this.content[i] != node) { continue; }
+            if (this.content[i] != node) continue;
             // When it is found, the process seen in 'pop' is repeated
             // to fill up the hole.
             const end = this.content.pop();
             // If the element we popped was the one we needed to remove,
             // we're done.
-            if (i == length - 1) { break; }
+            if (i == length - 1) break;
             // Otherwise, we replace the removed element with the popped
             // one, and allow it to float up or sink down as appropriate.
             this.content[i] = end;
@@ -63,7 +63,7 @@ class BinaryHeap {
             const parentN = Math.floor((n + 1) / 2) - 1, parent = this.content[parentN];
             // If the parent has a lesser score, things are in order and we
             // are done.
-            if (score >= this.scoreFunction(parent)) { break; }
+            if (score >= this.scoreFunction(parent)) break;
 
             // Otherwise, swap the parent with the current element and
             // continue.
@@ -94,16 +94,16 @@ class BinaryHeap {
                 const child1 = this.content[child1N];
                 child1Score = this.scoreFunction(child1);
                 // If the score is less than our element's, we need to swap.
-                if (child1Score < elemScore) { swap = child1N; }
+                if (child1Score < elemScore) swap = child1N;
             }
             // Do the same checks for the other child.
             if (child2N < length) {
                 const child2 = this.content[child2N], child2Score = this.scoreFunction(child2);
-                if (child2Score < (swap == null ? elemScore : child1Score)) { swap = child2N; }
+                if (child2Score < (swap == null ? elemScore : child1Score)) swap = child2N;
             }
 
             // No need to swap further, we are done.
-            if (swap == null) { break; }
+            if (swap == null) break;
 
             // Otherwise, swap and continue.
             this.content[n] = this.content[swap];