From a5a6833c2cec07df394a9752cb3de883e99b30b7 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Tue, 4 Jan 2022 22:56:20 +0000
Subject: [PATCH] fix: bump revolt.js and add pong timeout

---
 package.json                    |  2 +-
 src/context/revoltjs/events.ts  | 34 ++++-----------------------------
 src/mobx/stores/ServerConfig.ts |  1 +
 yarn.lock                       |  8 ++++----
 4 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/package.json b/package.json
index 95fe0374..6b961ec2 100644
--- a/package.json
+++ b/package.json
@@ -144,7 +144,7 @@
         "react-virtualized-auto-sizer": "^1.0.5",
         "react-virtuoso": "^1.10.4",
         "revolt-api": "0.5.3-alpha.10",
-        "revolt.js": "5.2.2",
+        "revolt.js": "5.2.3",
         "rimraf": "^3.0.2",
         "sass": "^1.35.1",
         "shade-blend-color": "^1.0.0",
diff --git a/src/context/revoltjs/events.ts b/src/context/revoltjs/events.ts
index c00fd4a7..8e94c54e 100644
--- a/src/context/revoltjs/events.ts
+++ b/src/context/revoltjs/events.ts
@@ -7,13 +7,6 @@ import Auth from "../../mobx/stores/Auth";
 import { resetMemberSidebarFetched } from "../../components/navigation/right/MemberSidebar";
 import { ClientStatus } from "./RevoltClient";
 
-export let preventReconnect = false;
-let preventUntil = 0;
-
-export function setReconnectDisallowed(allowed: boolean) {
-    preventReconnect = allowed;
-}
-
 export function registerEvents(
     auth: Auth,
     setStatus: StateUpdater<ClientStatus>,
@@ -21,28 +14,10 @@ export function registerEvents(
 ) {
     if (!client) return;
 
-    function attemptReconnect() {
-        if (preventReconnect) return;
-        function reconnect() {
-            preventUntil = +new Date() + 2000;
-            client.websocket.connect().catch((err) => console.error(err));
-        }
-
-        if (+new Date() > preventUntil) {
-            setTimeout(reconnect, 2000);
-        } else {
-            reconnect();
-        }
-    }
-
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let listeners: Record<string, (...args: any[]) => void> = {
         connecting: () => setStatus(ClientStatus.CONNECTING),
-
-        dropped: () => {
-            setStatus(ClientStatus.DISCONNECTED);
-            attemptReconnect();
-        },
+        dropped: () => setStatus(ClientStatus.DISCONNECTED),
 
         ready: () => {
             resetMemberSidebarFetched();
@@ -73,14 +48,13 @@ export function registerEvents(
 
     const online = () => {
         setStatus(ClientStatus.RECONNECTING);
-        setReconnectDisallowed(false);
-        attemptReconnect();
+        client.options.autoReconnect = false;
+        client.websocket.connect();
     };
 
     const offline = () => {
-        setReconnectDisallowed(true);
+        client.options.autoReconnect = false;
         client.websocket.disconnect();
-        setStatus(ClientStatus.OFFLINE);
     };
 
     window.addEventListener("online", online);
diff --git a/src/mobx/stores/ServerConfig.ts b/src/mobx/stores/ServerConfig.ts
index aa950f03..49f7c59d 100644
--- a/src/mobx/stores/ServerConfig.ts
+++ b/src/mobx/stores/ServerConfig.ts
@@ -46,6 +46,7 @@ export default class ServerConfig
             autoReconnect: false,
             apiURL: import.meta.env.VITE_API_URL,
             debug: isDebug(),
+            onPongTimeout: "RECONNECT",
         });
 
         if (this.config !== null) {
diff --git a/yarn.lock b/yarn.lock
index bf3102f5..4f2dc0a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3815,10 +3815,10 @@ revolt-api@^0.5.3-alpha.9:
   resolved "https://registry.yarnpkg.com/revolt-api/-/revolt-api-0.5.3-alpha.9.tgz#46e75b7d8f9c6702df39039b829dddbb7897f237"
   integrity sha512-L8K9uPV3ME8bLdtWm8L9iPQvFM0GghA+5LzmWFjd6Gbn56u22ZYub2lABi4iHrWgeA2X41dGSsuSBgHSlts9Og==
 
-revolt.js@5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-5.2.2.tgz#e6becef157722c4ce2c9668d7d2ed79188329f75"
-  integrity sha512-KfU4goDKZJwb10z/kuDKq/J4xpBpcIXmBpzryeQPo/5UCxlc90OflPonPJKfp8d6ykSnZs95tLdB7AloUXpYxg==
+revolt.js@5.2.3:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-5.2.3.tgz#770e7fc3256d7d153fadf143acd00f4c3377f4ef"
+  integrity sha512-tFGt1yij56A1y3EDjTf1HoPmwHskQ0xoks58tWNCPdMvyCyrTih9qBKdHNDDOMUWdGF0qn1pWZmdVSxHriAuOA==
   dependencies:
     "@insertish/exponential-backoff" "3.1.0-patch.0"
     "@insertish/isomorphic-ws" "^4.0.1"