diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts index 3e69bf234..4bd0e90d5 100644 --- a/apps/server/src/app.ts +++ b/apps/server/src/app.ts @@ -9,15 +9,15 @@ import { cors } from 'hono/cors' import { logger as honoLogger } from 'hono/logger' import { createLoggLogger, injeca } from 'injeca' +import { createAuth } from './libs/auth' +import { createDrizzle, migrateDatabase } from './libs/db' +import { parsedEnv } from './libs/env' import { sessionMiddleware } from './middlewares/auth' import { createCharacterRoutes } from './routes/characters' import { createChatRoutes } from './routes/chats' import { createProviderRoutes } from './routes/providers' -import { createAuth } from './services/auth' import { createCharacterService } from './services/characters' import { createChatService } from './services/chats' -import { createDrizzle, migrateDatabase } from './services/db' -import { parsedEnv } from './services/env' import { createProviderService } from './services/providers' import { ApiError, createInternalError } from './utils/error' import { getTrustedOrigin } from './utils/origin' diff --git a/apps/server/src/services/auth.ts b/apps/server/src/libs/auth.ts similarity index 100% rename from apps/server/src/services/auth.ts rename to apps/server/src/libs/auth.ts diff --git a/apps/server/src/services/db.ts b/apps/server/src/libs/db.ts similarity index 100% rename from apps/server/src/services/db.ts rename to apps/server/src/libs/db.ts diff --git a/apps/server/src/services/env.ts b/apps/server/src/libs/env.ts similarity index 100% rename from apps/server/src/services/env.ts rename to apps/server/src/libs/env.ts diff --git a/apps/server/src/libs/mock-db.ts b/apps/server/src/libs/mock-db.ts index 26144eabf..77ce3f9ca 100644 --- a/apps/server/src/libs/mock-db.ts +++ b/apps/server/src/libs/mock-db.ts @@ -1,4 +1,4 @@ -import type { Database } from '../services/db' +import type { Database } from './db' import { PGlite } from '@electric-sql/pglite' import { vector } from '@electric-sql/pglite/vector' diff --git a/apps/server/src/middlewares/auth.ts b/apps/server/src/middlewares/auth.ts index cfa09a22c..194aff34e 100644 --- a/apps/server/src/middlewares/auth.ts +++ b/apps/server/src/middlewares/auth.ts @@ -1,6 +1,6 @@ import type { MiddlewareHandler } from 'hono' -import type { createAuth } from '../services/auth' +import type { createAuth } from '../libs/auth' import type { HonoEnv } from '../types/hono' import { createUnauthorizedError } from '../utils/error' diff --git a/apps/server/src/scripts/auth.ts b/apps/server/src/scripts/auth.ts index f2dd7aa9a..8f398db38 100644 --- a/apps/server/src/scripts/auth.ts +++ b/apps/server/src/scripts/auth.ts @@ -1,8 +1,8 @@ import process from 'node:process' -import { createAuth } from '../services/auth' -import { createDrizzle } from '../services/db' -import { parseEnv } from '../services/env' +import { createAuth } from '../libs/auth' +import { createDrizzle } from '../libs/db' +import { parseEnv } from '../libs/env' const env = parseEnv(process.env) export default createAuth(createDrizzle(env.DATABASE_URL), env) diff --git a/apps/server/src/services/characters.ts b/apps/server/src/services/characters.ts index 65b0f7fa8..d3684574e 100644 --- a/apps/server/src/services/characters.ts +++ b/apps/server/src/services/characters.ts @@ -1,4 +1,4 @@ -import type { Database } from './db' +import type { Database } from '../libs/db' import { and, eq, isNull, sql } from 'drizzle-orm' diff --git a/apps/server/src/services/chats.ts b/apps/server/src/services/chats.ts index 0eee633e8..8987b06ec 100644 --- a/apps/server/src/services/chats.ts +++ b/apps/server/src/services/chats.ts @@ -1,4 +1,4 @@ -import type { Database } from './db' +import type { Database } from '../libs/db' import { and, eq } from 'drizzle-orm' diff --git a/apps/server/src/services/providers.ts b/apps/server/src/services/providers.ts index d68036319..45ca699ec 100644 --- a/apps/server/src/services/providers.ts +++ b/apps/server/src/services/providers.ts @@ -1,4 +1,4 @@ -import type { Database } from './db' +import type { Database } from '../libs/db' import { and, eq, isNull, sql } from 'drizzle-orm'