Switch to using a different method of database access

2025-11-08 19:13:23 -07:00
parent 01e0c233d7
commit 3fe9788a4f
9 changed files with 304 additions and 240 deletions
--- a/bun.lock
+++ b/bun.lock
@@ -11,7 +11,7 @@
        "mysql2": "3.15.3",
      },
      "devDependencies": {
-        "bun-types": "1.3.1",
+        "bun-types": "1.3.2",
      },
    },
  },
@@ -32,7 +32,7 @@

    "aws-ssl-profiles": ["aws-ssl-profiles@1.1.2", "", {}, "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g=="],

-    "bun-types": ["bun-types@1.3.1", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-NMrcy7smratanWJ2mMXdpatalovtxVggkj11bScuWuiOoXTiKIu2eVS1/7qbyI/4yHedtsn175n4Sm4JcdHLXw=="],
+    "bun-types": ["bun-types@1.3.2", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-i/Gln4tbzKNuxP70OWhJRZz1MRfvqExowP7U6JKoI8cntFrtxg7RJK3jvz7wQW54UuvNC8tbKHHri5fy74FVqg=="],

    "cookie": ["cookie@1.0.2", "", {}, "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA=="],

--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
    "mysql2": "3.15.3"
  },
  "devDependencies": {
-    "bun-types": "1.3.1"
+    "bun-types": "1.3.2"
  },
  "module": "src/index.js"
 }
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,37 +1,35 @@
-import { Elysia } from "elysia";
-import { cors } from "@elysiajs/cors"
-import { jsonResponse } from "./lib/util";
-import { drizzle } from 'drizzle-orm/mysql2';
-import mysql from 'mysql2/promise';
+import { Elysia } from 'elysia'
+import { cors } from '@elysiajs/cors'
+import { jsonResponse } from './lib/util'
 import dotenv from 'dotenv'

-import { handler as launcherVersionsHandler } from "./routes/launcher/versions";
-import { handler as launcherLatestHandler } from "./routes/launcher/latest";
-import { handler as launcherLoaderLatestHandler } from "./routes/launcher/loader/latest";
-import { handler as launcherLoaderUpdateDataHandler } from "./routes/launcher/loader/update-data";
+import { handler as launcherVersionsHandler } from './routes/launcher/versions'
+import { handler as launcherLatestHandler } from './routes/launcher/latest'
+import { handler as launcherLoaderLatestHandler } from './routes/launcher/loader/latest'
+import { handler as launcherLoaderUpdateDataHandler } from './routes/launcher/loader/update-data'

 dotenv.config()

-const connection = await mysql.createConnection({
-    host: process.env.DB_HOST ?? 'localhost',
-    port: Number(process.env.DB_PORT) || 3306,
-    user: process.env.DB_USER ?? '',
-    password: process.env.DB_PASS ?? '',
-    database: process.env.DB_NAME ?? ''
-});
+const app = new Elysia().use(
+  cors({
+    origin: '*',
+    methods: ['POST', 'GET']
+  })
+)

-const db = drizzle(connection);
-
-const app = new Elysia()
-    .use(cors({
-        origin: "*",
-        methods: ["POST", "GET"]
-    }))
-
-app.get("/launcher/versions", (context) => launcherVersionsHandler(context, db))
-app.get("/launcher/latest", () => launcherLatestHandler(db))
-app.get("/launcher/loader/latest", launcherLoaderLatestHandler)
-app.get("/launcher/loader/update-data", (context) => launcherLoaderUpdateDataHandler(context, db))
-app.all("*", () => jsonResponse({ message: "No endpoint found (are you using the correct request method?)" }, 404))
+app.get('/launcher/versions', context => launcherVersionsHandler(context))
+app.get('/launcher/latest', launcherLatestHandler)
+app.get('/launcher/loader/latest', launcherLoaderLatestHandler)
+app.get('/launcher/loader/update-data', context =>
+  launcherLoaderUpdateDataHandler(context)
+)
+app.all('*', () =>
+  jsonResponse(
+    {
+      message: 'No endpoint found (are you using the correct request method?)'
+    },
+    404
+  )
+)

 app.listen(3342)
--- a/src/lib/tables.ts
+++ b/src/lib/tables.ts
@@ -1,4 +1,11 @@
-import { bigint, boolean, int, mysqlTable, text, varchar } from "drizzle-orm/mysql-core";
+import {
+  bigint,
+  boolean,
+  int,
+  mysqlTable,
+  text,
+  varchar
+} from 'drizzle-orm/mysql-core'

 export const launcherGames = mysqlTable('launchergames', {
  id: int('id').primaryKey().autoincrement(),
@@ -17,10 +24,13 @@ export const launcherVersions = mysqlTable('launcherversions', {
  platforms: text('platforms').notNull(),
  executables: text('executables').notNull(),
  hidden: boolean('hidden').notNull().default(false),
-    game: int('game').notNull().default(0).references(() => launcherGames.id),
+  game: int('game')
+    .notNull()
+    .default(0)
+    .references(() => launcherGames.id),
  place: int('place').notNull().default(0),
-    sha512sums: text('sha512sums').notNull().default("[]"),
-    sizes: text('sizes').notNull().default("[]")
+  sha512sums: text('sha512sums').notNull().default('[]'),
+  sizes: text('sizes').notNull().default('[]')
 })

 export const launcherUpdates = mysqlTable('launcherupdates', {
@@ -31,5 +41,5 @@ export const launcherUpdates = mysqlTable('launcherupdates', {
  executables: text('executables').notNull(),
  hidden: boolean('hidden').notNull().default(false),
  place: int('place').notNull().default(0),
-    sha512sums: text('sha512sums').notNull().default("[]")
+  sha512sums: text('sha512sums').notNull().default('[]')
 })
--- a/src/lib/util.ts
+++ b/src/lib/util.ts
@@ -1,6 +1,22 @@
+import mysql from 'mysql2'
+import { drizzle } from 'drizzle-orm/mysql2'
+import { Connection } from 'mysql2/typings/mysql/lib/Connection'
+
 export function jsonResponse (data: any, status = 200) {
  return new Response(JSON.stringify(data, null, 2), {
    status,
-        headers: { "Content-Type": "application/json" }
+    headers: { 'Content-Type': 'application/json' }
  })
 }
+
+export function getDatabaseConnection () {
+  const connection = mysql.createConnection({
+    host: process.env.DB_HOST ?? 'localhost',
+    port: Number(process.env.DB_PORT) || 3306,
+    user: process.env.DB_USER ?? '',
+    password: process.env.DB_PASS ?? '',
+    database: process.env.DB_NAME ?? ''
+  })
+
+  return drizzle(connection)
+}
--- a/src/routes/launcher/latest.ts
+++ b/src/routes/launcher/latest.ts
@@ -1,9 +1,12 @@
-import { MySql2Database } from "drizzle-orm/mysql2"
-import { launcherUpdates } from "../../lib/tables"
-import { desc, eq } from "drizzle-orm"
+import { launcherUpdates } from '../../lib/tables'
+import { desc, eq } from 'drizzle-orm'
+import { getDatabaseConnection } from '../../lib/util'

-export async function handler(db: MySql2Database) {
-    const version = await db.select({
+export async function handler () {
+  const db = getDatabaseConnection()
+
+  const version = await db
+    .select({
      id: launcherUpdates.id
    })
    .from(launcherUpdates)
--- a/src/routes/launcher/loader/latest.ts
+++ b/src/routes/launcher/loader/latest.ts
@@ -1,3 +1,3 @@
 export async function handler () {
-    return "1.0.1"
+  return '1.0.1'
 }
--- a/src/routes/launcher/loader/update-data.ts
+++ b/src/routes/launcher/loader/update-data.ts
@@ -1,10 +1,11 @@
-import { MySql2Database } from "drizzle-orm/mysql2";
-import { launcherUpdates } from "../../../lib/tables";
-import { desc, eq } from "drizzle-orm";
-import { jsonResponse } from "../../../lib/util";
-import { Context } from "elysia";
+import { launcherUpdates } from '../../../lib/tables'
+import { desc, eq } from 'drizzle-orm'
+import { getDatabaseConnection, jsonResponse } from '../../../lib/util'
+import { Context } from 'elysia'
+
+export async function handler (context: Context) {
+  const db = getDatabaseConnection()

-export async function handler(context: Context, db: MySql2Database) {
  const platform = context.query.platform as string | undefined
  const arch = context.query.arch as string | undefined
  let showAll = false
@@ -15,29 +16,39 @@ export async function handler(context: Context, db: MySql2Database) {

  let platString = null
  if (!showAll) {
-        if (platform == "windows") {
-            if (arch == "x86_64") platString = "windows"
-            else if (arch == "aarch64") platString = "windows-arm64"
+    if (platform == 'windows') {
+      if (arch == 'x86_64') platString = 'windows'
+      else if (arch == 'aarch64') platString = 'windows-arm64'
      else {
-                return jsonResponse({ error: "Unsupported architecture for Windows" }, 400)
+        return jsonResponse(
+          { error: 'Unsupported architecture for Windows' },
+          400
+        )
      }
-        } else if (platform == "linux") {
-            if (arch == "x86_64") platString = "linux"
+    } else if (platform == 'linux') {
+      if (arch == 'x86_64') platString = 'linux'
      else {
-                return jsonResponse({ error: "Unsupported architecture for Linux" }, 400)
+        return jsonResponse(
+          { error: 'Unsupported architecture for Linux' },
+          400
+        )
      }
-        } else if (platform == "macos") {
-            if (arch == "x86_64") platString = "macos-intel"
-            else if (arch == "aarch64") platString = "macos-silicon"
+    } else if (platform == 'macos') {
+      if (arch == 'x86_64') platString = 'macos-intel'
+      else if (arch == 'aarch64') platString = 'macos-silicon'
      else {
-                return jsonResponse({ error: "Unsupported architecture for macOS" }, 400)
+        return jsonResponse(
+          { error: 'Unsupported architecture for macOS' },
+          400
+        )
      }
    } else {
-            return jsonResponse({ error: "Unsupported platform" }, 400)
+      return jsonResponse({ error: 'Unsupported platform' }, 400)
    }
  }

-    const versionsRaw = await db.select({
+  const versionsRaw = await db
+    .select({
      id: launcherUpdates.id,
      releaseDate: launcherUpdates.releaseDate,
      downloadUrls: launcherUpdates.downloadUrls,
@@ -50,7 +61,8 @@ export async function handler(context: Context, db: MySql2Database) {
    .limit(1)
    .execute()

-    const versions = versionsRaw.map(v => ({
+  const versions = versionsRaw
+    .map(v => ({
      ...v,
      downloadUrls: JSON.parse(v.downloadUrls),
      platforms: JSON.parse(v.platforms),
--- a/src/routes/launcher/versions.ts
+++ b/src/routes/launcher/versions.ts
@@ -1,10 +1,11 @@
-import { MySql2Database } from "drizzle-orm/mysql2";
-import { launcherGames, launcherVersions } from "../../lib/tables";
-import { asc, desc, eq } from "drizzle-orm";
-import { jsonResponse } from "../../lib/util";
-import { Context } from "elysia";
+import { launcherGames, launcherVersions } from '../../lib/tables'
+import { asc, desc, eq } from 'drizzle-orm'
+import { getDatabaseConnection, jsonResponse } from '../../lib/util'
+import { Context } from 'elysia'
+
+export async function handler (context: Context) {
+  const db = getDatabaseConnection()

-export async function handler(context: Context, db: MySql2Database) {
  const platform = context.query.platform as string | undefined
  const arch = context.query.arch as string | undefined
  let showAll = false
@@ -15,30 +16,55 @@ export async function handler(context: Context, db: MySql2Database) {

  let platString = null
  if (!showAll) {
-        if (platform == "windows") {
-            if (arch == "x86_64") platString = "windows"
-            else if (arch == "aarch64") platString = "windows-arm64"
+    if (platform == 'windows') {
+      if (arch == 'x86_64') platString = 'windows'
+      else if (arch == 'aarch64') platString = 'windows-arm64'
      else {
-                return jsonResponse({ message: "Unsupported architecture for Windows", versions: null, games: null }, 400)
+        return jsonResponse(
+          {
+            message: 'Unsupported architecture for Windows',
+            versions: null,
+            games: null
+          },
+          400
+        )
      }
-        } else if (platform == "linux") {
-            if (arch == "x86_64") platString = "linux"
+    } else if (platform == 'linux') {
+      if (arch == 'x86_64') platString = 'linux'
      else {
-                return jsonResponse({ message: "Unsupported architecture for Linux", versions: null, games: null }, 400)
+        return jsonResponse(
+          {
+            message: 'Unsupported architecture for Linux',
+            versions: null,
+            games: null
+          },
+          400
+        )
      }
-        } else if (platform == "macos") {
-            if (arch == "x86_64" || arch == "aarch64") platString = "macos"
+    } else if (platform == 'macos') {
+      if (arch == 'x86_64' || arch == 'aarch64') platString = 'macos'
      else {
-                return jsonResponse({ message: "Unsupported architecture for macOS", versions: null, games: null }, 400)
+        return jsonResponse(
+          {
+            message: 'Unsupported architecture for macOS',
+            versions: null,
+            games: null
+          },
+          400
+        )
      }
-        } else if (platform == "android") platString = "android"
-        else if (platform == "ios") platString = "ios"
+    } else if (platform == 'android') platString = 'android'
+    else if (platform == 'ios') platString = 'ios'
    else {
-            return jsonResponse({ message: "Unsupported platform", versions: null, games: null }, 400)
+      return jsonResponse(
+        { message: 'Unsupported platform', versions: null, games: null },
+        400
+      )
    }
  }

-    const versionsRaw = await db.select({
+  const versionsRaw = await db
+    .select({
      id: launcherVersions.id,
      versionName: launcherVersions.versionName,
      releaseDate: launcherVersions.releaseDate,
@@ -48,15 +74,14 @@ export async function handler(context: Context, db: MySql2Database) {
      executables: launcherVersions.executables,
      sha512sums: launcherVersions.sha512sums,
      sizes: launcherVersions.sizes
-    }).from(launcherVersions)
+    })
+    .from(launcherVersions)
    .where(eq(launcherVersions.hidden, false))
-        .orderBy(
-            asc(launcherVersions.game),
-            desc(launcherVersions.place)
-        )
+    .orderBy(asc(launcherVersions.game), desc(launcherVersions.place))
    .execute()

-    const versions = versionsRaw.map(v => ({
+  const versions = versionsRaw
+    .map(v => ({
      ...v,
      downloadUrls: JSON.parse(v.downloadUrls),
      platforms: JSON.parse(v.platforms),