From 20b716ae578e2606bba0b9ec5e981d2059a0821b Mon Sep 17 00:00:00 2001
From: MathMan05 <mathmanrm@gmail.com>
Date: Sun, 11 Aug 2024 15:48:39 -0500
Subject: [PATCH] fix heartbeat issues

---
 .dist/localuser.js   | 15 +++++++++------
 webpage/localuser.ts | 13 +++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.dist/localuser.js b/.dist/localuser.js
index a104a18..3acd991 100644
--- a/.dist/localuser.js
+++ b/.dist/localuser.js
@@ -31,7 +31,6 @@ class Localuser {
     guildhtml;
     ws;
     typing;
-    wsinterval;
     connectionSucceed = 0;
     errorBackoff = 0;
     mfa_enabled;
@@ -103,7 +102,6 @@ class Localuser {
     }
     unload() {
         this.initialized = false;
-        clearInterval(this.wsinterval);
         this.outoffocus();
         this.guilds = [];
         this.guildids = new Map();
@@ -197,8 +195,6 @@ class Localuser {
         });
         this.ws.addEventListener("close", event => {
             console.log("WebSocket closed with code " + event.code);
-            if (this.wsinterval)
-                clearInterval(this.wsinterval);
             this.unload();
             document.getElementById("loading").classList.remove("doneloading");
             document.getElementById("loading").classList.add("loading");
@@ -319,13 +315,20 @@ class Localuser {
         }
         else if (temp.op === 10) {
             console.log("heartbeat down");
-            this.wsinterval = setInterval(_ => {
+            this.heartbeat_interval = temp.d.heartbeat_interval;
+            this.ws.send(JSON.stringify({ op: 1, d: this.lastSequence }));
+        }
+        else if (temp.op === 11) {
+            setTimeout(_ => {
+                if (!this.ws)
+                    return;
                 if (this.connectionSucceed === 0)
                     this.connectionSucceed = Date.now();
                 this.ws.send(JSON.stringify({ op: 1, d: this.lastSequence }));
-            }, temp.d.heartbeat_interval);
+            }, this.heartbeat_interval);
         }
     }
+    heartbeat_interval;
     resolveChannelFromID(ID) {
         let resolve = this.guilds.find(guild => guild.channelids[ID]);
         if (resolve) {
diff --git a/webpage/localuser.ts b/webpage/localuser.ts
index b92c37f..0de184f 100644
--- a/webpage/localuser.ts
+++ b/webpage/localuser.ts
@@ -35,7 +35,6 @@ class Localuser{
     guildhtml:Map<string, HTMLDivElement>;
     ws:WebSocket;
     typing:[string,number][];
-    wsinterval:NodeJS.Timeout;
     connectionSucceed=0;
     errorBackoff=0;
     mfa_enabled:boolean;
@@ -109,7 +108,6 @@ class Localuser{
     }
     unload():void{
         this.initialized=false;
-        clearInterval(this.wsinterval);
         this.outoffocus();
         this.guilds=[];
         this.guildids=new Map();
@@ -207,7 +205,6 @@ class Localuser{
 
         this.ws.addEventListener("close", event => {
             console.log("WebSocket closed with code " + event.code);
-            if (this.wsinterval) clearInterval(this.wsinterval);
 
             this.unload();
             document.getElementById("loading").classList.remove("doneloading");
@@ -329,13 +326,17 @@ class Localuser{
 
         }else if(temp.op===10){
             console.log("heartbeat down");
-            this.wsinterval=setInterval(_=>{
+            this.heartbeat_interval=temp.d.heartbeat_interval;
+            this.ws.send(JSON.stringify({op:1,d:this.lastSequence}))
+        }else if(temp.op===11){
+            setTimeout(_=>{
+                if(!this.ws) return;
                 if (this.connectionSucceed===0) this.connectionSucceed=Date.now()
-
                 this.ws.send(JSON.stringify({op:1,d:this.lastSequence}))
-            },temp.d.heartbeat_interval)
+            },this.heartbeat_interval)
         }
     }
+    heartbeat_interval:number;
     resolveChannelFromID(ID:string):Channel{
         let resolve=this.guilds.find(guild => guild.channelids[ID]);
         if(resolve){