Add osu direct b/ and md5/ endpoints, w/ cleanup

package.json

@@ -1,50 +1,56 @@
 {
-    "name": "observatory",
-    "version": "1.0.0",
-    "description": "Observatory API",
-    "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"
-    },
-    "dependencies": {
-        "@bogeychan/elysia-logger": "^0.1.4",
-        "@elysiajs/cors": "^1.3.0",
-        "@elysiajs/server-timing": "^1.3.0",
-        "@elysiajs/swagger": "^1.3.0",
-        "@faker-js/faker": "^10.1.0",
-        "@types/adm-zip": "^0.5.6",
-        "adm-zip": "^0.5.16",
-        "axios": "^1.7.7",
-        "dotenv": "^16.4.5",
-        "drizzle-orm": "^0.35.3",
-        "elysia": "~1.3.1",
-        "elysia-autoload": "^1.6.0",
-        "elysia-ip": "^1.0.7",
-        "elysia-rate-limit": "^4.1.0",
-        "elysia-requestid": "1.0.9",
-        "ioredis": "^5.4.1",
-        "pg": "^8.13.1",
-        "pino-loki": "^2.3.1",
-        "pino-pretty": "^11.3.0",
-        "postgres": "^3.4.5",
-        "qs": "^6.14.0",
-        "rosu-pp-js": "^3.1.0"
-    },
-    "devDependencies": {
-        "@types/pg": "^8.11.10",
-        "@types/qs": "^6.9.18",
-        "bun-types": "latest",
-        "drizzle-kit": "^0.26.2",
-        "prettier": "^3.3.3",
-        "tsx": "^4.19.2"
-    },
-    "module": "server/src/app.js"
+  "name": "observatory",
+  "version": "1.0.0",
+  "description": "Observatory API",
+  "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"
+  },
+  "dependencies": {
+    "@bogeychan/elysia-logger": "^0.1.4",
+    "@elysiajs/cors": "^1.3.0",
+    "@elysiajs/server-timing": "^1.3.0",
+    "@elysiajs/swagger": "^1.3.0",
+    "@faker-js/faker": "^10.1.0",
+    "@types/adm-zip": "^0.5.6",
+    "adm-zip": "^0.5.16",
+    "axios": "^1.7.7",
+    "dotenv": "^16.4.5",
+    "drizzle-orm": "^0.35.3",
+    "elysia": "~1.3.1",
+    "elysia-autoload": "^1.6.0",
+    "elysia-ip": "^1.0.7",
+    "elysia-rate-limit": "^4.1.0",
+    "elysia-requestid": "1.0.9",
+    "ioredis": "^5.4.1",
+    "pg": "^8.13.1",
+    "pino-loki": "^2.3.1",
+    "pino-pretty": "^11.3.0",
+    "postgres": "^3.4.5",
+    "qs": "^6.14.0",
+    "rosu-pp-js": "^3.1.0"
+  },
+  "devDependencies": {
+    "@types/bun": "^1.3.4",
+    "@types/pg": "^8.11.10",
+    "@types/qs": "^6.9.18",
+    "bun-types": "latest",
+    "drizzle-kit": "^0.26.2",
+    "prettier": "^3.3.3",
+    "tsx": "^4.19.2"
+  },
+  "module": "server/src/app.js",
+  "type": "module",
+  "private": true,
+  "peerDependencies": {
+    "typescript": "^5"
+  }
 }

server/src/controllers/api/index.ts

@@ -9,42 +9,42 @@ export default (app: App) => {
             async ({
                 BeatmapsManagerInstance,
                 params: { id },
-                query: { full },
+                query: { full, allowMissingNonBeatmapValues },
                 set,
             }) => {
                 const beatmap = await BeatmapsManagerInstance.getBeatmap({
                     beatmapId: id,
+                    allowMissingNonBeatmapValues:
+                        full || allowMissingNonBeatmapValues,
                 });
 
                 if (beatmap.source) {
                     set.headers['X-Data-Source'] = beatmap.source;
                 }
 
-                beatmap.source = undefined;
+                const { source: _, ...responseBeatmap } = beatmap;
 
-                if (!beatmap.data) return beatmap;
-
-                if (!full) return beatmap.data;
+                if (!full) return responseBeatmap?.data ?? responseBeatmap;
 
                 const beatmapset = await BeatmapsManagerInstance.getBeatmapSet({
-                    beatmapSetId: beatmap.data?.beatmapset_id,
+                    beatmapSetId: responseBeatmap.data?.beatmapset_id,
                 });
 
                 if (beatmapset.source) {
                     set.headers['X-Data-Source'] = beatmapset.source;
                 }
 
-                beatmapset.source = undefined;
+                const { source: __, ...responseBeatmapset } = beatmapset;
 
-                if (beatmapset.data)
-                    return beatmapset.data ? beatmapset.data : beatmapset;
+                return responseBeatmapset?.data ?? responseBeatmapset;
             },
             {
                 params: t.Object({
                     id: t.Numeric(),
                 }),
                 query: t.Object({
                     full: t.Optional(t.Boolean()),
+                    allowMissingNonBeatmapValues: t.Optional(t.Boolean()), // TODO: Ideally, we should have shortBeatmap endpoint which would return only beatmap values.
                 }),
                 tags: ['v2'],
             },
@@ -54,35 +54,40 @@ export default (app: App) => {
             async ({
                 BeatmapsManagerInstance,
                 params: { hash },
-                query: { full },
+                query: { full, allowMissingNonBeatmapValues },
                 set,
             }) => {
                 const beatmap = await BeatmapsManagerInstance.getBeatmap({
                     beatmapHash: hash,
+                    allowMissingNonBeatmapValues:
+                        full || allowMissingNonBeatmapValues,
                 });
 
                 if (beatmap.source) {
                     set.headers['X-Data-Source'] = beatmap.source;
                 }
 
-                beatmap.source = undefined;
-
-                if (!beatmap.data) return beatmap;
-
-                if (!full) return beatmap.data;
+                const { source: _, ...responseBeatmap } = beatmap;
+                if (!full) return responseBeatmap?.data ?? responseBeatmap;
 
                 const beatmapset = await BeatmapsManagerInstance.getBeatmapSet({
                     beatmapSetId: beatmap.data?.beatmapset_id,
                 });
 
-                return beatmapset.data ? beatmapset.data : beatmapset;
+                if (beatmapset.source) {
+                    set.headers['X-Data-Source'] = beatmapset.source;
+                }
+
+                const { source: __, ...responseBeatmapset } = beatmapset;
+                return responseBeatmapset?.data ?? responseBeatmapset;
             },
             {
                 params: t.Object({
                     hash: t.String(),
                 }),
                 query: t.Object({
                     full: t.Optional(t.BooleanString()),
+                    allowMissingNonBeatmapValues: t.Optional(t.Boolean()), // TODO: Ideally, we should have shortBeatmap endpoint which would return only beatmap values.
                 }),
                 tags: ['v2'],
             },
@@ -98,11 +103,8 @@ export default (app: App) => {
                     set.headers['X-Data-Source'] = data.source;
                 }
 
-                data.source = undefined;
-
-                if (!data.data) return data;
-
-                return data.data;
+                const { source: _, ...response } = data;
+                return response?.data ?? response;
             },
             {
                 params: t.Object({
@@ -124,11 +126,8 @@ export default (app: App) => {
                     set.headers['X-Data-Source'] = data.source;
                 }
 
-                data.source = undefined;
-
-                if (!data.data) return data;
-
-                return data.data;
+                const { source: _, ...response } = data;
+                return response?.data ?? response;
             },
             {
                 query: t.Object({
@@ -152,11 +151,8 @@ export default (app: App) => {
                     set.headers['X-Data-Source'] = data.source;
                 }
 
-                data.source = undefined;
-
-                if (!data.data) return data;
-
-                return data.data;
+                const { source: _, ...response } = data;
+                return response?.data ?? response;
             },
             {
                 query: t.Object({
@@ -177,11 +173,8 @@ export default (app: App) => {
                     set.headers['X-Data-Source'] = data.source;
                 }
 
-                data.source = undefined;
-
-                if (!data.data) return data;
-
-                return data.data;
+                const { source: _, ...response } = data;
+                return response?.data ?? response;
             },
             {
                 query: t.Object({

server/src/controllers/d/index.ts

@@ -14,9 +14,8 @@ export default (app: App) => {
                     set.headers['X-Data-Source'] = res.source;
                 }
 
-                res.source = undefined;
-
-                return res?.data ?? res;
+                const { source: _, ...response } = res;
+                return response?.data ?? response;
             }),
         {
             params: t.Object({

server/src/controllers/osu/index.ts

@@ -13,9 +13,8 @@ export default (app: App) => {
                     set.headers['X-Data-Source'] = res.source;
                 }
 
-                res.source = undefined;
-
-                return res?.data ?? res;
+                const { source: _, ...response } = res;
+                return response?.data ?? response;
             }),
         {
             params: t.Object({