Skip to content

chore(devtools-connect): align MongoLogWriter interfaces between packages #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2025
Merged

chore(devtools-connect): align MongoLogWriter interfaces between packages #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/devtools-connect/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
19 changes: 11 additions & 8 deletions packages/devtools-connect/src/log-hook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 6 additions & 1 deletion packages/devtools-proxy-support/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
8 changes: 4 additions & 4 deletions packages/devtools-proxy-support/src/logging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Loading