yolkbot 0.1.1-alpha.44 → 0.1.1-alpha.46

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "yolkbot",
     "description": "create a shell shockers bot in under 10 lines.",
-    "version": "0.1.1-alpha.44",
+    "version": "0.1.1-alpha.46",
     "keywords": [
         "shell shockers",
         "shellshock.io",
@@ -79,8 +79,8 @@
         }
     },
     "dependencies": {
-        "axios": "^1.8.3",
         "smallsocks": "^1.0.0",
+        "undici": "^7.7.0",
         "ws": "^8.18.0"
     },
     "devDependencies": {
@@ -89,8 +89,5 @@
         "esbuild": "^0.25.0",
         "eslint": "^9.20.1",
         "globals": "^15.15.0"
-    },
-    "scripts": {
-        "lint": "eslint --fix"
     }
 }

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/index.js';
-
-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;
@@ -87,20 +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-firebase-locale': 'en'
                 },
-                httpsAgent: (ProxiesEnabled && prox) ? new SocksProxyAgent(prox) : false
-            })
-            body = request.data
+                dispatcher: new globals.ProxyAgent(prox)
+            });
+
+            body = await request.json();
             token = body.idToken;
             SUCCESS = true;
         } catch (error) {
@@ -148,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: new globals.ProxyAgent(prox)
+            });
+
+            body = await request.json();
             token = body.id_token;
             SUCCESS = true;
         } catch (error) {
@@ -188,16 +194,22 @@ async function loginWithRefreshToken(refreshToken, prox = '', instance = 'shells
 }
 
 async function loginAnonymously(prox = '', instance = 'shellshock.io') {
-    const { data: body } = await axios.post('https://identitytoolkit.googleapis.com/v1/accounts:signUp?key=' + FirebaseKey, {
-        returnSecureToken: true
-    }, {
+    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: new globals.ProxyAgent(prox)
     });
 
+    const body = await req.json();
     const token = body.idToken;
 
     if (!token) {

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/socket.js

@@ -1,18 +1,12 @@
-import NodeWebSocket from 'ws';
+import globals from './globals.js';
+import { IsBrowser, UserAgent } from './constants/index.js';
 
-import { IsBrowser, ProxiesEnabled, UserAgent } from './constants/index.js';
-
-const WS = IsBrowser ? window.WebSocket : NodeWebSocket;
-
-let SocksProxyAgent;
-if (ProxiesEnabled) SocksProxyAgent = (await import('smallsocks')).SocksProxyAgent;
-
-class yolkws extends WS {
+class yolkws extends globals.WebSocket {
     constructor(url, proxy) {
         if (IsBrowser) super(url);
         else {
             super(url, {
-                agent: proxy ? new SocksProxyAgent(proxy) : undefined,
+                agent: proxy ? new globals.SocksProxyAgent(proxy) : undefined,
                 headers: {
                     'user-agent': UserAgent,
                     'accept-language': 'en-US,en;q=0.9'