refactor: migrate to drizzle

Author: trim21

.prettierignore

@@ -3,4 +3,4 @@ dist/
 coverage/
 .husky/_/
 pnpm-lock.yaml
-vendor/common
+vendor/common/

drizzle/schema.ts

@@ -1,7 +1,7 @@
 import {
   bigint,
-  binary,
   char,
+  customType,
   date,
   float,
   index,
@@ -530,11 +530,25 @@ export const chiiOauthClients = mysqlTable(
   },
 );
 
+const mediumblob = (name: string) =>
+  customType<{ data: Buffer; driverData: string }>({
+    dataType() {
+      return 'mediumblob';
+    },
+    fromDriver(value) {
+      return Buffer.from(value);
+    },
+
+    toDriver(value: Buffer): string {
+      // @ts-expect-error https://github.com/drizzle-team/drizzle-orm/issues/1188
+      return value;
+    },
+  })(name);
+
 export const chiiOsWebSessions = mysqlTable('chii_os_web_sessions', {
   key: char('key', { length: 64 }).notNull(),
   userID: int('user_id').notNull(),
-  // Warning: Can't parse mediumblob from database
-  value: binary('value').notNull(),
+  value: mediumblob('value').notNull(),
   createdAt: bigint('created_at', { mode: 'number' }).notNull(),
   expiredAt: bigint('expired_at', { mode: 'number' }).notNull(),
 });

lib/auth/session.test.ts

@@ -1,16 +1,17 @@
 import { DateTime } from 'luxon';
 import { afterEach, beforeEach, expect, test } from 'vitest';
 
-import { SessionRepo } from '@app/lib/orm/index.ts';
+import { db, op } from '@app/drizzle/db.ts';
+import { chiiOsWebSessions } from '@app/drizzle/schema.ts';
 
 import { create, get, revoke } from './session.ts';
 
 beforeEach(async () => {
-  await SessionRepo.delete({});
+  await db.delete(chiiOsWebSessions).execute();
 });
 
 afterEach(async () => {
-  await SessionRepo.delete({});
+  await db.delete(chiiOsWebSessions).execute();
 });
 
 test('should create and get session', async () => {
@@ -19,7 +20,9 @@ test('should create and get session', async () => {
     regTime: DateTime.fromISO('2010-01-10 10:05:20').toUnixInteger(),
   });
 
-  const session = await SessionRepo.findOne({ where: { key: token } });
+  const session = await db.query.chiiOsWebSessions.findFirst({
+    where: op.eq(chiiOsWebSessions.key, token),
+  });
 
   expect(session).toBeDefined();
 
@@ -35,7 +38,7 @@ test('should create and get session', async () => {
 
 test('should revoke session', async () => {
   const token = 'fake-random-session-token';
-  await SessionRepo.insert({
+  await db.insert(chiiOsWebSessions).values({
     key: token,
     value: Buffer.from(''),
     userID: 0,
@@ -45,7 +48,9 @@ test('should revoke session', async () => {
 
   await revoke(token);
 
-  const session = await SessionRepo.findOne({ where: { key: token } });
+  const session = await db.query.chiiOsWebSessions.findFirst({
+    where: op.eq(chiiOsWebSessions.key, token),
+  });
 
   expect(session).toBeDefined();
 });

lib/auth/session.ts

@@ -1,8 +1,9 @@
 import type { CookieSerializeOptions } from '@fastify/cookie';
 import { DateTime } from 'luxon';
 
+import { db, op } from '@app/drizzle/db.ts';
+import { chiiOsWebSessions } from '@app/drizzle/schema.ts';
 import { TypedCache } from '@app/lib/cache.ts';
-import { SessionRepo } from '@app/lib/orm/index.ts';
 import { randomBytes } from '@app/lib/utils/index.ts';
 
 import type { IAuth } from './index.ts';
@@ -29,7 +30,7 @@ export async function create(user: { id: number; regTime: number }): Promise<str
     expired_at: now + 60 * 60 * 24 * 7,
   };
 
-  await SessionRepo.insert({
+  await db.insert(chiiOsWebSessions).values({
     value: Buffer.from(JSON.stringify(value)),
     userID: user.id,
     createdAt: value.created_at,
@@ -53,21 +54,27 @@ export async function get(sessionID: string): Promise<IAuth | null> {
     return await auth.byUserID(cached.userID);
   }
 
-  const session = await SessionRepo.findOneBy({ key: sessionID });
+  const session = await db.query.chiiOsWebSessions.findFirst({
+    where: op.and(
+      op.eq(chiiOsWebSessions.key, sessionID),
+      op.gt(chiiOsWebSessions.expiredAt, DateTime.now().toUnixInteger()),
+    ),
+  });
   if (!session) {
     return null;
   }
-  if (session.expiredAt <= DateTime.now().toUnixInteger()) {
-    return null;
-  }
 
   await sessionCache.set(sessionID, { userID: session.userID });
 
   return await auth.byUserID(session.userID);
 }
 
 export async function revoke(sessionID: string) {
-  await SessionRepo.update({ key: sessionID }, { expiredAt: DateTime.now().toUnixInteger() });
+  await db
+    .update(chiiOsWebSessions)
+    .set({ expiredAt: DateTime.now().toUnixInteger() })
+    .where(op.eq(chiiOsWebSessions.key, sessionID))
+    .execute();
 
   await sessionCache.del(sessionID);
 }

lib/orm/index.ts

@@ -147,9 +147,7 @@ export const SubjectRevRepo = AppDataSource.getRepository(SubjectRev);
 export const SubjectInterestRepo = AppDataSource.getRepository(SubjectInterest);
 
 export const AccessTokenRepo = AppDataSource.getRepository(OauthAccessTokens);
-export const AppRepo = AppDataSource.getRepository(App);
 export const OauthClientRepo = AppDataSource.getRepository(OauthClient);
-export const SessionRepo = AppDataSource.getRepository(WebSessions);
 export const UserGroupRepo = AppDataSource.getRepository(UserGroup);
 
 export const NotifyRepo = AppDataSource.getRepository(Notify);
@@ -175,7 +173,6 @@ export const repo = {
   Person: PersonRepo,
   PersonSubjects: PersonSubjectsRepo,
   AccessToken: AccessTokenRepo,
-  Session: SessionRepo,
   UserGroup: UserGroupRepo,
   Notify: NotifyRepo,
   NotifyField: NotifyFieldRepo,

routes/private/routes/login.test.ts

@@ -1,19 +1,20 @@
 import { afterEach, beforeEach, describe, expect, test } from 'vitest';
 
+import { db } from '@app/drizzle/db.ts';
+import { chiiOsWebSessions } from '@app/drizzle/schema.ts';
 import * as session from '@app/lib/auth/session.ts';
-import { SessionRepo } from '@app/lib/orm/index.ts';
 import redis from '@app/lib/redis.ts';
 import { createServer } from '@app/lib/server.ts';
 
 describe('login', () => {
   beforeEach(async () => {
     await redis.flushdb('SYNC');
-    await SessionRepo.createQueryBuilder().where('true').delete().execute();
+    await db.delete(chiiOsWebSessions).execute();
   });
 
   afterEach(async () => {
     await redis.flushdb('SYNC');
-    await SessionRepo.createQueryBuilder().where('true').delete().execute();
+    await db.delete(chiiOsWebSessions).execute();
   });
 
   test('should failed on too many requests', async () => {

tests/rest/auth.test.ts

@@ -1,18 +1,19 @@
 import { afterEach, beforeEach, expect, test } from 'vitest';
 
+import { db } from '@app/drizzle/db.ts';
+import { chiiOsWebSessions } from '@app/drizzle/schema.ts';
 import * as session from '@app/lib/auth/session.ts';
-import { SessionRepo } from '@app/lib/orm/index.ts';
 import { createServer } from '@app/lib/server.ts';
 
 const treeHoleUser = { id: 382951, nickname: '树洞酱', username: '382951' };
 const fakeIP = 'fake-client-ip-should-not-fail';
 
 beforeEach(async () => {
-  await SessionRepo.createQueryBuilder().where('true').delete().execute();
+  await db.delete(chiiOsWebSessions).execute();
 });
 
 afterEach(async () => {
-  await SessionRepo.createQueryBuilder().where('true').delete().execute();
+  await db.delete(chiiOsWebSessions).execute();
 });
 
 test('should pass login/logout authorization flow', async () => {