From 2d13c865af208abb267824d8aaea53adfcff5824 Mon Sep 17 00:00:00 2001
From: Flummi <git@srv.fail>
Date: Wed, 19 Mar 2025 11:47:26 +0100
Subject: [PATCH] refactor: remove flumm-fetch dependency

---
 dist/clients/slack.js | 29 +++++++++++++++++++----------
 dist/clients/tg.js    | 15 +++++++++++++--
 package.json          |  3 ---
 src/clients/slack.ts  |  1 -
 src/clients/tg.ts     |  9 +++++++--
 5 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/dist/clients/slack.js b/dist/clients/slack.js
index ef6c56c..a87179e 100644
--- a/dist/clients/slack.js
+++ b/dist/clients/slack.js
@@ -1,13 +1,19 @@
 import https from "node:https";
 import url from "node:url";
 import EventEmitter from "node:events";
-import fetch from "flumm-fetch";
 export default class slack extends EventEmitter {
     options;
     token;
     api = "https://slack.com/api";
     interval = null;
     server;
+    reconnectAttempts = 0;
+    emit(event, ...args) {
+        return super.emit(event, ...args);
+    }
+    on(event, listener) {
+        return super.on(event, listener);
+    }
     constructor(options) {
         super();
         this.options = {
@@ -48,6 +54,7 @@ export default class slack extends EventEmitter {
         });
         if (res.url) {
             this.server.wss.url = url.parse(res.url);
+            this.reconnectAttempts = 0;
             this.initializeWebSocket();
         }
         else
@@ -79,7 +86,7 @@ export default class slack extends EventEmitter {
     handleWebSocketEvents() {
         if (!this.server.wss.socket)
             return;
-        this.interval = setInterval(async () => await this.ping(), 30000);
+        this.interval = setInterval(async () => await this.ping(), 3e4);
         this.server.wss.socket.on("data", async (data) => {
             try {
                 const parsedData = this.parseData(data);
@@ -105,12 +112,15 @@ export default class slack extends EventEmitter {
         });
     }
     async reconnect() {
-        this.server.wss.url = null;
-        this.server.wss.socket = null;
-        if (this.interval)
-            clearInterval(this.interval);
-        this.emit("data", ["info", "reconnecting slack"]);
-        await this.connect();
+        if (this.reconnectAttempts >= 5) {
+            this.emit("data", ["error", "Too many reconnect attempts"]);
+            return;
+        }
+        this.reconnectAttempts++;
+        setTimeout(async () => {
+            this.emit("data", ["info", "Reconnecting to Slack"]);
+            await this.connect();
+        }, this.reconnectAttempts * 1e3);
     }
     async getChannel(channelId) {
         if (this.server.channel.has(channelId))
@@ -182,8 +192,7 @@ export default class slack extends EventEmitter {
     }
     parseData(data) {
         try {
-            const json = JSON.parse(data.toString());
-            return json;
+            return JSON.parse(data.toString());
         }
         catch (err) {
             this.emit("data", ["error", "failed to parse data"]);
diff --git a/dist/clients/tg.js b/dist/clients/tg.js
index 3724efa..b876b4d 100644
--- a/dist/clients/tg.js
+++ b/dist/clients/tg.js
@@ -1,4 +1,3 @@
-import fetch from "flumm-fetch";
 import EventEmitter from "events";
 const allowedFiles = ["audio", "video", "photo", "document"];
 export default class tg extends EventEmitter {
@@ -14,6 +13,12 @@ export default class tg extends EventEmitter {
         user: new Map(),
         me: {},
     };
+    emit(event, ...args) {
+        return super.emit(event, ...args);
+    }
+    on(event, listener) {
+        return super.on(event, listener);
+    }
     constructor(options) {
         super();
         this.options = {
@@ -143,7 +148,13 @@ export default class tg extends EventEmitter {
         };
         if (reply)
             body["reply_to_message_id"] = reply;
-        const opts = { method: "POST", body };
+        const opts = {
+            method: "POST",
+            body: JSON.stringify(body),
+            headers: {
+                "Content-Type": "application/json"
+            }
+        };
         return await (await fetch(`${this.api}/sendMessage`, opts)).json();
     }
     format(msg) {
diff --git a/package.json b/package.json
index 84be041..43c653a 100644
--- a/package.json
+++ b/package.json
@@ -20,9 +20,6 @@
   "author": "Flummi & jkhsjdhjs",
   "license": "MIT",
   "type": "module",
-  "dependencies": {
-    "flumm-fetch": "^1.0.1"
-  },
   "bugs": {
     "url": "https://git.lat/keinBot/cuffeo/issues"
   },
diff --git a/src/clients/slack.ts b/src/clients/slack.ts
index d0ebd09..45f6290 100644
--- a/src/clients/slack.ts
+++ b/src/clients/slack.ts
@@ -2,7 +2,6 @@ import https from "node:https";
 import net from "node:net";
 import url from "node:url";
 import EventEmitter from "node:events";
-import fetch from "flumm-fetch";
 
 interface SlackOptions {
   token: string;
diff --git a/src/clients/tg.ts b/src/clients/tg.ts
index 3ee1f53..4514a49 100644
--- a/src/clients/tg.ts
+++ b/src/clients/tg.ts
@@ -1,4 +1,3 @@
-import fetch from "flumm-fetch";
 import EventEmitter from "events";
 
 const allowedFiles = ["audio", "video", "photo", "document"] as const;
@@ -227,7 +226,13 @@ export default class tg extends EventEmitter {
     if(reply)
       body["reply_to_message_id"] = reply;
 
-    const opts = { method: "POST", body };
+    const opts = {
+      method: "POST",
+      body: JSON.stringify(body),
+      headers: {
+        "Content-Type": "application/json"
+      }
+    };
     return await (await fetch(`${this.api}/sendMessage`, opts)).json();
   }