diff --git a/package.json b/package.json index fcafaa25d..a5129d404 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "build:bot": "node scripts/build --build=bot", "build:server": "node scripts/build --build=server", "build": "yarn lint && node scripts/build --build=all", - "dev:bot": "yarn build:bot --dev && yarn start:bot --dev", - "dev:server": "yarn build:server --dev && yarn start:server --dev", + "dev:bot": "yarn build:bot --dev && yarn start:bot", + "dev:server": "yarn build:server --dev && yarn start:server", "start:bot": "node --enable-source-maps --trace-warnings dist/bot.cjs", "start:server": "node --enable-source-maps --trace-warnings dist/server.cjs", "zip": "zip -r dist.zip dist", diff --git a/src/core/express/normalizeResponderReturnable.ts b/src/core/express/normalizeRouterReturnable.ts similarity index 51% rename from src/core/express/normalizeResponderReturnable.ts rename to src/core/express/normalizeRouterReturnable.ts index 4b9eb100b..5e775e089 100644 --- a/src/core/express/normalizeResponderReturnable.ts +++ b/src/core/express/normalizeRouterReturnable.ts @@ -1,8 +1,8 @@ -import { ResponderReturnable } from '../../server.js'; +import { RouterReturnable } from '../../server.js'; import jsxToSvg from '../node/jsxToSvg.js'; -export default async function normalizeResponderReturnable( - returnable: ResponderReturnable, +export default async function normalizeRouterReturnable( + returnable: RouterReturnable, ) { const awaitedReturnable = await returnable; const svg = await jsxToSvg(awaitedReturnable); diff --git a/src/responders/stats.tsx b/src/routers/stats.tsx similarity index 88% rename from src/responders/stats.tsx rename to src/routers/stats.tsx index bab1e5c5f..a47213a14 100644 --- a/src/responders/stats.tsx +++ b/src/routers/stats.tsx @@ -1,7 +1,7 @@ import { BlitzServer } from '../constants/servers.js'; import resolvePeriodFromRequest from '../core/express/resolvePeriodFromRequest.js'; import stats, { StatType } from '../renderers/stats.js'; -import { ResponderRegistry } from '../server.js'; +import { RouterRegistry } from '../server.js'; export default { route: '/stats/:type/:period', @@ -22,4 +22,4 @@ export default { parseInt(req.query.tank as string), ); }, -} satisfies ResponderRegistry; +} satisfies RouterRegistry; diff --git a/src/server.ts b/src/server.ts index 0c2cf6462..1c4c1ea9d 100644 --- a/src/server.ts +++ b/src/server.ts @@ -1,12 +1,12 @@ import express, { Request, Response } from 'express'; -import normalizeResponderReturnable from './core/express/normalizeResponderReturnable.js'; +import normalizeRouterReturnable from './core/express/normalizeRouterReturnable.js'; import isDev from './core/node/isDev.js'; import { Registry } from './events/interactionCreate/index.js'; -import stats from './responders/stats.js'; +import stats from './routers/stats.js'; -export type ResponderReturnable = JSX.Element | Promise; +export type RouterReturnable = JSX.Element | Promise; -export interface ResponderRegistry +export interface RouterRegistry extends Registry { route: string; handlesInteraction?: HandlesInteraction; @@ -14,12 +14,12 @@ export interface ResponderRegistry handler: ( req: Request, res: Response, - ) => HandlesInteraction extends true ? void : ResponderReturnable; + ) => HandlesInteraction extends true ? void : RouterReturnable; } const app = express(); -([stats] as ResponderRegistry[]).forEach((registry) => { +([stats] as RouterRegistry[]).forEach((registry) => { if (!(isDev() ? registry.inDevelopment : registry.inProduction)) return; app.get(registry.route, async (req, res) => { @@ -27,7 +27,7 @@ const app = express(); if (registry.handlesInteraction) return; - const response = await normalizeResponderReturnable(returnable); + const response = await normalizeRouterReturnable(returnable); res.writeHead(200, { 'Content-Type': 'image/svg+xml', diff --git a/tsconfig.json b/tsconfig.json index 61fa9c597..f4fceb5f4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,5 +11,10 @@ "resolveJsonModule": true, "jsx": "react-jsx" }, - "include": ["src/**/*.ts", "src/renderers/stats.tsx", "src/events/interactionCreate/handlers/button.tsx", "src/responders/stats.tsx"] + "include": [ + "src/**/*.ts", + "src/renderers/stats.tsx", + "src/events/interactionCreate/handlers/button.tsx", + "src/routers/stats.tsx" + ] }