I'm an idiot

Author: sebasptsch

apps/server/package.json

@@ -22,7 +22,6 @@
 		"execa": "^9.6.0",
 		"fastify": "^5.6.1",
 		"gel": "^2.1.1",
-		"ipaddr.js": "^2.2.0",
 		"nanoid": "^3.3.11",
 		"zod": "^4.1.12"
 	},

apps/server/src/main.ts

@@ -6,7 +6,6 @@ import {
 } from "@trpc/server/adapters/fastify";
 import type { TRPCReconnectNotification } from "@trpc/server/rpc";
 import fastify from "fastify";
-import ipaddr from "ipaddr.js";
 import { env } from "./env";
 import { roomRouter } from "./routers/room";
 import { roomAdminRouter } from "./routers/room-admin";
@@ -29,38 +28,7 @@ const server = fastify({
 	routerOptions: {
 		maxParamLength: 5000,
 	},
-	trustProxy: env.TRUSTED_PROXIES
-		? (address) => {
-			const ip = ipaddr.parse(address);
-			const trustedCidrs =
-				env.TRUSTED_PROXIES?.filter((c) => ipaddr.isValidCIDR(c)).map((c) =>
-					ipaddr.parseCIDR(c),
-				) || [];
-			const trustedIps =
-				env.TRUSTED_PROXIES?.filter((c) => ipaddr.isValid(c)).map((c) =>
-					ipaddr.parse(c),
-				) || [];
-
-			// Check if the IP matches any trusted CIDR
-			for (const [range, prefix] of trustedCidrs) {
-				if (ip.match(range, prefix)) {
-					return true;
-				}
-			}
-
-			// Check if the IP matches any trusted IP directly
-			for (const trustedIp of trustedIps) {
-				if (
-					ip.kind() === trustedIp.kind() &&
-					ip.toNormalizedString() === trustedIp.toNormalizedString()
-				) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-		: false,
+	trustProxy: env.TRUSTED_PROXIES,
 });
 
 await server.register(ws, {

bun.lock

@@ -59,7 +59,6 @@
         "execa": "^9.6.0",
         "fastify": "^5.6.1",
         "gel": "^2.1.1",
-        "ipaddr.js": "^2.2.0",
         "nanoid": "^3.3.11",
         "zod": "^4.1.12",
       },