yolkbot 0.1.1-alpha.35 → 0.1.1-alpha.37

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.35",
+    "version": "0.1.1-alpha.37",
     "keywords": [
         "shell shockers",
         "shellshock.io",

package/src/api.js

@@ -13,6 +13,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 +28,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));
         }
 

package/src/bot.js

@@ -548,6 +548,11 @@ export class Bot {
         const attempt = async () => {
             try {
                 this.game.socket = new yolkws(`wss://${this.game.raw.subdomain}.${this.instance}/game/${this.game.raw.id}`, this.proxy);
+                this.game.socket.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();
@@ -559,7 +564,7 @@ export class Bot {
         this.game.socket.binaryType = 'arraybuffer';
 
         this.game.socket.onopen = () => {
-            // console.log('Successfully connected to game server.');
+            this.game.socket.onerror = null;
         }
 
         this.game.socket.onmessage = this.#onGameMesssage.bind(this);

package/src/matchmaker.js

@@ -10,11 +10,11 @@ export class Matchmaker {
     proxy = null;
     sessionId = '';
 
-    forceClose = false;
-
     onListeners = new Map();
     onceListeners = new Map();
 
+    #forceClose = false;
+
     // sessionId: string, a custom session id
     // proxy: a socks5 proxy string
     // instance: a custom game instance
@@ -34,6 +34,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 +49,8 @@ export class Matchmaker {
 
         this.ws.onopen = () => {
             this.connected = true;
+            this.ws.onerror = null;
+
             if (this.sessionId) {
                 this.onceConnected.forEach(func => func());
             }
@@ -55,7 +62,7 @@ export class Matchmaker {
         }
 
         this.ws.onclose = () => {
-            if (this.forceClose) return;
+            if (this.#forceClose) return;
 
             this.connected = false;
             this.#createSocket(instance);
@@ -159,7 +166,7 @@ export class Matchmaker {
     }
 
     close() {
-        this.forceClose = true;
+        this.#forceClose = true;
         this.ws.close();
     }
 

package/src/types/matchmaker.d.ts

@@ -40,20 +40,26 @@ type CommandSend = {
 export declare class Matchmaker {
     connected: boolean;
     onceConnected: Function[];
+
     proxy: string | null;
     sessionId: string;
-    forceClose: boolean;
     onListeners: Map<string, Function[]>;
     onceListeners: Map<string, Function[]>;
 
+    regionList: Region[] | null;
+    ws: yolkws;
+
     constructor(params?: MatchmakerParams);
 
     send(msg: CommandSend): void;
-    waitForConnect(): Promise<void>;
+
     getRegions(): Promise<Region[]>;
     findPublicGame(params: FindGameParams): Promise<RawGameData>;
+
     getRandomRegion(): string;
     getRandomGameMode(): keyof typeof GameModes;
+
+    waitForConnect(): Promise<void>;
     close(): void;
 
     on(event: string, callback: Function): void;