yolkbot 0.1.1-alpha.2 → 0.1.1-alpha.4

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "yolkbot",
     "description": "create a shell shockers (self) bot in under 10 lines.",
-    "version": "0.1.1-alpha.2",
+    "version": "0.1.1-alpha.4",
     "keywords": [
         "shell shockers",
         "shellshock.io",

package/src/api.js

@@ -2,10 +2,10 @@ import axios from 'axios';
 
 import yolkws from './socket.js';
 
-import { FirebaseKey, IsBrowser, UserAgent } from '#constants';
+import { FirebaseKey, ProxiesEnabled, UserAgent } from '#constants';
 
 let SocksProxyAgent;
-if (!IsBrowser) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
+if (ProxiesEnabled) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
 
 const queryServices = async (request, proxy = '', instance = 'shellshock.io') => {
     let ws;
@@ -91,7 +91,7 @@ async function loginWithCredentials(email, password, prox = '', instance = 'shel
                     'user-agent': UserAgent,
                     'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
                 },
-                httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
+                httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
             })
             body = request.data
             token = body.idToken;
@@ -143,7 +143,7 @@ async function loginWithRefreshToken(refreshToken, prox = '', instance = 'shells
                     'user-agent': UserAgent,
                     'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
                 },
-                httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
+                httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
             })
             body = request.data
             token = body.id_token;
@@ -185,7 +185,7 @@ async function loginAnonymously(prox = '', instance = 'shellshock.io') {
             'user-agent': UserAgent,
             'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
         },
-        httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
+        httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
     });
 
     const token = body.idToken;

package/src/bot.js

@@ -21,6 +21,7 @@ import {
     ItemTypes,
     Movements,
     PlayTypes,
+    ProxiesEnabled,
     ShellStreaks
 } from '#constants';
 
@@ -50,7 +51,7 @@ export class Bot {
     Intents = intents;
 
     constructor(params = {}) {
-        if (params.proxy && IsBrowser)
+        if (params.proxy && !ProxiesEnabled)
             throw new Error('proxies do not work and hence are not supported in the browser');
 
         this.intents = params.intents || [];
@@ -899,7 +900,15 @@ export class Bot {
         const climbing = CommIn.unPackInt8U();
 
         const player = this.players[id];
-        if (!player) return;
+        if (!player || player.id == this.me.id) {
+            for (let i2 = 0; i2 < 3 /* FramesBetweenSyncs */; i2++) {
+                CommIn.unPackInt8U();
+                CommIn.unPackRadU();
+                CommIn.unPackRad();
+                CommIn.unPackInt8U();
+            }
+            return;
+        }
 
         if (player.position.x !== x) player.position.x = x;
         if (player.position.z !== z) player.position.z = z;
@@ -912,24 +921,13 @@ export class Bot {
         if (this.intents.includes(this.Intents.BUFFERS)) {
             if (!player.buffer) return;
 
-            if (player.id == this.me.id) {
-                for (let i2 = 0; i2 < 3 /* FramesBetweenSyncs */; i2++) {
-                    CommIn.unPackInt8U();
-                    CommIn.unPackRadU();
-                    CommIn.unPackRad();
-                    CommIn.unPackInt8U();
-                }
-                return;
-            }
-
-            let yaw, pitch;
             for (let i2 = 0; i2 < 3; i2++) {
                 player.buffer[i2].controlKeys = CommIn.unPackInt8U();
 
-                yaw = CommIn.unPackRadU();
+                const yaw = CommIn.unPackRadU();
                 if (!isNaN(yaw)) player.buffer[i2].yaw_ = yaw
 
-                pitch = CommIn.unPackRad();
+                const pitch = CommIn.unPackRad();
                 if (!isNaN(pitch)) player.buffer[i2].pitch_ = pitch
 
                 CommIn.unPackInt8U();

package/src/constants/index.js

@@ -71,6 +71,8 @@ export const PlayTypes = {
     joinPrivate: 2
 }
 
+export const ProxiesEnabled = !IsBrowser && typeof Bun == 'undefined';
+
 export const ShellStreaks = {
     HardBoiled: 1,
     EggBreaker: 2,

package/src/matchmaker.js

@@ -1,5 +1,5 @@
 import { loginAnonymously } from '#api';
-import { GameModes, IsBrowser, PlayTypes } from '#constants';
+import { GameModes, PlayTypes, ProxiesEnabled } from '#constants';
 
 import yolkws from './socket.js';
 
@@ -21,13 +21,10 @@ export class Matchmaker {
     constructor(params = {}) {
         if (!params.instance) params.instance = 'shellshock.io';
 
-        if (params.proxy && IsBrowser)
-            throw new Error('proxies do not work and hence are not supported in the browser');
-
         if (params.sessionId) this.sessionId = params.sessionId;
         else this.#createSessionId(params.instance);
 
-        if (params.proxy && IsBrowser) throw new Error('proxies do not work and hence are not supported in the browser');
+        if (params.proxy && !ProxiesEnabled) throw new Error('proxies do not work and hence are not supported in the browser');
         else if (params.proxy) this.proxy = params.proxy;
 
         this.#createSocket(params.instance);

package/src/pathing/mapnode.js

@@ -20,11 +20,14 @@ class NodeList {
     constructor(raw) {
         const now = Date.now();
         this.list = [];
-        const addedPositions = new Set();
+        const addedPositions = {};
 
         for (const meshName of Object.keys(raw.data)) {
             for (const nodeData of raw.data[meshName]) {
-                addedPositions.add(`${nodeData.x},${nodeData.y},${nodeData.z}`);
+                addedPositions[(
+                    (nodeData.x << 16) |
+                    (nodeData.y << 8) |
+                    (nodeData.z))] = true;
                 this.add(new MapNode(meshName, nodeData));
             }
         }
@@ -32,8 +35,11 @@ class NodeList {
         for (let x = 0; x < raw.width; x++) {
             for (let y = 0; y < raw.height; y++) {
                 for (let z = 0; z < raw.depth; z++) {
-                    const posKey = `${x},${y},${z}`;
-                    if (!addedPositions.has(posKey)) {
+                    if (!addedPositions[(
+                        (x << 16) |
+                        (y << 8) |
+                        (z)
+                    )]) {
                         this.add(new MapNode('SPECIAL.__yolkbot_air__.none', { x: x, y: y, z: z }));
                     }
                 }

package/src/socket.js

@@ -1,12 +1,11 @@
 import NodeWebSocket from 'ws';
 
-import { IsBrowser, UserAgent } from '#constants';
+import { IsBrowser, ProxiesEnabled, UserAgent } from '#constants';
 
-// eslint-disable-next-line no-undef
 const WS = IsBrowser ? window.WebSocket : NodeWebSocket;
 
 let SocksProxyAgent;
-if (!IsBrowser) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
+if (ProxiesEnabled) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
 
 class yolkws extends WS {
     constructor(url, proxy) {

package/src/types/constants/index.d.ts

@@ -71,6 +71,8 @@ export declare const PlayTypes: {
     joinPrivate: number;
 };
 
+export declare const ProxiesEnabled: boolean;
+
 export declare const ShellStreaks: {
     HardBoiled: number;
     EggBreaker: number;