From 6e9bea310e5a567314ca9477b056049e5dd074c7 Mon Sep 17 00:00:00 2001 From: Dzianis Dashkevich Date: Fri, 4 Oct 2024 13:40:46 -0400 Subject: [PATCH] chore: move mappers --- packages/playback/src/lib/consts/interceptor-type.ts | 1 + packages/playback/src/lib/network/network-manager.ts | 2 +- packages/playback/src/lib/network/network-request.ts | 2 +- packages/playback/src/lib/player.ts | 2 +- packages/playback/src/lib/service-locator.ts | 4 ++-- .../interceptor-type-to-interceptor-map.declarations.ts | 5 ----- .../playback/src/lib/types/interceptors.declarations.ts | 2 +- .../{ => mappers}/event-type-to-event-map.declarations.ts | 6 +++--- .../interceptor-type-to-interceptor-map.declarations.ts | 6 ++++++ packages/playback/src/lib/types/network.declarations.ts | 2 +- packages/playback/src/lib/utils/interceptors-storage.ts | 2 +- packages/playback/test/network/network-request.test.ts | 2 +- 12 files changed, 19 insertions(+), 17 deletions(-) delete mode 100644 packages/playback/src/lib/types/interceptor-type-to-interceptor-map.declarations.ts rename packages/playback/src/lib/types/{ => mappers}/event-type-to-event-map.declarations.ts (89%) create mode 100644 packages/playback/src/lib/types/mappers/interceptor-type-to-interceptor-map.declarations.ts diff --git a/packages/playback/src/lib/consts/interceptor-type.ts b/packages/playback/src/lib/consts/interceptor-type.ts index ac1aca3..06d97d5 100644 --- a/packages/playback/src/lib/consts/interceptor-type.ts +++ b/packages/playback/src/lib/consts/interceptor-type.ts @@ -2,4 +2,5 @@ // since they can be used as values they should not be in the types folder export enum InterceptorType { NetworkRequest = 'NetworkRequest', + HlsPlaylistParse = 'HlsPlaylistParse', } diff --git a/packages/playback/src/lib/network/network-manager.ts b/packages/playback/src/lib/network/network-manager.ts index e90584e..e55dc22 100644 --- a/packages/playback/src/lib/network/network-manager.ts +++ b/packages/playback/src/lib/network/network-manager.ts @@ -10,7 +10,7 @@ import type { import { NetworkRequestWithChunkHandler, NetworkRequestWithMapper } from './network-request'; import type { PlayerNetworkConfiguration } from '../types/configuration.declarations'; import type { IEventEmitter } from '../types/event-emitter.declarations'; -import type { NetworkEventMap } from '../types/event-type-to-event-map.declarations'; +import type { NetworkEventMap } from '../types/mappers/event-type-to-event-map.declarations'; export interface NetworkManagerDependencies { logger: ILogger; diff --git a/packages/playback/src/lib/network/network-request.ts b/packages/playback/src/lib/network/network-request.ts index b1b6611..5858ca8 100644 --- a/packages/playback/src/lib/network/network-request.ts +++ b/packages/playback/src/lib/network/network-request.ts @@ -16,7 +16,7 @@ import { } from './network-manager-errors'; import type { ILogger } from '../types/logger.declarations'; import type { IEventEmitter } from '../types/event-emitter.declarations'; -import type { NetworkEventMap } from '../types/event-type-to-event-map.declarations'; +import type { NetworkEventMap } from '../types/mappers/event-type-to-event-map.declarations'; import { NetworkRequestAttemptStartedEvent, NetworkRequestAttemptFailedEvent, diff --git a/packages/playback/src/lib/player.ts b/packages/playback/src/lib/player.ts index 8ca8de2..4505966 100644 --- a/packages/playback/src/lib/player.ts +++ b/packages/playback/src/lib/player.ts @@ -4,7 +4,7 @@ import type { PlayerConfiguration } from './types/configuration.declarations'; import type { IStore } from './types/store.declarations'; import type { DeepPartial } from './types/utility.declarations'; import type { EventListener, IEventEmitter } from './types/event-emitter.declarations'; -import type { EventTypeToEventMap } from './types/event-type-to-event-map.declarations'; +import type { EventTypeToEventMap } from './types/mappers/event-type-to-event-map.declarations'; import { PlayerEventType } from './consts/events'; import { ConfigurationChangedEvent, diff --git a/packages/playback/src/lib/service-locator.ts b/packages/playback/src/lib/service-locator.ts index 051a436..7d4f004 100644 --- a/packages/playback/src/lib/service-locator.ts +++ b/packages/playback/src/lib/service-locator.ts @@ -5,10 +5,10 @@ import type { IInterceptorsStorage } from './types/interceptors.declarations'; import type { PlayerConfiguration } from './types/configuration.declarations'; import type { IStore } from './types/store.declarations'; import type { IEventEmitter } from './types/event-emitter.declarations'; -import type { EventTypeToEventMap } from './types/event-type-to-event-map.declarations'; +import type { EventTypeToEventMap } from './types/mappers/event-type-to-event-map.declarations'; import type { IEnvCapabilitiesProvider } from './types/env-capabilities.declarations'; import type { INetworkManager } from './types/network.declarations'; -import type { InterceptorTypeToInterceptorMap } from './types/interceptor-type-to-interceptor-map.declarations'; +import type { InterceptorTypeToInterceptorMap } from './types/mappers/interceptor-type-to-interceptor-map.declarations'; import type { NetworkManagerDependencies } from './network/network-manager'; // Implementations diff --git a/packages/playback/src/lib/types/interceptor-type-to-interceptor-map.declarations.ts b/packages/playback/src/lib/types/interceptor-type-to-interceptor-map.declarations.ts deleted file mode 100644 index 54fac32..0000000 --- a/packages/playback/src/lib/types/interceptor-type-to-interceptor-map.declarations.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { InterceptorType } from '../consts/interceptor-type'; - -export interface InterceptorTypeToInterceptorMap { - [InterceptorType.NetworkRequest]: (request: Request) => Promise; -} diff --git a/packages/playback/src/lib/types/interceptors.declarations.ts b/packages/playback/src/lib/types/interceptors.declarations.ts index f88a2ba..b10ff77 100644 --- a/packages/playback/src/lib/types/interceptors.declarations.ts +++ b/packages/playback/src/lib/types/interceptors.declarations.ts @@ -1,5 +1,5 @@ import type { InterceptorType } from '../consts/interceptor-type'; -import type { InterceptorTypeToInterceptorMap } from './interceptor-type-to-interceptor-map.declarations'; +import type { InterceptorTypeToInterceptorMap } from './mappers/interceptor-type-to-interceptor-map.declarations'; export interface IInterceptorsStorage { addInterceptor(interceptorType: K, interceptor: InterceptorTypeToInterceptorMap[K]): void; diff --git a/packages/playback/src/lib/types/event-type-to-event-map.declarations.ts b/packages/playback/src/lib/types/mappers/event-type-to-event-map.declarations.ts similarity index 89% rename from packages/playback/src/lib/types/event-type-to-event-map.declarations.ts rename to packages/playback/src/lib/types/mappers/event-type-to-event-map.declarations.ts index 09de689..8dfc7ec 100644 --- a/packages/playback/src/lib/types/event-type-to-event-map.declarations.ts +++ b/packages/playback/src/lib/types/mappers/event-type-to-event-map.declarations.ts @@ -1,18 +1,18 @@ // mapping for types purposes -import type { PlayerEventType } from '../consts/events'; +import type { PlayerEventType } from '../../consts/events'; import type { ConfigurationChangedEvent, LoggerLevelChangedEvent, MutedStatusChangedEvent, VolumeChangedEvent, PlayerErrorEvent, -} from '../events/player-events'; +} from '../../events/player-events'; import type { NetworkRequestAttemptCompletedSuccessfullyEvent, NetworkRequestAttemptCompletedUnsuccessfullyEvent, NetworkRequestAttemptFailedEvent, NetworkRequestAttemptStartedEvent, -} from '../events/network-events'; +} from '../../events/network-events'; export interface NetworkEventMap { [PlayerEventType.NetworkRequestAttemptStarted]: NetworkRequestAttemptStartedEvent; diff --git a/packages/playback/src/lib/types/mappers/interceptor-type-to-interceptor-map.declarations.ts b/packages/playback/src/lib/types/mappers/interceptor-type-to-interceptor-map.declarations.ts new file mode 100644 index 0000000..d378c98 --- /dev/null +++ b/packages/playback/src/lib/types/mappers/interceptor-type-to-interceptor-map.declarations.ts @@ -0,0 +1,6 @@ +import type { InterceptorType } from '../../consts/interceptor-type'; + +export interface InterceptorTypeToInterceptorMap { + [InterceptorType.NetworkRequest]: (request: Request) => Promise; + [InterceptorType.HlsPlaylistParse]: (playlist: Uint8Array) => Promise; +} diff --git a/packages/playback/src/lib/types/network.declarations.ts b/packages/playback/src/lib/types/network.declarations.ts index 9ac90f9..08c53d0 100644 --- a/packages/playback/src/lib/types/network.declarations.ts +++ b/packages/playback/src/lib/types/network.declarations.ts @@ -1,6 +1,6 @@ import type { RequestType } from '../consts/request-type'; import type { NetworkConfiguration, PlayerNetworkConfiguration } from './configuration.declarations'; -import type { InterceptorTypeToInterceptorMap } from './interceptor-type-to-interceptor-map.declarations'; +import type { InterceptorTypeToInterceptorMap } from './mappers/interceptor-type-to-interceptor-map.declarations'; import type { InterceptorType } from '../consts/interceptor-type'; import type { AttemptInfo } from './retry.declarations'; diff --git a/packages/playback/src/lib/utils/interceptors-storage.ts b/packages/playback/src/lib/utils/interceptors-storage.ts index 42b46fe..249eb4b 100644 --- a/packages/playback/src/lib/utils/interceptors-storage.ts +++ b/packages/playback/src/lib/utils/interceptors-storage.ts @@ -1,5 +1,5 @@ import type { InterceptorType } from '../consts/interceptor-type'; -import type { InterceptorTypeToInterceptorMap } from '../types/interceptor-type-to-interceptor-map.declarations'; +import type { InterceptorTypeToInterceptorMap } from '../types/mappers/interceptor-type-to-interceptor-map.declarations'; import type { IInterceptorsStorage } from '../types/interceptors.declarations'; export class InterceptorsStorage implements IInterceptorsStorage { diff --git a/packages/playback/test/network/network-request.test.ts b/packages/playback/test/network/network-request.test.ts index 947a2bb..07bed64 100644 --- a/packages/playback/test/network/network-request.test.ts +++ b/packages/playback/test/network/network-request.test.ts @@ -11,7 +11,7 @@ import type { IRequestPayloadWithMapper, } from '../../src/lib/types/network.declarations'; import type { IEventEmitter } from '../../src/lib/types/event-emitter.declarations'; -import type { NetworkEventMap } from '../../src/lib/types/event-type-to-event-map.declarations'; +import type { NetworkEventMap } from '../../src/lib/types/mappers/event-type-to-event-map.declarations'; import type { NetworkRequestDependencies } from '../../src/lib/network/network-request'; import type { NetworkConfiguration } from '../../src/lib/types/configuration.declarations';