♻️ refactor: refactor db core

scripts/migrateServerDB/index.ts

@@ -3,7 +3,7 @@ import { migrate as neonMigrate } from 'drizzle-orm/neon-serverless/migrator';
 import { migrate as nodeMigrate } from 'drizzle-orm/node-postgres/migrator';
 import { join } from 'node:path';
 
-import { serverDB } from '../../src/database/server/core/db';
+import { serverDB } from '../../src/database/server';
 import { DB_FAIL_INIT_HINT, PGVECTOR_HINT } from './errorHint';
 
 // Read the `.env` file if it exists, or a file specified by the

src/database/core/db-adaptor.ts

@@ -0,0 +1,6 @@
+// import { isDesktop } from '@/const/version';
+import { getDBInstance } from '@/database/core/web-server';
+
+// import { getPgliteInstance } from './electron';
+
+export const serverDB = getDBInstance();

src/database/server/core/dbForTest.ts → src/database/core/dbForTest.ts

@@ -9,9 +9,9 @@ import ws from 'ws';
 
 import { serverDBEnv } from '@/config/db';
 
-import * as schema from '../../schemas';
+import * as schema from '../schemas';
 
-const migrationsFolder = join(__dirname, '../../migrations');
+const migrationsFolder = join(__dirname, '../migrations');
 
 export const getTestDBInstance = async () => {
   let connectionString = serverDBEnv.DATABASE_TEST_URL;

src/database/server/core/db.ts → src/database/core/web-server.ts

@@ -1,15 +1,16 @@
 import { Pool as NeonPool, neonConfig } from '@neondatabase/serverless';
-import { NeonDatabase, drizzle as neonDrizzle } from 'drizzle-orm/neon-serverless';
+import { drizzle as neonDrizzle } from 'drizzle-orm/neon-serverless';
 import { drizzle as nodeDrizzle } from 'drizzle-orm/node-postgres';
 import { Pool as NodePool } from 'pg';
 import ws from 'ws';
 
 import { serverDBEnv } from '@/config/db';
 import { isServerMode } from '@/const/version';
+import * as schema from '@/database/schemas';
 
-import * as schema from '../../schemas';
+import { LobeChatDatabase } from '../type';
 
-export const getDBInstance = (): NeonDatabase<typeof schema> => {
+export const getDBInstance = (): LobeChatDatabase => {
   if (!isServerMode) return {} as any;
 
   if (!serverDBEnv.KEY_VAULTS_SECRET) {
@@ -40,5 +41,3 @@ If you don't have it, please run \`openssl rand -base64 32\` to create one.
   const client = new NeonPool({ connectionString });
   return neonDrizzle(client, { schema });
 };
-
-export const serverDB = getDBInstance();

src/database/models/__tests__/_test_template.ts

@@ -2,12 +2,13 @@
 import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
+import { LobeChatDatabase } from '@/database/type';
 
 import { sessionGroups, users } from '../../schemas';
 import { SessionGroupModel } from '../sessionGroup';
+import { getTestDB } from './_util';
 
-let serverDB = await getTestDBInstance();
+const serverDB: LobeChatDatabase = await getTestDB();
 
 const userId = 'session-group-model-test-user-id';
 const sessionGroupModel = new SessionGroupModel(serverDB, userId);

src/database/models/__tests__/_util.ts

@@ -1,8 +1,8 @@
 import { clientDB, initializeDB } from '@/database/client/db';
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
+import { getTestDBInstance } from '@/database/core/dbForTest';
 import { LobeChatDatabase } from '@/database/type';
 
-export const isServerDBMode = process.env.TEST_SERVER_DB === '1';
+const isServerDBMode = process.env.TEST_SERVER_DB === '1';
 
 export const getTestDB = async () => {
   if (isServerDBMode) return await getTestDBInstance();

src/database/models/__tests__/session.test.ts

@@ -2,7 +2,6 @@ import { and, eq, inArray } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
 import { LobeChatDatabase } from '@/database/type';
 import { idGenerator } from '@/database/utils/idGenerator';
 

src/database/repositories/dataImporter/deprecated/__tests__/index.test.ts

@@ -2,6 +2,7 @@
 import { eq, inArray } from 'drizzle-orm/expressions';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { getTestDBInstance } from '@/database/core/dbForTest';
 import {
   agents,
   agentsToSessions,
@@ -11,7 +12,6 @@ import {
   topics,
   users,
 } from '@/database/schemas';
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
 import { CURRENT_CONFIG_VERSION } from '@/migrations';
 import { ImporterEntryData } from '@/types/importer';
 

src/database/server/index.ts

@@ -1 +1 @@
-export { serverDB } from './core/db';
+export { serverDB } from '../core/db-adaptor';

src/database/server/models/__tests__/nextauth.test.ts

@@ -8,14 +8,14 @@ import type {
 import { eq } from 'drizzle-orm/expressions';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { getTestDBInstance } from '@/database/core/dbForTest';
 import {
   nextauthAccounts,
   nextauthAuthenticators,
   nextauthSessions,
   nextauthVerificationTokens,
   users,
 } from '@/database/schemas';
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
 import { LobeChatDatabase } from '@/database/type';
 import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
 

src/database/server/models/__tests__/user.test.ts

@@ -4,7 +4,7 @@ import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { INBOX_SESSION_ID } from '@/const/session';
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
+import { getTestDBInstance } from '@/database/core/dbForTest';
 import { LobeChatDatabase } from '@/database/type';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { UserGuide, UserPreference } from '@/types/user';