Renaming + Circular dependency fixes + more organized config

Author: ohayo

config.example.json

@@ -13,8 +13,13 @@
     "serve_selector": true,
     "require_release_date_cookie": true,
     "cache_authenticated_get_requests" : true,
-    "mr_server": false,
-    "mr_server_port" : 4444,
+    "mr_server": {
+        "enabled" : false,
+        "port" : 4444,
+        "config" : {
+            "speaking_throttle_ms" : 150
+        }
+    },
     "default_client_build": "october_5_2017",
     "debug_logs": {
         "gateway" : true,

handlers/mr.js

@@ -35,7 +35,8 @@ async function handleIdentify(socket, packet) {
     socket.send(JSON.stringify({
         op: OPCODES.ALRIGHT,
         d: {
-            location: global.mrServer.servers.size + 1
+            location: global.mrServer.servers.size,
+            config: global.config.mr_server.config
         }
     }));
 }

helpers/webrtc/MediasoupWebRtcClient.js

@@ -1,5 +1,4 @@
 const { EventEmitter } = require("node:events");
-const { VoiceRoom } = require("./VoiceRoom");
 
 class MediasoupWebRtcClient {
     constructor(userId, roomId, websocket, room) {

helpers/webrtc/VoiceRoom.js

@@ -1,5 +1,3 @@
-const { MediasoupWebRtcClient } = require("./MediasoupWebRtcClient");
-
 class VoiceRoom {
     constructor(id, type, sfu, router) {
         this._id = id;

mrserver.js

@@ -14,7 +14,7 @@ const mrServer = {
             return;
         }
 
-        logText(message, 'MR_SERVER');
+        logText(message, 'MR_SIGNALING_SERVER');
     },
     getRandomMediaServer() {
         const serverEntries = Array.from(this.servers.entries());
@@ -69,13 +69,18 @@ const mrServer = {
         socket.on('message', (data) => this.handleClientMessage(socket, data));
     },
     async handleClientClose(socket, timedOut = false) {
+        if (socket === null) {
+            return;
+        }
+        
         if (timedOut) {
-            this.debug(`!! MEDIA SERVER HAS TIMED OUT - CHECK SERVER ASAP`);
+            this.debug(`!! A MEDIA SERVER HAS TIMED OUT - CHECK THE SERVER ASAP`);
         }
 
-        this.debug(`Lost connection to media server -> Removing from store...`);
+        this.debug(`Lost connection to a media server -> Removing from store...`);
 
         this.servers.delete(socket.public_ip);
+        socket = null;
     },
     async handleClientMessage(socket, data) {
         try {

server.js

@@ -32,13 +32,12 @@ global.dispatcher = dispatcher;
 global.gateway = gateway;
 global.udpServer = udpServer;
 global.rtcServer = rtcServer;
+global.using_media_relay = globalUtils.config && globalUtils.config.mr_server.enabled;
 
-if (!globalUtils.config.mr_server) {
+if (!global.using_media_relay) {
     global.mediaserver = new MediasoupSignalingDelegate();
 }
 
-global.using_media_relay = globalUtils.config.mr_server;
-
 if (globalUtils.config.email_config.enabled) {
     global.emailer = new emailer(globalUtils.config.email_config, globalUtils.config.max_per_timeframe_ms, globalUtils.config.timeframe_ms, globalUtils.config.ratelimit_modifier);
 }
@@ -151,7 +150,7 @@ function getIPAddress() {
 
     if (global.using_media_relay) {
         global.mrServer = mrServer;
-        global.mrServer.start(config.mr_server_port, config.debug_logs['mr'] ?? true);
+        global.mrServer.start(config.mr_server.port, config.debug_logs['mr'] ?? true);
     }
 
     if (!global.using_media_relay) {