yolkbot 0.1.1-alpha.9 → 0.1.1

package/package.json

@@ -1,28 +1,26 @@
 {
     "name": "yolkbot",
-    "description": "create a shell shockers (self) bot in under 10 lines.",
-    "version": "0.1.1-alpha.9",
+    "description": "create a shell shockers bot in under 10 lines.",
+    "version": "0.1.1",
     "keywords": [
         "shell shockers",
         "shellshock.io",
         "blue wizard",
         "yolkbot"
     ],
-    "homepage": "https://github.com/enbyte/yolkbot#readme",
+    "homepage": "https://github.com/yolkorg/yolkbot#readme",
     "bugs": {
-        "url": "https://github.com/enbyte/yolkbot/issues"
+        "url": "https://github.com/yolkorg/yolkbot/issues"
     },
-    "author": "hijinks",
-    "contributors": [
-        "1ust"
-    ],
+    "author": "1ust",
+    "contributors": ["hijinks"],
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/enbyte/yolkbot.git"
+        "url": "git+https://github.com/yolkorg/yolkbot.git"
     },
     "type": "module",
     "files": [
-        "build/*.js",
+        "browser/build/*.js",
         "data/*.*",
         "src/**/*",
         "package.json",
@@ -35,13 +33,12 @@
             "import": "./src/api.js",
             "types": "./src/types/api.d.ts"
         },
-        "./browser": "./build/browser.js",
+        "./browser": "./browser/build/module.js",
         "./comm": "./src/comm/index.js",
         "./matchmaker": {
             "import": "./src/matchmaker.js",
             "types": "./src/types/matchmaker.d.ts"
         },
-        "./packets": "./src/packet.js",
         "./pathing/*": "./src/pathing/*.js",
         "./pathing/*.js": "./src/pathing/*.js",
         "./bot": {
@@ -82,8 +79,8 @@
         }
     },
     "dependencies": {
-        "axios": "^1.8.3",
-        "smallsocks": "^1.0.0",
+        "smallsocks": "^1.0.2",
+        "undici": "^7.7.0",
         "ws": "^8.18.0"
     },
     "devDependencies": {
@@ -92,18 +89,5 @@
         "esbuild": "^0.25.0",
         "eslint": "^9.20.1",
         "globals": "^15.15.0"
-    },
-    "scripts": {
-        "lint": "eslint --fix",
-        "prod": "./prod.sh",
-        "test": "./build.sh"
-    },
-    "imports": {
-        "#api": "./src/api.js",
-        "#bot": "./src/bot.js",
-        "#constants": "./src/constants/index.js",
-        "#dispatch/*": "./src/dispatches/*",
-        "#matchmaker": "./src/matchmaker.js",
-        "#packet": "./src/packet.js"
     }
 }

package/src/api.js

@@ -1,11 +1,7 @@
-import axios from 'axios';
-
+import globals from './globals.js';
 import yolkws from './socket.js';
 
-import { FirebaseKey, ProxiesEnabled, UserAgent } from '#constants';
-
-let SocksProxyAgent;
-if (ProxiesEnabled) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
+import { FirebaseKey, UserAgent } from './constants/index.js';
 
 const queryServices = async (request, proxy = '', instance = 'shellshock.io') => {
     let ws;
@@ -13,6 +9,11 @@ const queryServices = async (request, proxy = '', instance = 'shellshock.io') =>
     const attempt = async () => {
         try {
             ws = new yolkws(`wss://${instance}/services/`, proxy);
+            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();
@@ -23,7 +24,7 @@ const queryServices = async (request, proxy = '', instance = 'shellshock.io') =>
 
     return new Promise((resolve) => {
         ws.onopen = () => {
-            // console.log('opened')
+            ws.onerror = null;
             ws.send(JSON.stringify(request));
         }
 
@@ -51,11 +52,11 @@ const queryServices = async (request, proxy = '', instance = 'shellshock.io') =>
     });
 }
 
-async function createAccount(email, password, prox = '', instance = 'shellshock.io') {
-    return await loginWithCredentials(email, password, prox, instance, true);
+async function createAccount(email, password, proxy = '', instance = 'shellshock.io') {
+    return await loginWithCredentials(email, password, proxy, instance, true);
 }
 
-async function loginWithCredentials(email, password, prox = '', instance = 'shellshock.io', _useRegisterEndpoint) {
+async function loginWithCredentials(email, password, proxy = '', instance = 'shellshock.io', _useRegisterEndpoint) {
     if (!email || !password) return 'firebase_no_credentials';
 
     /*
@@ -82,18 +83,24 @@ async function loginWithCredentials(email, password, prox = '', instance = 'shel
 
     while (!SUCCESS) {
         try {
-            request = await axios.post(`https://identitytoolkit.googleapis.com/v1/accounts:${endpoint}?key=${FirebaseKey}`, {
-                email: email,
-                password: password,
-                returnSecureToken: true
-            }, {
+            request = await globals.fetch(`https://identitytoolkit.googleapis.com/v1/accounts:${endpoint}?key=${FirebaseKey}`, {
+                method: 'POST',
+                body: JSON.stringify({
+                    email: email,
+                    password: password,
+                    returnSecureToken: true
+                }),
                 headers: {
+                    'content-type': 'application/json',
+                    'origin': 'https://shellshock.io',
                     'user-agent': UserAgent,
-                    'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
+                    'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web',
+                    'x-firebase-locale': 'en'
                 },
-                httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
-            })
-            body = request.data
+                dispatcher: proxy ? new globals.ProxyAgent(proxy) : undefined
+            });
+
+            body = await request.json();
             token = body.idToken;
             SUCCESS = true;
         } catch (error) {
@@ -102,6 +109,9 @@ async function loginWithCredentials(email, password, prox = '', instance = 'shel
                 console.error('loginWithCredentials: Network req failed (auth/network-request-failed), retrying, k =', k);
             } else if (error.code == 'auth/missing-email') {
                 return 'firebase_no_credentials';
+            } else if (error.code == 'ERR_BAD_REQUEST') {
+                console.error('loginWithCredentials: Error:', email, password);
+                console.error('loginWithCredentials: Error:', error.response?.data || error, 'k =', k);
             } else {
                 console.error('loginWithCredentials: Error:', email, password);
                 console.error('loginWithCredentials: Error:', error, 'k =', k);
@@ -120,12 +130,12 @@ async function loginWithCredentials(email, password, prox = '', instance = 'shel
     const response = await queryServices({
         cmd: 'auth',
         firebaseToken: token
-    }, prox, instance);
+    }, proxy, instance);
 
     return response;
 }
 
-async function loginWithRefreshToken(refreshToken, prox = '', instance = 'shellshock.io') {
+async function loginWithRefreshToken(refreshToken, proxy = '', instance = 'shellshock.io') {
     if (!refreshToken) return 'firebase_no_credentials';
 
     const formData = new URLSearchParams();
@@ -138,14 +148,20 @@ async function loginWithRefreshToken(refreshToken, prox = '', instance = 'shells
 
     while (!SUCCESS) {
         try {
-            request = await axios.post(`https://securetoken.googleapis.com/v1/token?key=${FirebaseKey}`, formData, {
+            request = await globals.fetch(`https://securetoken.googleapis.com/v1/token?key=${FirebaseKey}`, {
+                method: 'POST',
+                body: formData,
                 headers: {
+                    'content-type': 'application/x-www-form-urlencoded',
+                    'origin': 'https://shellshock.io',
                     'user-agent': UserAgent,
-                    'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
+                    'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web',
+                    'x-firebase-locale': 'en'
                 },
-                httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
-            })
-            body = request.data
+                dispatcher: proxy ? new globals.ProxyAgent(proxy) : undefined
+            });
+
+            body = await request.json();
             token = body.id_token;
             SUCCESS = true;
         } catch (error) {
@@ -172,22 +188,28 @@ async function loginWithRefreshToken(refreshToken, prox = '', instance = 'shells
     const response = await queryServices({
         cmd: 'auth',
         firebaseToken: token
-    }, prox, instance);
+    }, proxy, instance);
 
     return response;
 }
 
-async function loginAnonymously(prox = '', instance = 'shellshock.io') {
-    const { data: body } = await axios.post('https://identitytoolkit.googleapis.com/v1/accounts:signUp?key=' + FirebaseKey, {
-        returnSecureToken: true
-    }, {
+async function loginAnonymously(proxy = '', instance = 'shellshock.io') {
+    const req = await globals.fetch('https://identitytoolkit.googleapis.com/v1/accounts:signUp?key=' + FirebaseKey, {
+        method: 'POST',
+        body: JSON.stringify({
+            returnSecureToken: true
+        }),
         headers: {
+            'content-type': 'application/json',
+            'origin': 'https://shellshock.io',
             'user-agent': UserAgent,
-            'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
+            'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web',
+            'x-firebase-locale': 'en'
         },
-        httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
+        dispatcher: proxy ? new globals.ProxyAgent(proxy) : undefined
     });
 
+    const body = await req.json();
     const token = body.idToken;
 
     if (!token) {
@@ -198,7 +220,7 @@ async function loginAnonymously(prox = '', instance = 'shellshock.io') {
     const response = await queryServices({
         cmd: 'auth',
         firebaseToken: token
-    }, prox, instance);
+    }, proxy, instance);
 
     return response;
 }

package/src/bot/GamePlayer.js

@@ -1,4 +1,4 @@
-import { GunList } from '#constants';
+import { GunList, ShellStreaks, SocialMedias } from '../constants/index.js';
 import { Cluck9mm } from '../constants/guns.js';
 
 export class GamePlayer {
@@ -6,28 +6,31 @@ export class GamePlayer {
         this.id = id;
         this.team = team;
 
-        this.data = playerData;
+        this.raw = playerData;
 
         this.name = playerData.name_;
         this.uniqueId = playerData.uniqueId_;
 
         this.playing = playerData.playing_;
 
-        this.social = playerData.social_ && JSON.parse(playerData.social_);
+        this.socials = playerData.social_ && JSON.parse(playerData.social_);
+        if (this.socials) this.socials.forEach((social) => social.type = SocialMedias[social.id]);
+
+        this.isVip = playerData.upgradeProductId_ > 0;
         this.showBadge = !playerData.hideBadge_ || false;
 
         this.position = {
-            x: this.data.x_,
-            y: this.data.y_,
-            z: this.data.z_
+            x: playerData.x_,
+            y: playerData.y_,
+            z: playerData.z_
         };
 
         this.jumping = false;
         this.climbing = false;
 
         this.view = {
-            yaw: this.data.yaw_,
-            pitch: this.data.pitch_
+            yaw: playerData.yaw_,
+            pitch: playerData.pitch_
         };
 
         this.character = {
@@ -40,15 +43,14 @@ export class GamePlayer {
             melee: playerData.meleeItem_
         }
 
-        this.activeGun = this.data.weaponIdx_;
+        this.activeGun = playerData.weaponIdx_;
         this.selectedGun = 0;
         this.weapons = [{}, {}];
 
         if (this.character.primaryGun) {
-            const weaponClass = GunList[this.character.primaryGun.exclusive_for_class];
-            this.selectedGun = this.character.primaryGun.exclusive_for_class;
+            this.selectedGun = playerData.charClass_;
 
-            this.weapons[0] = new weaponClass();
+            this.weapons[0] = new GunList[this.selectedGun]();
             this.weapons[1] = new Cluck9mm();
         }
 
@@ -60,11 +62,11 @@ export class GamePlayer {
             2: {}
         };
 
-        this.kills = 0;
-        this.hp = 100;
+        this.streak = playerData.score_;
+        this.hp = playerData.hp_;
 
-        this.hpShield = 0;
-        this.streakRewards = [];
+        this.hpShield = playerData.shield_;
+        this.streakRewards = Object.values(ShellStreaks).filter(streak => playerData.activeShellStreaks_ & streak);
 
         this.randomSeed = 0;
         this.serverStateIdx = 0;