diff --git a/src/auth/session.ts b/src/auth/session.ts index 99ff74d..c6d74c5 100644 --- a/src/auth/session.ts +++ b/src/auth/session.ts @@ -4,7 +4,7 @@ import assert from 'node:assert' import type { IncomingMessage, ServerResponse } from 'node:http' import { getIronSession } from 'iron-session' import { env } from '#/env' -import { AppContext } from '#/config' +import { AppContext } from '#/index' export type Session = { did: string } diff --git a/src/config.ts b/src/config.ts deleted file mode 100644 index fe8748b..0000000 --- a/src/config.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { OAuthClient } from '@atproto/oauth-client-node' -import type pino from 'pino' -import type { Database } from '#/db' -import type { Ingester } from '#/firehose/ingester' -import { Resolver } from '#/ident/types' - -export type AppContext = { - db: Database - ingester: Ingester - logger: pino.Logger - oauthClient: OAuthClient - resolver: Resolver -} diff --git a/src/index.ts b/src/index.ts index 1d48153..ab2127e 100755 --- a/src/index.ts +++ b/src/index.ts @@ -9,7 +9,17 @@ import { Ingester } from '#/firehose/ingester' import { createRouter } from '#/routes' import { createClient } from '#/auth/client' import { createResolver } from '#/ident/resolver' -import type { AppContext } from '#/config' +import type { OAuthClient } from '@atproto/oauth-client-node' +import type { Database } from '#/db' +import { Resolver } from '#/ident/types' + +export type AppContext = { + db: Database + ingester: Ingester + logger: pino.Logger + oauthClient: OAuthClient + resolver: Resolver +} export class Server { constructor( diff --git a/src/routes/index.ts b/src/routes/index.ts index 51b957b..130056c 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -3,7 +3,7 @@ import { OAuthResolverError } from '@atproto/oauth-client-node' import { isValidHandle } from '@atproto/syntax' import express from 'express' import { createSession, destroySession, getSessionAgent } from '#/auth/session' -import type { AppContext } from '#/config' +import type { AppContext } from '#/index' import { home } from '#/pages/home' import { login } from '#/pages/login' import { page } from '#/view'