fix(deps): update dependency tsup to v8.3.4

Reviewed-on: #32

.gitea/workflows/ci.yml

@@ -1,9 +1,16 @@
-name: "deploy"
+name: "Deploy CI"
 
 on:
   push:
     branches:
       - master
+    paths-ignore: # Files in here will not trigger a build
+      - "README.md"
+      - "LICENSE"
+      - "grafana-dashboard.json"
+      - "storage-tracker.sh"
+      - "useful-stuff.md"
+      - ".gitea/workflows/publish.yml"
 
 jobs:
   deploy:

.gitea/workflows/publish.yml

@@ -10,6 +10,7 @@ on:
       - "grafana-dashboard.json"
       - "storage-tracker.sh"
       - "useful-stuff.md"
+      - ".gitea/workflows/ci.yml"
 
 jobs:
   docker:
@@ -19,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Restore Docker Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: docker-cache
         with:
           path: /usr/bin/docker
@@ -42,26 +43,11 @@ jobs:
           username: ${{ secrets.REPO_USERNAME }}
           password: ${{ secrets.REPO_TOKEN }}
 
-      - name: Restore Docker Build Cache
-        uses: actions/cache@v3
-        id: build-cache
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx
-
       - name: Build and Push (Latest)
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           context: .
           tags: fascinated/mc-tracker:latest
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
-
-      - name: Save Docker Build Cache
-        if: steps.build-cache.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p /tmp/.buildx-cache
-          cp -r /tmp/.buildx-cache/. /tmp/.buildx-cache-new
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

Dockerfile

@@ -4,8 +4,9 @@ ENV NODE_ENV=production
 WORKDIR /usr/src/app
 
 COPY ["package.json", "pnpm-lock.yaml", "./"]
-COPY . .
 
 RUN pnpm install --production --silent
 
+COPY . .
+
 CMD pnpm run build && pnpm run start

README.md

@@ -1,2 +1,9 @@
-# backend
+# Mc Tracker
 
+You can view the live instance of this project [here](https://mc-tracker.fascinated.cc).
+
+## Features
+
+- Track Minecraft server's player count over time
+- See player count peaks (all time)
+- Minecraft Java and Bedrock support

data/servers.json

@@ -1,4 +1,14 @@
 [
+  {
+    "name": "HiveMC",
+    "ip": "geo.hivebedrock.network",
+    "type": "PE"
+  },
+  {
+    "name": "Cubecraft - Bedrock",
+    "ip": "play.cubecraft.net",
+    "type": "PE"
+  },
   {
     "name": "WildNetwork",
     "ip": "play.wildnetwork.net",
@@ -44,11 +54,6 @@
     "ip": "gtm.network",
     "type": "PC"
   },
-  {
-    "name": "HiveMC",
-    "ip": "geo.hivebedrock.network",
-    "type": "PE"
-  },
   {
     "name": "Purple Prison",
     "ip": "MCSL.PURPLE.WTF",
@@ -69,11 +74,6 @@
     "ip": "minemen.club",
     "type": "PC"
   },
-  {
-    "name": "Tubnet",
-    "ip": "tubnet.gg",
-    "type": "PC"
-  },
   {
     "name": "OPLegends",
     "ip": "play.oplegends.com",
@@ -93,5 +93,40 @@
     "name": "InvadedLands",
     "ip": "invadedlands.net",
     "type": "PC"
+  },
+  {
+    "name": "Complex Gaming",
+    "ip": "hub.mc-complex.com",
+    "type": "PC"
+  },
+  {
+    "name": "Monumenta",
+    "ip": "server.playmonumenta.com",
+    "type": "PC"
+  },
+  {
+    "name": "Shotbow",
+    "ip": "play.shotbow.net",
+    "type": "PC"
+  },
+  {
+    "name": "Stray",
+    "ip": "stray.gg",
+    "type": "PC"
+  },
+  {
+    "name": "Aetheria Anarchy",
+    "ip": "aetheria.cc",
+    "type": "PC"
+  },
+  {
+    "name": "VexedMC",
+    "ip": "play.vexedmc.com",
+    "type": "PC"
+  },
+  {
+    "name": "AzureMC",
+    "ip": "play.azuremc.org",
+    "type": "PC"
   }
 ]

renovate.json

@@ -1,6 +1,3 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended", ":dependencyDashboard"]
-  "extends": [
-    "local>Fascinated/renovate-config"
-  ]
 }

src/index.ts

@@ -1,6 +1,7 @@
 import Influx from "./influx/influx";
 import ServerManager from "./server/serverManager";
 import WebsiteManager from "./website/websiteManager";
+import {logger} from "./utils/logger";
 
 /**
  * The influx database instance.
@@ -9,3 +10,5 @@ export const influx = new Influx();
 
 new ServerManager();
 new WebsiteManager();
+
+logger.info("Done loading!");

src/server/server.ts

@@ -31,22 +31,22 @@ export default class Server {
   /**
    * The name of the server.
    */
-  private name: string;
+  private readonly name: string;
 
   /**
    * The IP address of the server.
    */
-  private ip: string;
+  private readonly ip: string;
 
   /**
    * The port of the server.
    */
-  private port: number | undefined;
+  private readonly port: number | undefined;
 
   /**
    * The type of server.
    */
-  private type: ServerType;
+  private readonly type: ServerType;
 
   /**
    * The resolved server information from
@@ -69,6 +69,7 @@ export default class Server {
    * @returns the ping response or undefined if the server is offline
    */
   public async pingServer(): Promise<Ping | undefined> {
+    const before = Date.now();
     try {
       let response;
 
@@ -92,10 +93,14 @@ export default class Server {
           new Point("playerCount")
             .tag("name", this.getName())
             .intField("playerCount", response.playerCount)
+            .intField("latency", Date.now() - before)
             .timestamp(response.timestamp)
         );
       } catch (err) {
-        logger.warn(`Failed to write ping to influxdb`, err);
+        logger.warn(
+          `Failed to write point to Influx for ${this.getName()} - ${this.getIP()}`,
+          err
+        );
       }
 
       return Promise.resolve(response);
@@ -138,6 +143,7 @@ export default class Server {
 
     const serverPing = new javaPing.MinecraftServer(ip, port);
 
+    // todo: do something to get the latest protocol? (is this even needed??)
     return new Promise((resolve, reject) => {
       serverPing.ping(Config.pinger.timeout, 765, (err, res) => {
         if (err || res == undefined) {

src/server/serverManager.ts

@@ -20,8 +20,8 @@ export default class ServerManager {
     }
     logger.info(`Loaded ${this.servers.length} servers!`);
 
-    cron.schedule(Config.pinger.pingCron, () => {
+    cron.schedule(Config.pinger.pingCron, async () => {
-      this.pingServers();
+      await this.pingServers();
     });
 
     cron.schedule(Config.pinger.dnsInvalidationCron, () => {
@@ -43,13 +43,4 @@ export default class ServerManager {
 
     logger.info("Finished pinging servers!");
   }
-
-  /**
-   * Returns the servers.
-   *
-   * @returns the servers
-   */
-  public getServers(): Server[] {
-    return this.servers;
-  }
 }

src/utils/fsUtils.ts

@@ -1,41 +0,0 @@
-import fs from "fs";
-
-/**
- * Creates a directory at the given path.
- *
- * @param path the path to the file
- * @param recursive whether to create the directory tree if it doesn't exist (defaults to true)
- * @returns a promise that resolves when the file is created
- */
-export async function createDirectory(
-  path: string,
-  recursive?: boolean
-): Promise<void> {
-  if (recursive == undefined) {
-    recursive = true; // Set to true by default
-  }
-
-  return new Promise((resolve, reject) => {
-    fs.mkdir(path, { recursive: recursive }, (err) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve();
-      }
-    });
-  });
-}
-
-/**
- * Checks if a file exists at the given path.
- *
- * @param path the path to the file
- * @returns a promise that returns true if the file exists, false otherwise
- */
-export async function exists(path: string): Promise<boolean> {
-  return new Promise((resolve) => {
-    fs.exists(path, (exists) => {
-      resolve(exists);
-    });
-  });
-}

src/website/website.ts

@@ -14,12 +14,12 @@ export default class Website {
   /**
    * The name of the website.
    */
-  private name: string;
+  private readonly name: string;
 
   /**
    * The url of the website.
    */
-  private url: string;
+  private readonly url: string;
 
   constructor({ name, url }: WebsiteOptions) {
     this.name = name;

src/website/websiteManager.ts

@@ -19,8 +19,8 @@ export default class WebsiteManager {
     }
     logger.info(`Loaded ${this.websites.length} websites!`);
 
-    cron.schedule(Config.pinger.pingCron, () => {
+    cron.schedule(Config.pinger.pingCron, async () => {
-      this.pingWebsites();
+      await this.pingWebsites();
     });
   }
 
@@ -35,13 +35,4 @@ export default class WebsiteManager {
 
     logger.info("Finished pinging websites!");
   }
-
-  /**
-   * Returns the websites.
-   *
-   * @returns the websites
-   */
-  public getWebsites(): Website[] {
-    return this.websites;
-  }
 }