Merge pull request #446 from PretendoNetwork/feat/express-5

Express 5

Author: mrjvs

.github/dependabot.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: "20"
+          node-version: "24"
 
       - name: Install dependencies
         run: npm ci

.github/workflows/lint.yml

@@ -25,12 +25,10 @@
     "connect-redis": "^9.0.0",
     "cookie-parser": "^1.4.7",
     "crc": "^4.3.2",
-    "express": "^4.22.1",
-    "express-async-errors": "^3.1.1",
+    "express": "^5.2.1",
     "express-prom-bundle": "^7.0.2",
     "express-rate-limit": "^8.2.1",
     "express-session": "^1.19.0",
-    "express-subdomain": "^1.0.6",
     "hashmap": "^2.4.0",
     "i18next": "^25.8.13",
     "luxon": "^3.7.2",
@@ -67,7 +65,7 @@
     "@types/hashmap": "^2.3.4",
     "@types/luxon": "^3.7.1",
     "@types/method-override": "^3.0.0",
-    "@types/node": "^22.19.15",
+    "@types/node": "^24.12.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "browserslist": "^4.28.1",
@@ -82,4 +80,4 @@
     "tsup": "^8.5.1",
     "typescript": "^5.9.3"
   }
-}
+}

apps/juxtaposition-ui/package.json

@@ -69,6 +69,11 @@ const schema = z.object({
 		host: z.string(),
 		port: z.coerce.number().default(6379)
 	}),
+	domains: z.object({
+		web: z.hostname().default('juxt.pretendo.network'),
+		ctr: z.hostname().default('ctr.olv.pretendo.cc'),
+		portal: z.hostname().default('portal.olv.pretendo.cc')
+	}).prefault({}),
 	dmBanner: z.object({
 		text: z.string().optional(), // Add `<url>content</url>` to insert the url
 		url: z.url().optional(),

apps/juxtaposition-ui/src/config.ts

@@ -0,0 +1,14 @@
+import type express from 'express';
+
+export function restrictHostnames<TFn extends express.Router>(
+	allowedHostnames: string[],
+	fn: TFn
+): (request: express.Request, response: express.Response, next: () => void) => void | TFn {
+	return (request: express.Request, response: express.Response, next: () => void) => {
+		if (allowedHostnames.includes(request.hostname)) {
+			return fn(request, response, next);
+		}
+
+		return next();
+	};
+}

apps/juxtaposition-ui/src/middleware/hostLimit.ts

@@ -2,7 +2,6 @@ import express from 'express';
 import cookieParser from 'cookie-parser';
 import session from 'express-session';
 import { RedisStore } from 'connect-redis';
-import 'express-async-errors'; // See package docs
 import methodOverride from 'method-override';
 import { database } from '@/database';
 import { logger } from '@/logger';

apps/juxtaposition-ui/src/server.ts

@@ -1,12 +1,12 @@
 import express from 'express';
-import subdomain from 'express-subdomain';
 import { webAuth } from '@/middleware/webAuth';
 import { consoleAuth } from '@/middleware/consoleAuth';
 import { checkBan } from '@/middleware/checkBan';
 import { detectVersion } from '@/middleware/detectVersion';
 import { checkDiscovery } from '@/middleware/discovery';
-import { logger } from '@/logger';
 import { routes } from '@/services/juxt-web/routes';
+import { restrictHostnames } from '@/middleware/hostLimit';
+import { config } from '@/config';
 
 export const router = express.Router();
 const consoleRouter = express.Router();
@@ -20,20 +20,8 @@ router.use(routes.ENTRYPOINT);
 router.use(checkDiscovery);
 
 // Create subdomains
-logger.info('[JUXT-WEB] Creating \'Web\' subdomain');
-router.use(subdomain('juxt', webRouter));
-router.use(subdomain('juxt-beta', webRouter));
-router.use(subdomain('juxt-dev', webRouter));
-
-logger.info('[JUXT-WEB] Creating \'Wii U\' subdomain');
-router.use(subdomain('portal.olv', consoleRouter));
-router.use(subdomain('portal-beta.olv', consoleRouter));
-router.use(subdomain('portal-dev.olv', consoleRouter));
-
-logger.info('[JUXT-WEB] Creating \'3DS\' subdomain');
-router.use(subdomain('ctr.olv', consoleRouter));
-router.use(subdomain('ctr-beta.olv', consoleRouter));
-router.use(subdomain('ctr-dev.olv', consoleRouter));
+router.use(restrictHostnames([config.domains.web], webRouter));
+router.use(restrictHostnames([config.domains.portal, config.domains.ctr], consoleRouter));
 
 // Setup routes for console
 consoleRouter.use(consoleAuth);

apps/juxtaposition-ui/src/services/juxt-web/index.ts

@@ -21,11 +21,9 @@
 		"@repo/grpc-client": "^0.0.0",
 		"colors": "^1.4.0",
 		"crc": "^4.3.2",
-		"express": "^4.22.1",
-		"express-async-errors": "^3.1.1",
+		"express": "^5.2.1",
 		"express-prom-bundle": "^7.0.2",
 		"express-rate-limit": "^8.2.1",
-		"express-subdomain": "^1.0.6",
 		"moment": "^2.24.0",
 		"mongoose": "^8.23.0",
 		"multer": "^2.1.1",

apps/miiverse-api/package.json

@@ -52,7 +52,11 @@ const schema = z.object({
 			port: z.coerce.number().default(8125),
 			apiKey: z.string()
 		})
-	})
+	}),
+	domains: z.object({
+		api: z.hostname().default('api.olv.pretendo.cc'),
+		discovery: z.hostname().default('discovery.olv.pretendo.cc')
+	}).prefault({})
 });
 
 export const presets: Record<string, any> = {

apps/miiverse-api/src/config.ts

@@ -0,0 +1,14 @@
+import type express from 'express';
+
+export function restrictHostnames<TFn extends express.Router>(
+	allowedHostnames: string[],
+	fn: TFn
+): (request: express.Request, response: express.Response, next: () => void) => void | TFn {
+	return (request: express.Request, response: express.Response, next: () => void) => {
+		if (allowedHostnames.includes(request.hostname)) {
+			return fn(request, response, next);
+		}
+
+		return next();
+	};
+}