Skip to content

Commit df930b1

Browse files
committed
feat: Migrate logger to js-toolkit logger implementation
1 parent ae86bc7 commit df930b1

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

packages/client/src/coordinator/connection/connection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
sleep,
99
} from './utils';
1010
import type { StreamVideoEvent, UR } from './types';
11-
import type { ScopedLogLevel } from '../../logger';
11+
import type { LogLevel } from '@stream-io/logger';
1212
import type {
1313
ConnectedEvent,
1414
ConnectionErrorEvent,
@@ -88,7 +88,7 @@ export class StableWSConnection {
8888
addConnectionEventListeners(this.onlineStatusChanged);
8989
}
9090

91-
_log = (msg: string, extra: UR = {}, level: ScopedLogLevel = 'info') => {
91+
_log = (msg: string, extra: UR = {}, level: LogLevel = 'info') => {
9292
this.client.logger[level](`connection:${msg}`, extra);
9393
};
9494

packages/client/src/coordinator/connection/types.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { AxiosRequestConfig, AxiosResponse } from 'axios';
22
import { ConnectedEvent, UserRequest, VideoEvent } from '../../gen/coordinator';
33
import { AllSfuEvents } from '../../rtc';
4-
import { ConfigureLoggersOptions } from '@stream-io/logger';
4+
import type { ConfigureLoggersOptions, LogLevel } from '@stream-io/logger';
55

66
export type UR = Record<string, unknown>;
77

@@ -25,8 +25,6 @@ export type { OwnUserResponse } from '../../gen/coordinator';
2525

2626
export type ConnectAPIResponse = Promise<void | ConnectedEvent>;
2727

28-
export type LogLevel = 'trace' | 'debug' | 'info' | 'warn' | 'error';
29-
3028
type ErrorResponseDetails = {
3129
code: number;
3230
messages: string[];

packages/client/src/logger.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as scopedLogger from '@stream-io/logger';
2-
import { Logger, LogLevel } from './coordinator/connection/types';
2+
import { Logger } from './coordinator/connection/types';
33
import { isReactNative } from './helpers/platforms';
4-
import { ConfigureLoggersOptions } from '@stream-io/logger';
4+
import type { ConfigureLoggersOptions, LogLevel } from '@stream-io/logger';
55

66
export const logToConsole: Logger = (logLevel, message, ...args) => {
77
let logMethod;
@@ -52,9 +52,12 @@ export const setLogger = (
5252
*/
5353
export const getLogger = scopedLogger.getLogger<string>;
5454

55+
/**
56+
* @internal
57+
*/
5558
export type ScopedLogger = scopedLogger.Logger<string>;
5659

5760
export const configureLoggers = scopedLogger.configureLoggers<string>;
5861

59-
export type { LogLevel as ScopedLogLevel, Sink } from '@stream-io/logger';
62+
export type { LogLevel, Sink } from '@stream-io/logger';
6063
export { LogLevelEnum, restoreDefaults } from '@stream-io/logger';

packages/client/src/rpc/createClient.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import {
1212
import { SignalServerClient } from '../gen/video/sfu/signal_rpc/signal.client';
1313
import type { Trace } from '../stats';
1414
import type { SfuResponseWithError } from './retryable';
15-
import type { ScopedLogger, ScopedLogLevel } from '../logger';
15+
import type { ScopedLogger } from '../logger';
16+
import type { LogLevel } from '@stream-io/logger';
1617

1718
const defaultOptions: TwirpOptions = {
1819
baseUrl: '',
@@ -41,7 +42,7 @@ export const withHeaders = (
4142

4243
export const withRequestLogger = (
4344
logger: ScopedLogger,
44-
level: ScopedLogLevel,
45+
level: LogLevel,
4546
): RpcInterceptor => {
4647
return {
4748
interceptUnary: (

0 commit comments

Comments
 (0)