yolkbot 0.1.0-alpha.9 → 0.1.0

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "yolkbot",
     "description": "create a shell shockers (self) bot in under 10 lines.",
-    "version": "0.1.0-alpha.9",
+    "version": "0.1.0",
     "keywords": [
         "shell shockers",
         "shellshock.io",
@@ -46,9 +46,20 @@
             "types": "./src/types/matchmaker.d.ts"
         },
         "./packets": "./src/packet.js",
-        "./constants": "./src/constants/index.js",
-        "./constants/*": "./src/constants/*.js",
-        "./constants/*.js": "./src/constants/*.js",
+        "./pathing/*": "./src/pathing/*.js",
+        "./pathing/*.js": "./src/pathing/*.js",
+        "./constants": {
+            "import": "./src/constants/index.js",
+            "types": "./src/types/constants/index.d.ts"
+        },
+        "./constants/*": {
+            "import": "./src/constants/*.js",
+            "types": "./src/types/constants/*.d.ts"
+        },
+        "./constants/*.js": {
+            "import": "./src/constants/*.js",
+            "types": "./src/types/constants/*.d.ts"
+        },
         "./dispatch": {
             "import": "./src/dispatches/index.js",
             "types": "./src/types/dispatches.d.ts"
@@ -63,7 +74,8 @@
         }
     },
     "dependencies": {
-        "socks-proxy-agent": "^8.0.5",
+        "axios": "^1.8.3",
+        "smallsocks": "^1.0.0",
         "ws": "^8.18.0"
     },
     "devDependencies": {

package/src/api.js

@@ -1,18 +1,34 @@
+import axios from 'axios';
+
 import yolkws from './socket.js';
 
-import { FirebaseKey, UserAgent } from '#constants';
+import { FirebaseKey, IsBrowser, UserAgent } from '#constants';
+
+let SocksProxyAgent;
+if (!IsBrowser) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
 
 const queryServices = async (request, proxy = '', instance = 'shellshock.io') => {
-    return new Promise((resolve) => {
-        const ws = new yolkws(`wss://${instance}/services/`, proxy);
+    let ws;
+
+    const attempt = async () => {
+        try {
+            ws = new yolkws(`wss://${instance}/services/`, proxy);
+        } catch {
+            await new Promise((resolve) => setTimeout(resolve, 100));
+            await attempt();
+        }
+    }
+
+    await attempt();
 
+    return new Promise((resolve) => {
         ws.onopen = () => {
             // console.log('opened')
             ws.send(JSON.stringify(request));
         }
-        
+
         let resolved = false;
-        
+
         ws.onmessage = (mes) => {
             try {
                 const resp = JSON.parse(mes.data);
@@ -35,7 +51,11 @@ const queryServices = async (request, proxy = '', instance = 'shellshock.io') =>
     });
 }
 
-async function loginWithCredentials(email, password, prox = '', instance = 'shellshock.io') {
+async function createAccount(email, password, prox = '', instance = 'shellshock.io') {
+    return await loginWithCredentials(email, password, prox, instance, true);
+}
+
+async function loginWithCredentials(email, password, prox = '', instance = 'shellshock.io', _useRegisterEndpoint) {
     if (!email || !password) return 'firebase_no_credentials';
 
     /*
@@ -54,25 +74,26 @@ async function loginWithCredentials(email, password, prox = '', instance = 'shel
         }
     */
 
+    const endpoint = _useRegisterEndpoint ? 'signUp' : 'signInWithPassword';
+
     let SUCCESS = false;
     let request, body, token;
     let k = 0;
 
     while (!SUCCESS) {
         try {
-            request = await fetch('https://identitytoolkit.googleapis.com/v1/accounts:signInWithPassword?key=' + FirebaseKey, {
-                method: 'POST',
-                body: JSON.stringify({
-                    email: email,
-                    password: password,
-                    returnSecureToken: true
-                }),
+            request = await axios.post(`https://identitytoolkit.googleapis.com/v1/accounts:${endpoint}?key=${FirebaseKey}`, {
+                email: email,
+                password: password,
+                returnSecureToken: true
+            }, {
                 headers: {
                     'user-agent': UserAgent,
                     'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
-                }
+                },
+                httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
             })
-            body = await request.json();
+            body = request.data
             token = body.idToken;
             SUCCESS = true;
         } catch (error) {
@@ -87,8 +108,7 @@ async function loginWithCredentials(email, password, prox = '', instance = 'shel
             }
 
             if (k > 5) return 'firebase_too_many_retries';
-
-            await new Promise((resolve) => setTimeout(resolve, 100));
+            else await new Promise((resolve) => setTimeout(resolve, 100));
         }
     }
 
@@ -105,17 +125,69 @@ async function loginWithCredentials(email, password, prox = '', instance = 'shel
     return response;
 }
 
+async function loginWithRefreshToken(refreshToken, prox = '', instance = 'shellshock.io') {
+    if (!refreshToken) return 'firebase_no_credentials';
+
+    const formData = new URLSearchParams();
+    formData.append('grant_type', 'refresh_token');
+    formData.append('refresh_token', refreshToken);
+
+    let SUCCESS = false;
+    let request, body, token;
+    let k = 0;
+
+    while (!SUCCESS) {
+        try {
+            request = await axios.post(`https://securetoken.googleapis.com/v1/token?key=${FirebaseKey}`, formData, {
+                headers: {
+                    'user-agent': UserAgent,
+                    'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
+                },
+                httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
+            })
+            body = request.data
+            token = body.id_token;
+            SUCCESS = true;
+        } catch (error) {
+            ++k;
+            if (error.code == 'auth/network-request-failed') {
+                console.error('loginWithRefreshToken: Network req failed (auth/network-request-failed), retrying, k =', k);
+            } else if (error.code == 'auth/missing-email') {
+                return 'firebase_no_credentials';
+            } else {
+                console.error('loginWithRefreshToken: Error:', refreshToken);
+                console.error('loginWithRefreshToken: Error:', error, 'k =', k);
+            }
+
+            if (k > 5) return 'firebase_too_many_retries';
+            else await new Promise((resolve) => setTimeout(resolve, 100));
+        }
+    }
+
+    if (!token) {
+        console.error('loginWithRefreshToken: the game sent no idToken', body);
+        return 'firebase_no_token';
+    }
+
+    const response = await queryServices({
+        cmd: 'auth',
+        firebaseToken: token
+    }, prox, instance);
+
+    return response;
+}
+
 async function loginAnonymously(prox = '', instance = 'shellshock.io') {
-    const request = await fetch('https://identitytoolkit.googleapis.com/v1/accounts:signUp?key=' + FirebaseKey, {
-        method: 'POST',
-        body: JSON.stringify({ returnSecureToken: true }),
+    const { data: body } = await axios.post('https://identitytoolkit.googleapis.com/v1/accounts:signUp?key=' + FirebaseKey, {
+        returnSecureToken: true
+    }, {
         headers: {
             'user-agent': UserAgent,
             'x-client-version': 'Chrome/JsCore/9.17.2/FirebaseCore-web'
-        }
-    })
+        },
+        httpsAgent: (!IsBrowser && prox) ? new SocksProxyAgent(prox) : false
+    });
 
-    const body = await request.json();
     const token = body.idToken;
 
     if (!token) {
@@ -132,7 +204,9 @@ async function loginAnonymously(prox = '', instance = 'shellshock.io') {
 }
 
 export {
+    createAccount,
     loginAnonymously,
     loginWithCredentials,
+    loginWithRefreshToken,
     queryServices
 }

package/src/bot/GamePlayer.js

@@ -13,7 +13,7 @@ export class GamePlayer {
 
         this.playing = playerData.playing_;
 
-        this.social = playerData.social && JSON.parse(playerData.social_);
+        this.social = playerData.social_ && JSON.parse(playerData.social_);
         this.showBadge = !playerData.hideBadge_ || false;
 
         this.position = {
@@ -52,7 +52,7 @@ export class GamePlayer {
             this.weapons[1] = new Cluck9mm();
         }
 
-        this.grenades = 0;
+        this.grenades = 1;
 
         this.buffer = {
             0: {},