diff --git a/packages/devtools-connect/src/index.ts b/packages/devtools-connect/src/index.ts index 99a6f365..584b2eb5 100644 --- a/packages/devtools-connect/src/index.ts +++ b/packages/devtools-connect/src/index.ts @@ -7,5 +7,5 @@ export type { AgentWithInitialize, ConnectMongoClientResult, } from './connect'; -export { hookLogger } from './log-hook'; +export { hookLogger, MongoLogWriter } from './log-hook'; export { oidcServerRequestHandler } from './oidc/handler'; diff --git a/packages/devtools-connect/src/log-hook.ts b/packages/devtools-connect/src/log-hook.ts index ca3f8d86..38f64cbf 100644 --- a/packages/devtools-connect/src/log-hook.ts +++ b/packages/devtools-connect/src/log-hook.ts @@ -11,15 +11,18 @@ import type { ConnectRetryAfterTLSErrorEvent, } from './types'; -import { hookLoggerToMongoLogWriter as oidcHookLogger } from '@mongodb-js/oidc-plugin'; -import { hookLogger as proxyHookLogger } from '@mongodb-js/devtools-proxy-support'; +import { + hookLoggerToMongoLogWriter as oidcHookLogger, + MongoLogWriter as OIDCMongoLogWriter, +} from '@mongodb-js/oidc-plugin'; +import { + hookLogger as proxyHookLogger, + MongoLogWriter as ProxyMongoLogWriter, +} from '@mongodb-js/devtools-proxy-support'; -interface MongoLogWriter { - info(c: string, id: unknown, ctx: string, msg: string, attr?: any): void; - warn(c: string, id: unknown, ctx: string, msg: string, attr?: any): void; - error(c: string, id: unknown, ctx: string, msg: string, attr?: any): void; - mongoLogId(this: void, id: number): unknown; -} +export interface MongoLogWriter + extends OIDCMongoLogWriter, + ProxyMongoLogWriter {} export function hookLogger( emitter: ConnectLogEmitter, diff --git a/packages/devtools-proxy-support/src/index.ts b/packages/devtools-proxy-support/src/index.ts index 1a89ba92..ad93c321 100644 --- a/packages/devtools-proxy-support/src/index.ts +++ b/packages/devtools-proxy-support/src/index.ts @@ -13,5 +13,10 @@ export { RequestInfo, RequestInit, } from './fetch'; -export { ProxyEventMap, ProxyLogEmitter, hookLogger } from './logging'; +export { + ProxyEventMap, + ProxyLogEmitter, + hookLogger, + MongoLogWriter, +} from './logging'; export { systemCA, resetSystemCACache } from './system-ca'; diff --git a/packages/devtools-proxy-support/src/logging.ts b/packages/devtools-proxy-support/src/logging.ts index 75868c5e..81c0daa1 100644 --- a/packages/devtools-proxy-support/src/logging.ts +++ b/packages/devtools-proxy-support/src/logging.ts @@ -77,10 +77,10 @@ export interface ProxyLogEmitter { ): unknown; } -interface MongoLogWriter { - info(c: string, id: unknown, ctx: string, msg: string, attr?: any): void; - warn(c: string, id: unknown, ctx: string, msg: string, attr?: any): void; - error(c: string, id: unknown, ctx: string, msg: string, attr?: any): void; +export interface MongoLogWriter { + info(c: string, id: unknown, ctx: string, msg: string, attr?: unknown): void; + warn(c: string, id: unknown, ctx: string, msg: string, attr?: unknown): void; + error(c: string, id: unknown, ctx: string, msg: string, attr?: unknown): void; mongoLogId(this: void, id: number): unknown; }