Skip to content

Commit

Permalink
chore: fix test and lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Dzianis Dashkevich committed Oct 24, 2024
1 parent 144895f commit 65010a5
Show file tree
Hide file tree
Showing 24 changed files with 1,647 additions and 2,223 deletions.
2,463 changes: 1,084 additions & 1,379 deletions package-lock.json

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,50 +25,50 @@
"devDependencies": {
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"@eslint/js": "^9.11.1",
"@nx/js": "^19.8.2",
"@rollup/plugin-commonjs": "^28.0.0",
"@eslint/js": "^9.13.0",
"@nx/js": "^19.8.6",
"@rollup/plugin-commonjs": "^28.0.1",
"@rollup/plugin-node-resolve": "^15.3.0",
"@rollup/plugin-replace": "^6.0.1",
"@rollup/plugin-terser": "^0.4.4",
"@rollup/plugin-typescript": "^12.1.0",
"@rollup/plugin-typescript": "^12.1.1",
"@types/eslint__js": "^8.42.3",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.3.0",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@typestrong/ts-mockito": "^2.7.12",
"@vitejs/plugin-react": "^4.3.2",
"@vitest/browser": "^2.1.1",
"@vitest/coverage-v8": "^2.1.1",
"@vitest/ui": "^2.1.1",
"@vitejs/plugin-react": "^4.3.3",
"@vitest/browser": "^2.1.3",
"@vitest/coverage-v8": "^2.1.3",
"@vitest/ui": "^2.1.3",
"bundlesize": "^0.18.2",
"eslint": "^9.11.1",
"eslint": "^9.13.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-jsdoc": "^50.3.0",
"eslint-plugin-jsdoc": "^50.4.3",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react-hooks": "^5.1.0-rc-fb9a90fa48-20240614",
"eslint-plugin-react-refresh": "^0.4.12",
"eslint-plugin-unicorn": "^55.0.0",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.13",
"eslint-plugin-unicorn": "^56.0.0",
"eslint-plugin-vitest": "^0.5.4",
"globals": "^15.9.0",
"globals": "^15.11.0",
"http-server": "^14.1.1",
"husky": "^9.1.6",
"jsdom": "^25.0.1",
"lint-staged": "^15.2.10",
"npm-run-all": "^4.1.5",
"nx": "^19.8.2",
"playwright": "^1.47.2",
"nx": "^19.8.6",
"playwright": "^1.48.1",
"prettier": "^3.3.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"rimraf": "^6.0.1",
"rollup": "^4.22.5",
"rollup": "^4.24.0",
"rollup-plugin-copy": "^3.5.0",
"rollup-plugin-dts": "^6.1.1",
"rollup-plugin-visualizer": "^5.12.0",
"typedoc": "^0.26.7",
"typescript": "~5.6.2",
"typescript-eslint": "^8.7.0",
"vite": "^5.4.8",
"vitest": "^2.1.1"
"typedoc": "^0.26.10",
"typescript": "~5.6.3",
"typescript-eslint": "^8.11.0",
"vite": "^5.4.10",
"vitest": "^2.1.3"
}
}
16 changes: 8 additions & 8 deletions packages/env-capabilities/bundlesize.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@
"files": [
{
"path": "dist/es/index.debug.js",
"maxSize": 201,
"maxSize": 89,
"compression": "none"
},
{
"path": "dist/cjs/index.debug.js",
"maxSize": 202,
"maxSize": 89,
"compression": "none"
},
{
"path": "dist/iife/index.debug.js",
"maxSize": 207,
"maxSize": 91,
"compression": "none"
},
{
"path": "dist/cjs/index.min.js",
"maxSize": 30,
"path": "dist/es/index.min.js",
"maxSize": 9,
"compression": "none"
},
{
"path": "dist/es/index.min.js",
"maxSize": 30,
"path": "dist/cjs/index.min.js",
"maxSize": 9,
"compression": "none"
},
{
"path": "dist/iife/index.min.js",
"maxSize": 30,
"maxSize": 9,
"compression": "none"
}
]
Expand Down
3 changes: 3 additions & 0 deletions packages/env-capabilities/src/lib/env-capabilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { AudioCodecs, VideoCodecs } from './consts/codecs';
import { DashMimeType, HlsVndMpegMimeType, HlsXMpegMimeType, HssMimeType } from './consts/mime-type';

export class EnvCapabilitiesProvider implements IEnvCapabilitiesProvider {
/* v8 ignore start */
private static getDefaultHdcpCapabilities_(): HdcpCapabilities {
return {
hdcp1_0: 'api-not-available',
Expand Down Expand Up @@ -162,6 +163,8 @@ export class EnvCapabilitiesProvider implements IEnvCapabilitiesProvider {
return new EnvCapabilitiesProvider(window, document.createElement('video'));
}

/* v8 ignore stop */

private readonly context_: IEnvCapabilitiesContext;
private readonly videoElement_: HTMLVideoElement;

Expand Down
4 changes: 2 additions & 2 deletions packages/hls-parser/demo/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/* eslint-disable no-console */
import { FullPlaylistParser, ProgressiveParser } from '../../src';
import { FullPlaylistParser, ChunkPlaylistParser } from '../../src';

import { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';
import App from './App';
import './index.css';

console.dir(FullPlaylistParser);
console.dir(ProgressiveParser);
console.dir(ChunkPlaylistParser);

const root = document.getElementById('root')!;

Expand Down
54 changes: 42 additions & 12 deletions packages/playback/bundlesize.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,63 @@
{
"files": [
{
"path": "dist/es/index.debug.js",
"maxSize": 167,
"path": "dist/main/core/es/index.debug.js",
"maxSize": 210,
"compression": "none"
},
{
"path": "dist/cjs/index.debug.js",
"maxSize": 167,
"path": "dist/main/core/cjs/index.debug.js",
"maxSize": 210,
"compression": "none"
},
{
"path": "dist/iife/index.debug.js",
"maxSize": 171,
"path": "dist/main/core/iife/index.debug.js",
"maxSize": 216,
"compression": "none"
},
{
"path": "dist/es/index.min.js",
"maxSize": 20,
"path": "dist/main/core/cjs/index.min.js",
"maxSize": 22,
"compression": "none"
},
{
"path": "dist/cjs/index.min.js",
"maxSize": 20,
"path": "dist/main/core/es/index.min.js",
"maxSize": 22,
"compression": "none"
},
{
"path": "dist/iife/index.min.js",
"maxSize": 20,
"path": "dist/main/core/iife/index.min.js",
"maxSize": 22,
"compression": "none"
},
{
"path": "dist/worker/core/es/index.debug.js",
"maxSize": 226,
"compression": "none"
},
{
"path": "dist/worker/core/cjs/index.debug.js",
"maxSize": 226,
"compression": "none"
},
{
"path": "dist/worker/core/iife/index.debug.js",
"maxSize": 233,
"compression": "none"
},
{
"path": "dist/worker/core/cjs/index.min.js",
"maxSize": 25,
"compression": "none"
},
{
"path": "dist/worker/core/es/index.min.js",
"maxSize": 24,
"compression": "none"
},
{
"path": "dist/worker/core/iife/index.min.js",
"maxSize": 25,
"compression": "none"
}
]
Expand Down
2 changes: 1 addition & 1 deletion packages/playback/demo/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-console */
import { Player } from '../../src';
import { Player } from '../../src/entry-points/core-main';

import { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';
Expand Down
1 change: 0 additions & 1 deletion packages/playback/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export { Player } from './lib/player';
export { ServiceLocator } from './lib/service-locator';

// consts
Expand Down
1 change: 1 addition & 0 deletions packages/playback/src/lib/consts/playback-state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// since they can be used as values they should not be in the types folder
export enum PlaybackState {
Idle = 'Idle',
Loading = 'Loading',
Playing = 'Playing',
Paused = 'Paused',
Buffering = 'Buffering',
Expand Down
6 changes: 0 additions & 6 deletions packages/playback/src/lib/network/network-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import type {
IRequestPayloadWithMapper,
INetworkRequest,
IRequestPayloadWithChunkHandler,
INetworkInterceptorsProvider,
IRequestPayload,
} from '../types/network.declarations';
import { NetworkRequestWithChunkHandler, NetworkRequestWithMapper } from './network-request';
Expand All @@ -14,22 +13,19 @@ import type { NetworkEventMap } from '../types/mappers/event-type-to-event-map.d

export interface NetworkManagerDependencies {
logger: ILogger;
networkInterceptorsProvider: INetworkInterceptorsProvider;
eventEmitter: IEventEmitter<NetworkEventMap>;
configuration: PlayerNetworkConfiguration;
executor: (request: Request) => Promise<Response>;
}

export class NetworkManager implements INetworkManager {
private readonly logger_: ILogger;
private readonly networkInterceptorsProvider_: INetworkInterceptorsProvider;
private readonly eventEmitter_: IEventEmitter<NetworkEventMap>;
private readonly executor_: (request: Request) => Promise<Response>;
private configuration_: PlayerNetworkConfiguration;

public constructor(dependencies: NetworkManagerDependencies) {
this.logger_ = dependencies.logger;
this.networkInterceptorsProvider_ = dependencies.networkInterceptorsProvider;
this.eventEmitter_ = dependencies.eventEmitter;
this.configuration_ = dependencies.configuration;
this.executor_ = dependencies.executor;
Expand Down Expand Up @@ -62,7 +58,6 @@ export class NetworkManager implements INetworkManager {
private createNetworkRequestWithMapper_<T>(payload: IRequestPayloadWithMapper<T>): INetworkRequest<T> {
return NetworkRequestWithMapper.create(payload, {
logger: this.logger_,
networkInterceptorsProvider: this.networkInterceptorsProvider_,
eventEmitter: this.eventEmitter_,
configuration: { ...this.configuration_[payload.requestType] },
executor: (request) => this.sendRequest_(request),
Expand All @@ -72,7 +67,6 @@ export class NetworkManager implements INetworkManager {
private createNetworkRequestWithChunkHandler_(payload: IRequestPayloadWithChunkHandler): INetworkRequest<void> {
return NetworkRequestWithChunkHandler.create(payload, {
logger: this.logger_,
networkInterceptorsProvider: this.networkInterceptorsProvider_,
eventEmitter: this.eventEmitter_,
configuration: { ...this.configuration_[payload.requestType] },
executor: (request) => this.sendRequest_(request),
Expand Down
27 changes: 12 additions & 15 deletions packages/playback/src/lib/network/network-request.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type {
INetworkInterceptorsProvider,
INetworkRequest,
IRequestPayload,
IRequestPayloadWithChunkHandler,
Expand Down Expand Up @@ -27,7 +26,6 @@ import type { NetworkConfiguration } from '../types/configuration.declarations';

export interface NetworkRequestDependencies {
logger: ILogger;
networkInterceptorsProvider: INetworkInterceptorsProvider;
eventEmitter: IEventEmitter<NetworkEventMap>;
configuration: NetworkConfiguration;
executor: (request: Request) => Promise<Response>;
Expand All @@ -40,7 +38,6 @@ abstract class NetworkRequest<T> implements INetworkRequest<T> {
private abortController_: AbortController;

protected readonly logger_: ILogger;
protected readonly networkInterceptorsProvider_: INetworkInterceptorsProvider;
protected readonly eventEmitter_: IEventEmitter<NetworkEventMap>;
protected readonly retryWrapper_: RetryWrapper<Response>;
protected readonly executor_: (request: Request) => Promise<Response>;
Expand All @@ -56,12 +53,11 @@ abstract class NetworkRequest<T> implements INetworkRequest<T> {
}

protected constructor(id: string, payload: IRequestPayload, dependencies: NetworkRequestDependencies) {
const { logger, networkInterceptorsProvider, configuration, eventEmitter } = dependencies;
const { logger, configuration, eventEmitter } = dependencies;
const { requestType, requestInit, url } = payload;

this.id = id;
this.logger_ = logger;
this.networkInterceptorsProvider_ = networkInterceptorsProvider;
this.eventEmitter_ = eventEmitter;
this.abortController_ = new AbortController();
this.executor_ = dependencies.executor;
Expand Down Expand Up @@ -163,16 +159,17 @@ abstract class NetworkRequest<T> implements INetworkRequest<T> {
}

private async applyRequestInterceptors_(request: Request): Promise<Request> {
const requestInterceptors = this.networkInterceptorsProvider_.getNetworkRequestInterceptors();

for (const requestInterceptor of requestInterceptors) {
try {
request = await requestInterceptor(request);
} catch (e) {
this.logger_.warn('Got an error during request interceptor execution: ', e);
// ignore interceptors errors
}
}
// TODO: use hooks instead of interceptors
// const requestInterceptors = this.networkInterceptorsProvider_.getNetworkRequestInterceptors();
//
// for (const requestInterceptor of requestInterceptors) {
// try {
// request = await requestInterceptor(request);
// } catch (e) {
// this.logger_.warn('Got an error during request interceptor execution: ', e);
// // ignore interceptors errors
// }
// }

return request;
}
Expand Down
Loading

0 comments on commit 65010a5

Please sign in to comment.