Merge pull request #164 from oof2win2/bugfix/server-start-error

Author: oof2win2

src/base/Tails.ts

@@ -25,7 +25,6 @@ export declare interface TailEvents {
   playerJoin: (data: playerJoinData) => void;
   playerLeave: (data: playerLeaveData) => void;
   out: (data: OutputData) => void;
-  start: (data: OutputData) => void;
   logging: (data: OutputData) => void;
   datastore: (data: OutputData) => void;
   discord: (data: OutputData) => void;
@@ -54,9 +53,6 @@ class tailListener extends EventEmitter {
     this.tailLocations.forEach((tailStuff) => {
       let tail = new Tail(tailStuff.path);
       tail.on("line", (line: string) => {
-        const serverStartRegExp = new RegExp(
-          /Info ServerMultiplayerManager.cpp:\d\d\d: Matching server connection resumed/
-        );
         if (line.includes("[CHAT]"))
           this.client?.ws
             ? this.client.logger(`${tailStuff.server.name}: ${line}`)
@@ -79,13 +75,10 @@ class tailListener extends EventEmitter {
             line: JSON.parse(line),
             server: tailStuff.server,
           });
-        else if (serverStartRegExp.test(line))
-          return this.emit("start", { line: line, server: tailStuff.server });
-        else
-          this.emit(tailStuff.type, {
-            line: line,
-            server: tailStuff.server,
-          });
+        this.emit(tailStuff.type, {
+          line: line,
+          server: tailStuff.server,
+        });
       });
     });
   }

src/helpers/rcon.ts

@@ -37,11 +37,14 @@ class RconInterface {
    */
   private checkIntervals: Map<string, NodeJS.Timeout> = new Map();
 
+  public serverConnected: (server: FactorioServer) => void;
+
   constructor(servers: FactorioServer[]) {
     this.servers = servers;
     this.rconConnections = [];
 
     this.servers.map((_, i) => this.initServer(i));
+    this.serverConnected = () => {};
   }
 
   private async initServer(serverIndex: number) {
@@ -63,32 +66,33 @@ class RconInterface {
         server: server,
         hasScenario: hasScenario,
       });
+      this.serverConnected(server);
 
       // reconnection mechanism
       rcon.on("end", () => {
         this.reconnectRcon(rcon, server); // start the reconnection mechanism
-       if (!server.dev) {
-		this.client.sendToErrorChannel(
-			`Server <#${
-			  server.discordid
-			}> has dropped connection to RCON at <t:${Math.floor(
-			  Date.now() / 1000
-			)}>`
-		  );
-	   }
+        if (!server.dev) {
+          this.client.sendToErrorChannel(
+            `Server <#${
+              server.discordid
+            }> has dropped connection to RCON at <t:${Math.floor(
+              Date.now() / 1000
+            )}>`
+          );
+        }
       });
     } catch (error) {
       // mechanism to reconnect to RCON after some time
       this.reconnectRcon(rcon, server); // start the reconnection mechanism
       if (!server.dev) {
-		this.client.sendToErrorChannel(
-			`Server <#${
-			  server.discordid
-			}> has failed to initially connect to RCON at <t:${Math.floor(
-			  Date.now() / 1000
-			)}>`
-		  );
-	  }
+        this.client.sendToErrorChannel(
+          `Server <#${
+            server.discordid
+          }> has failed to initially connect to RCON at <t:${Math.floor(
+            Date.now() / 1000
+          )}>`
+        );
+      }
     }
   }
 
@@ -121,6 +125,7 @@ class RconInterface {
             Date.now() / 1000
           )}>, after ${dayjs(startedAt).fromNow(true)}. Synchronizing banlist`
         );
+        this.serverConnected(server);
         return;
       } catch {
         connectionAttempts++;
@@ -129,14 +134,14 @@ class RconInterface {
         // dayjs is used to get the relative time since the start of the reconnection attempts
         if (attempts.includes(connectionAttempts)) {
           if (!server.dev) {
-			this.client.sendToErrorChannel(
-				`Server <#${
-				  server.discordid
-				}> has dropped connection to RCON at <t:${Math.floor(
-				  Date.now() / 1000
-				)}>`
-			  );
-		  }
+            this.client.sendToErrorChannel(
+              `Server <#${
+                server.discordid
+              }> has dropped connection to RCON at <t:${Math.floor(
+                Date.now() / 1000
+              )}>`
+            );
+          }
         }
       }
     };
@@ -159,19 +164,19 @@ class RconInterface {
         s.server.name === serverIdentifier ||
         s.server.discordid === serverIdentifier
     );
-	// if (serverIdentifier == "724696348871622818")
-	// 	console.log(server)
+    // if (serverIdentifier == "724696348871622818")
+    // 	console.log(server)
     if (!server)
       return {
         resp: false,
-		identifier: serverIdentifier,
+        identifier: serverIdentifier,
       };
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     const response = await server.rcon.send(command).catch(() => {});
     if (!response)
       return {
         resp: false,
-		identifier: serverIdentifier,
+        identifier: serverIdentifier,
       };
     return {
       resp: response,

src/helpers/serverHandler.ts

@@ -35,7 +35,6 @@ class serverHandler {
     Tails.on("datastore", (log) => this.datastoreHandler(log));
     Tails.on("discord", (log) => this.discordHandler(log));
     // Tails.on("ALL", (log) => this.allHandler(log))
-    Tails.on("start", (log) => this.startHandler(log));
   }
   private formatDate(line: string) {
     return line.trim().slice(line.indexOf("0.000") + 6, 25);
@@ -545,8 +544,7 @@ class serverHandler {
         embeds: [new MessageEmbed(embed)],
       });
   }
-  async startHandler(data: OutputData) {
-    let server = data.server;
+  async startHandler(server: FactorioServer) {
     setTimeout(async () => {
       let roles = await Users.find({})
         .select({ factorioName: 1, factorioRoles: 1 })
@@ -565,7 +563,7 @@ class serverHandler {
         )
         .then((output) => output);
       if (res.resp && res.resp.trim() == "Command Complete") {
-        const channel = this.client.channels.cache.get(data.server.discordid);
+        const channel = this.client.channels.cache.get(server.discordid);
         channel.isText() && channel.send("Roles have synced");
       }
     }, 5000); // allow server to connect to rcon
@@ -580,4 +578,4 @@ class serverHandler {
     }
   }
 }
-module.exports = serverHandler;
+export default serverHandler;

src/index.ts

@@ -15,7 +15,7 @@ const client = new Comfy({
     Intents.FLAGS.GUILD_MESSAGE_REACTIONS,
     Intents.FLAGS.GUILD_PRESENCES,
     Intents.FLAGS.GUILD_WEBHOOKS,
-	Intents.FLAGS.GUILD_MEMBERS,
+    Intents.FLAGS.GUILD_MEMBERS,
   ],
 });
 
@@ -69,8 +69,9 @@ const init = async () => {
   client.login(client.config.token);
 
   rcon.client = client;
-  const serverHandler = require("./helpers/serverHandler");
+  const serverHandler = (await import("./helpers/serverHandler")).default;
   const servers = new serverHandler(client);
+  rcon.serverConnected = (server) => servers.startHandler(server);
 
   mongoose
     .connect(client.config.mongoDB)