From 60f76a1594800da61d8015592d27077f0abd9fed Mon Sep 17 00:00:00 2001
From: Hri7566 <hri7566@gmail.com>
Date: Mon, 22 Jan 2024 03:16:47 -0500
Subject: [PATCH] Fix crashing issue

---
 bun.lockb              | Bin 19211 -> 17584 bytes
 package.json           |   1 -
 src/channel/Channel.ts |   2 +-
 src/util/env.ts        |   7 -------
 src/ws/Socket.ts       |  24 +++++++++++++++++++++++-
 src/ws/server.ts       |  25 +------------------------
 6 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/bun.lockb b/bun.lockb
index 12f607ada34d2925402f21791130569142a8f550..dce4de86dc02db54961527896aa730d2d0fee3ea 100755
GIT binary patch
delta 2557
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

delta 3735
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

diff --git a/package.json b/package.json
index 55bf8e0..f1b5ee0 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
   "dependencies": {
     "@prisma/client": "5.7.0",
     "@t3-oss/env-core": "^0.6.1",
-    "bun": "^1.0.0",
     "bun-types": "^1.0.1",
     "commander": "^11.1.0",
     "date-holidays": "^3.21.5",
diff --git a/src/channel/Channel.ts b/src/channel/Channel.ts
index 930da6f..fbd9c3f 100644
--- a/src/channel/Channel.ts
+++ b/src/channel/Channel.ts
@@ -11,7 +11,7 @@ import {
 } from "../util/types";
 import { Socket } from "../ws/Socket";
 import { validateChannelSettings } from "./settings";
-import { findSocketByPartID, socketsBySocketID } from "../ws/server";
+import { findSocketByPartID, socketsBySocketID } from "../ws/Socket";
 import Crown from "./Crown";
 
 interface ChannelConfig {
diff --git a/src/util/env.ts b/src/util/env.ts
index ff2b12e..183d1aa 100644
--- a/src/util/env.ts
+++ b/src/util/env.ts
@@ -1,11 +1,6 @@
-import dotenv from "dotenv";
 import { createEnv } from "@t3-oss/env-core";
 import { z } from "zod";
 
-dotenv.config({
-    path: "./.env"
-});
-
 export const env = createEnv({
     server: {
         PORT: z.coerce.number(),
@@ -14,8 +9,6 @@ export const env = createEnv({
         ADMIN_PASS: z.string()
     },
     isServer: true,
-    clientPrefix: "",
-    client: {},
     runtimeEnv: process.env
 });
 
diff --git a/src/ws/Socket.ts b/src/ws/Socket.ts
index 09e17b8..0cf57a5 100644
--- a/src/ws/Socket.ts
+++ b/src/ws/Socket.ts
@@ -21,7 +21,6 @@ import { eventGroups } from "./events";
 import { Gateway } from "./Gateway";
 import { channelList, Channel } from "../channel/Channel";
 import { ServerWebSocket } from "bun";
-import { socketsBySocketID } from "./server";
 import { Logger } from "../util/Logger";
 import { RateLimitConstructorList, RateLimitList } from "./ratelimit/config";
 import { adminLimits } from "./ratelimit/limits/admin";
@@ -372,3 +371,26 @@ export class Socket extends EventEmitter {
         ch.playNotes(msg, this);
     }
 }
+
+export const socketsBySocketID = new Map<string, Socket>();
+
+export function findSocketByPartID(id: string) {
+    for (const socket of socketsBySocketID.values()) {
+        if (socket.getParticipantID() == id) return socket;
+    }
+}
+
+export function findSocketByUserID(_id: string) {
+    for (const socket of socketsBySocketID.values()) {
+        // logger.debug("User ID:", socket.getUserID());
+        if (socket.getUserID() == _id) return socket;
+    }
+}
+
+export function findSocketByIP(ip: string) {
+    for (const socket of socketsBySocketID.values()) {
+        if (socket.getIP() == ip) {
+            return socket;
+        }
+    }
+}
diff --git a/src/ws/server.ts b/src/ws/server.ts
index f12d3c4..1fe877d 100644
--- a/src/ws/server.ts
+++ b/src/ws/server.ts
@@ -4,35 +4,12 @@ import fs from "fs";
 import path from "path";
 import { handleMessage } from "./message";
 import { decoder } from "../util/helpers";
-import { Socket } from "./Socket";
+import { Socket, socketsBySocketID } from "./Socket";
 import { serve, file } from "bun";
 import env from "../util/env";
 
 const logger = new Logger("WebSocket Server");
 
-export const socketsBySocketID = new Map<string, Socket>();
-
-export function findSocketByPartID(id: string) {
-    for (const socket of socketsBySocketID.values()) {
-        if (socket.getParticipantID() == id) return socket;
-    }
-}
-
-export function findSocketByUserID(_id: string) {
-    for (const socket of socketsBySocketID.values()) {
-        // logger.debug("User ID:", socket.getUserID());
-        if (socket.getUserID() == _id) return socket;
-    }
-}
-
-export function findSocketByIP(ip: string) {
-    for (const socket of socketsBySocketID.values()) {
-        if (socket.getIP() == ip) {
-            return socket;
-        }
-    }
-}
-
 export const app = Bun.serve({
     port: env.PORT,
     hostname: "0.0.0.0",