Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
on: [push]
name: Run Tests
name: Run Tests & Lint
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -14,4 +14,5 @@ jobs:

- run: docker compose -f docker-compose.tests.yml up --detach
- run: bun install --frozen-lockfile
- run: bun lint
- run: bun test
5 changes: 0 additions & 5 deletions .prettierrc.json

This file was deleted.

748 changes: 741 additions & 7 deletions bun.lock

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions eslint.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { defineConfig } from "@richardscull/eslint-config";

export default defineConfig();
40 changes: 26 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
{
"name": "observatory",
"type": "module",
"version": "1.0.0",
"private": true,
"description": "Observatory API",
"module": "server/src/app.js",
"scripts": {
"start": "NODE_ENV=production bun run server/src/app.ts",
"dev": "NODE_ENV=development bun run --watch server/src/app.ts",
"lint": "bunx prettier -w ./server/src --config .prettierrc.json",
"test": "docker-compose -f docker-compose.tests.yml up -d && bun test --env-file=.env.test",
"setup": "bun run docker:dev && bun run db:update",
"db:update": "bun run db:generate && bun run db:push",
"db:generate": "bun --bun drizzle-kit generate --config server/src/database/config.ts",
"db:push": "bun --bun drizzle-kit push --config server/src/database/config.ts",
"db:migration": "bun run server/src/database/migrate.ts",
"docker:dev": "docker-compose -f docker-compose.dev.yml up -d"
"db:push": "bun --bun drizzle-kit push --config server/src/database/config.ts",
"db:update": "bun run db:generate && bun run db:push",
"dev": "NODE_ENV=development bun run --watch server/src/app.ts",
"docker:dev": "docker-compose -f docker-compose.dev.yml up -d",
"lint": "eslint --fix",
"setup": "bun run docker:dev && bun run db:update",
"start": "NODE_ENV=production bun run server/src/app.ts",
"test": "docker-compose -f docker-compose.tests.yml up -d && bun test --env-file=.env.test"
},
"peerDependencies": {
"typescript": "^5"
},
"dependencies": {
"@bogeychan/elysia-logger": "^0.1.4",
Expand All @@ -39,18 +45,24 @@
"rosu-pp-js": "^3.1.0"
},
"devDependencies": {
"@richardscull/eslint-config": "^1.0.5",
"@types/bun": "^1.3.4",
"@types/pg": "^8.11.10",
"@types/qs": "^6.9.18",
"bun-types": "latest",
"drizzle-kit": "^0.26.2",
"eslint": "^9.39.2",
"jiji": "^0.1.7",
"lint-staged": "^16.2.7",
"prettier": "^3.3.3",
"tsx": "^4.19.2"
},
"module": "server/src/app.js",
"type": "module",
"private": true,
"peerDependencies": {
"simple-git-hooks": "^2.13.1",
"tsx": "^4.19.2",
"typescript": "^5"
},
"simple-git-hooks": {
"pre-commit": "npx lint-staged"
},
"lint-staged": {
"*": "eslint --fix"
}
}
15 changes: 7 additions & 8 deletions server/src/app.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { Elysia } from 'elysia';
import { Elysia } from "elysia";

import log from './utils/logger';
import setup from './setup';
import config from './config';
import config from "./config";
import setup from "./setup";
import log from "./utils/logger";

const port = config.PORT;

const app = new Elysia()
.use(setup())
.listen({ port }, ({ hostname, port }) =>
log.info(`🔭 Observatory is running at http://${hostname}:${port}`),
);
.use(setup())
.listen({ port }, ({ hostname, port }) =>
log.info(`🔭 Observatory is running at http://${hostname}:${port}`));

export { app };
export type App = typeof app;
193 changes: 97 additions & 96 deletions server/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,119 +1,120 @@
import { color } from 'bun';
import dotenv from 'dotenv';
import { exit } from 'process';
import { exit } from "node:process";

import { color } from "bun";
import dotenv from "dotenv";

dotenv.config();

export type Mirror =
| 'direct'
| 'bancho'
| 'mino'
| 'osulabs'
| 'gatari'
| 'nerinyan';
export type Mirror
= | "direct"
| "bancho"
| "mino"
| "osulabs"
| "gatari"
| "nerinyan";

const {
PORT,
POSTGRES_USER,
POSTGRES_PASSWORD,
POSTGRES_HOST,
POSTGRES_PORT,
POSTGRES_DB,
REDIS_PORT,
REDIS_HOST,
BANCHO_CLIENT_SECRET,
BANCHO_CLIENT_ID,
DEBUG_MODE,
LOKI_HOST,
IGNORE_RATELIMIT_KEY,
RATELIMIT_CALLS_PER_WINDOW,
RATELIMIT_TIME_WINDOW,
OSZ_FILES_LIFE_SPAN,
MIRRORS_TO_IGNORE,
DISABLE_SAFE_RATELIMIT_MODE,
DISABLE_DAILY_RATE_LIMIT,
ENABLE_CRON_TO_CLEAR_OUTDATED_BEATMAPS,
PORT,
POSTGRES_USER,
POSTGRES_PASSWORD,
POSTGRES_HOST,
POSTGRES_PORT,
POSTGRES_DB,
REDIS_PORT,
REDIS_HOST,
BANCHO_CLIENT_SECRET,
BANCHO_CLIENT_ID,
DEBUG_MODE,
LOKI_HOST,
IGNORE_RATELIMIT_KEY,
RATELIMIT_CALLS_PER_WINDOW,
RATELIMIT_TIME_WINDOW,
OSZ_FILES_LIFE_SPAN,
MIRRORS_TO_IGNORE,
DISABLE_SAFE_RATELIMIT_MODE,
DISABLE_DAILY_RATE_LIMIT,
ENABLE_CRON_TO_CLEAR_OUTDATED_BEATMAPS,
} = process.env;

if (!POSTGRES_USER || !POSTGRES_PASSWORD) {
console.error(
`${color('#ff0000')} Missing required environment variables for Postgres`,
);
exit(1);
console.error(
`${color("#ff0000")} Missing required environment variables for Postgres`,
);
exit(1);
}

if (!BANCHO_CLIENT_SECRET || !BANCHO_CLIENT_ID) {
console.error(
console.error(
`${color(
'#ff0000',
"#ff0000",
)} Missing required environment variables for osu! Bancho. It will be disabled`,
);
);
}

const config: {
PORT: string;
POSTGRES_USER: string;
POSTGRES_PASSWORD: string;
POSTGRES_HOST: string;
POSTGRES_PORT: string;
POSTGRES_DB: string;
REDIS_PORT: number;
BANCHO_CLIENT_SECRET?: string;
BANCHO_CLIENT_ID?: string;
REDIS_HOST?: string;
LOKI_HOST?: string;
IGNORE_RATELIMIT_KEY?: string;
RATELIMIT_CALLS_PER_WINDOW: number;
RATELIMIT_TIME_WINDOW: number;
OSZ_FILES_LIFE_SPAN: number;
IsProduction: boolean;
IsAutomatedTesting: boolean;
IsDebug: boolean;
UseBancho: boolean;
MirrorsToIgnore: string[];
DisableSafeRatelimitMode: boolean;
DisableDailyRateLimit: boolean;
EnableCronToClearOutdatedBeatmaps: boolean;
PORT: string;
POSTGRES_USER: string;
POSTGRES_PASSWORD: string;
POSTGRES_HOST: string;
POSTGRES_PORT: string;
POSTGRES_DB: string;
REDIS_PORT: number;
BANCHO_CLIENT_SECRET?: string;
BANCHO_CLIENT_ID?: string;
REDIS_HOST?: string;
LOKI_HOST?: string;
IGNORE_RATELIMIT_KEY?: string;
RATELIMIT_CALLS_PER_WINDOW: number;
RATELIMIT_TIME_WINDOW: number;
OSZ_FILES_LIFE_SPAN: number;
IsProduction: boolean;
IsAutomatedTesting: boolean;
IsDebug: boolean;
UseBancho: boolean;
MirrorsToIgnore: string[];
DisableSafeRatelimitMode: boolean;
DisableDailyRateLimit: boolean;
EnableCronToClearOutdatedBeatmaps: boolean;
} = {
PORT: PORT || '3000',
POSTGRES_USER: POSTGRES_USER || 'admin',
POSTGRES_PASSWORD: POSTGRES_PASSWORD || 'admin',
POSTGRES_HOST: POSTGRES_HOST || '0.0.0.0',
POSTGRES_PORT: POSTGRES_PORT || '5432',
POSTGRES_DB: POSTGRES_DB || 'observatory',
REDIS_PORT: Number(REDIS_PORT) || 6379,
BANCHO_CLIENT_SECRET,
BANCHO_CLIENT_ID,
REDIS_HOST,
LOKI_HOST: LOKI_HOST,
IGNORE_RATELIMIT_KEY: IGNORE_RATELIMIT_KEY,
RATELIMIT_CALLS_PER_WINDOW: Number(RATELIMIT_CALLS_PER_WINDOW) || 100,
RATELIMIT_TIME_WINDOW: Number(RATELIMIT_TIME_WINDOW) || 20 * 1000,
OSZ_FILES_LIFE_SPAN: Number(OSZ_FILES_LIFE_SPAN) || 24,
IsProduction: Bun.env.NODE_ENV === 'production',
IsAutomatedTesting: Bun.env.NODE_ENV === 'test',
IsDebug: DEBUG_MODE === 'true',
UseBancho: BANCHO_CLIENT_SECRET && BANCHO_CLIENT_ID ? true : false,
MirrorsToIgnore: MIRRORS_TO_IGNORE?.split(',').map((v) => v.trim()) ?? [],
DisableSafeRatelimitMode: DISABLE_SAFE_RATELIMIT_MODE === 'true',
DisableDailyRateLimit: DISABLE_DAILY_RATE_LIMIT === 'true',
EnableCronToClearOutdatedBeatmaps:
ENABLE_CRON_TO_CLEAR_OUTDATED_BEATMAPS === 'true',
PORT: PORT || "3000",
POSTGRES_USER: POSTGRES_USER || "admin",
POSTGRES_PASSWORD: POSTGRES_PASSWORD || "admin",
POSTGRES_HOST: POSTGRES_HOST || "0.0.0.0",
POSTGRES_PORT: POSTGRES_PORT || "5432",
POSTGRES_DB: POSTGRES_DB || "observatory",
REDIS_PORT: Number(REDIS_PORT) || 6379,
BANCHO_CLIENT_SECRET,
BANCHO_CLIENT_ID,
REDIS_HOST,
LOKI_HOST,
IGNORE_RATELIMIT_KEY,
RATELIMIT_CALLS_PER_WINDOW: Number(RATELIMIT_CALLS_PER_WINDOW) || 100,
RATELIMIT_TIME_WINDOW: Number(RATELIMIT_TIME_WINDOW) || 20 * 1000,
OSZ_FILES_LIFE_SPAN: Number(OSZ_FILES_LIFE_SPAN) || 24,
IsProduction: Bun.env.NODE_ENV === "production",
IsAutomatedTesting: Bun.env.NODE_ENV === "test",
IsDebug: DEBUG_MODE === "true",
UseBancho: BANCHO_CLIENT_SECRET && BANCHO_CLIENT_ID ? true : false,
MirrorsToIgnore: MIRRORS_TO_IGNORE?.split(",").map(v => v.trim()) ?? [],
DisableSafeRatelimitMode: DISABLE_SAFE_RATELIMIT_MODE === "true",
DisableDailyRateLimit: DISABLE_DAILY_RATE_LIMIT === "true",
EnableCronToClearOutdatedBeatmaps:
ENABLE_CRON_TO_CLEAR_OUTDATED_BEATMAPS === "true",
};

export const observationaryConfigPublic = {
RATELIMIT_CALLS_PER_WINDOW: Number(RATELIMIT_CALLS_PER_WINDOW) || 100,
RATELIMIT_TIME_WINDOW: Number(RATELIMIT_TIME_WINDOW) || 20 * 1000,
OSZ_FILES_LIFE_SPAN: Number(OSZ_FILES_LIFE_SPAN) || 24,
IsProduction: Bun.env.NODE_ENV === 'production',
IsAutomatedTesting: Bun.env.NODE_ENV === 'test',
IsDebug: DEBUG_MODE === 'true',
UseBancho: BANCHO_CLIENT_SECRET && BANCHO_CLIENT_ID ? true : false,
MirrorsToIgnore: MIRRORS_TO_IGNORE?.split(',').map((v) => v.trim()) ?? [],
DisableSafeRatelimitMode: DISABLE_SAFE_RATELIMIT_MODE === 'true',
DisableDailyRateLimit: DISABLE_DAILY_RATE_LIMIT === 'true',
EnableCronToClearOutdatedBeatmaps:
ENABLE_CRON_TO_CLEAR_OUTDATED_BEATMAPS === 'true',
RATELIMIT_CALLS_PER_WINDOW: Number(RATELIMIT_CALLS_PER_WINDOW) || 100,
RATELIMIT_TIME_WINDOW: Number(RATELIMIT_TIME_WINDOW) || 20 * 1000,
OSZ_FILES_LIFE_SPAN: Number(OSZ_FILES_LIFE_SPAN) || 24,
IsProduction: Bun.env.NODE_ENV === "production",
IsAutomatedTesting: Bun.env.NODE_ENV === "test",
IsDebug: DEBUG_MODE === "true",
UseBancho: BANCHO_CLIENT_SECRET && BANCHO_CLIENT_ID ? true : false,
MirrorsToIgnore: MIRRORS_TO_IGNORE?.split(",").map(v => v.trim()) ?? [],
DisableSafeRatelimitMode: DISABLE_SAFE_RATELIMIT_MODE === "true",
DisableDailyRateLimit: DISABLE_DAILY_RATE_LIMIT === "true",
EnableCronToClearOutdatedBeatmaps:
ENABLE_CRON_TO_CLEAR_OUTDATED_BEATMAPS === "true",
};

export default config;
Loading