@vkontakte/videoplayer-core 2.0.66 → 2.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.66",
+  "version": "2.0.68",
   "author": "vk.com",
   "description": "Videoplayer core library based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -8,15 +8,40 @@
   "main": "esnext.cjs.js",
   "module": "esnext.esm.js",
   "types": "index.d.ts",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "esnext.esm.js",
+      "require": "esnext.cjs.js"
+    },
+    "./esnext": {
+      "import": "esnext.esm.js",
+      "require": "esnext.cjs.js"
+    },
+    "./es2018": {
+      "import": "es2018.esm.js",
+      "require": "es2018.cjs.js"
+    },
+    "./es2015": {
+      "import": "es2015.esm.js",
+      "require": "es2015.cjs.js"
+    },
+    "./esnext.esm.js": "esnext.esm.js",
+    "./esnext.cjs.js": "esnext.cjs.js",
+    "./es2018.esm.js": "es2018.esm.js",
+    "./es2018.cjs.js": "es2018.cjs.js",
+    "./es2015.esm.js": "es2015.esm.js",
+    "./es2015.cjs.js": "es2015.cjs.js"
+  },
   "files": [
     "*.cjs.js",
     "*.esm.js",
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-shared": "^1.0.15",
-    "dashjs": "4.4.0",
-    "hls.js": "1.1.5",
+    "@vkontakte/videoplayer-shared": "^1.0.17",
+    "dashjs": "4.4.1",
+    "hls.js": "1.2.1",
     "lodash": "4.17.21"
   }
 }

package/player/Player.d.ts

@@ -28,7 +28,7 @@ export default class Player implements IPlayer {
         isAutoQualityEnabled$: ValueSubject<boolean>;
         autoQualityLimitingAvailable$: ValueSubject<boolean>;
         autoQualityLimits$: ValueSubject<QualityLimits>;
-        currentBuffer$: ValueSubject<StartEnd<number> | undefined>;
+        currentBuffer$: ValueSubject<StartEnd<number>>;
         isBuffering$: ValueSubject<boolean>;
         isStalled$: ValueSubject<boolean>;
         isEnded$: ValueSubject<boolean>;

package/player/types.d.ts

@@ -312,16 +312,12 @@ export interface ISources {
     [VideoFormat.MPEG]?: IMpegSource;
     [VideoFormat.DASH]?: IDashSource;
     [VideoFormat.DASH_SEP]?: IDashURLSource;
-    [VideoFormat.DASH_SEP_VK]?: IDashURLSource;
-    [VideoFormat.DASH_WEBM_VK]?: IDashURLSource;
     [VideoFormat.DASH_WEBM]?: IDashURLSource;
     [VideoFormat.DASH_ONDEMAND]?: IDashURLSource;
-    [VideoFormat.DASH_ONDEMAND_VK]?: IDashURLSource;
     [VideoFormat.DASH_LIVE]?: IDashURLSource;
     [VideoFormat.DASH_LIVE_WEBM]?: IDashURLSource;
     [VideoFormat.HLS]?: IHLSSource;
     [VideoFormat.HLS_ONDEMAND]?: IHLSSource;
-    [VideoFormat.HLS_JS]?: IHLSSource;
     [VideoFormat.HLS_LIVE]?: IHLSLiveSource;
 }
 export interface IMetadata {
@@ -350,16 +346,21 @@ export declare enum VideoFormat {
     MPEG = "MPEG",
     DASH = "DASH",
     DASH_SEP = "DASH_SEP",
-    DASH_SEP_VK = "DASH_SEP_VK",
+    /** @deprecated Используйте DASH_SEP */
+    DASH_SEP_VK = "DASH_SEP",
     DASH_WEBM = "DASH_WEBM",
-    DASH_WEBM_VK = "DASH_WEBM_VK",
+    /** @deprecated Используйте DASH_WEBM */
+    DASH_WEBM_VK = "DASH_WEBM",
     DASH_ONDEMAND = "DASH_ONDEMAND",
-    DASH_ONDEMAND_VK = "DASH_ONDEMAND_VK",
+    /** @deprecated Используйте DASH_ONDEMAND */
+    DASH_ONDEMAND_VK = "DASH_ONDEMAND",
     DASH_LIVE = "DASH_LIVE",
+    /** @deprecated */
     DASH_LIVE_WEBM = "DASH_LIVE_WEBM",
     HLS = "HLS",
     HLS_ONDEMAND = "HLS_ONDEMAND",
-    HLS_JS = "HLS_JS",
+    /** @deprecated Используйте HLS */
+    HLS_JS = "HLS",
     HLS_LIVE = "HLS_LIVE"
 }
 export interface IVideoTrack {

package/player/utils/optimisticPosition.d.ts

@@ -5,8 +5,8 @@ interface IParams {
     seekState: IStateMachine<SeekState>;
     position$: IValueObservable<Seconds>;
 }
-declare const _default: ({ seekState, position$ }: IParams) => IObservable<Seconds>;
 /**
  * Реализует оптимистичное изменение позиции при перемотке
  */
+declare const _default: ({ seekState, position$ }: IParams) => IObservable<Seconds>;
 export default _default;

package/providers/ProviderContainer/utils/formatsSupport.d.ts

@@ -1,3 +1,4 @@
 import { VideoFormat } from "../../../player/types";
+export declare const nativeHlsSupported: any;
 export declare const getSupportedCodecs: () => string[];
-export declare const filterAvailableFormats: (formats: VideoFormat[]) => VideoFormat[];
+export declare const filterAvailableFormats: (formats: VideoFormat[], useHlsJs?: boolean) => VideoFormat[];

package/providers/utils/forcePlay.d.ts

@@ -1,7 +1,7 @@
-declare const _default: (video: HTMLVideoElement) => Promise<boolean>;
 /**
  * Пытаемся запустить видео обходя ошибку `NotAllowedError` путём включения `mute`.
  * @param {HTMLVideoElement} video - видеообъект
  * @return {Promise}<boolean> - получилось начать воспроизведение
  */
+declare const _default: (video: HTMLVideoElement) => Promise<boolean>;
 export default _default;

package/providers/utils/syncDesiredState.d.ts

@@ -6,6 +6,6 @@ declare const syncDesiredState: <Value>(desiredState: IStateMachine<Value | unde
     changed$?: IObservable<Value | undefined> | undefined;
     onError?: IListener<unknown> | undefined;
 }) => ISubscription;
-export declare const syncVideoLooped: (video: HTMLVideoElement, desiredState: IStateMachine<boolean>, onError?: IListener<unknown> | undefined) => ISubscription;
-export declare const syncVideoVolumeState: (video: HTMLVideoElement, desiredState: IStateMachine<IVolumeState>, changed$: IObservable<IVolumeState>, onError?: IListener<unknown> | undefined) => ISubscription;
+export declare const syncVideoLooped: (video: HTMLVideoElement, desiredState: IStateMachine<boolean>, onError?: IListener<Error | unknown>) => ISubscription;
+export declare const syncVideoVolumeState: (video: HTMLVideoElement, desiredState: IStateMachine<IVolumeState>, changed$: IObservable<IVolumeState>, onError?: IListener<Error | unknown>) => ISubscription;
 export default syncDesiredState;

package/utils/buffer/isPositionBuffered.d.ts

@@ -0,0 +1,3 @@
+import { Milliseconds } from '@vkontakte/videoplayer-shared';
+declare const _default: (timeRanges: TimeRanges, position: Milliseconds) => boolean;
+export default _default;

package/utils/tuningConfig.d.ts

@@ -63,6 +63,8 @@ export declare type ITuningConfig = {
     stallIgnoreThreshold: Milliseconds;
     gapWatchdogInterval: Milliseconds;
     requestQuick: boolean;
+    useDashJs: boolean;
+    useHlsJs: boolean;
 };
 export declare type IOptionalTuningConfig = {
     [key in keyof ITuningConfig]?: Partial<ITuningConfig[key]>;

package/providers/DashLiveProvider/utils/LiveDashPlayer.d.ts

@@ -1,135 +0,0 @@
-import { Milliseconds } from '@vkontakte/videoplayer-shared';
-import { IRepresentation } from '../types';
-interface IParams {
-    videoElement: HTMLVideoElement;
-    playerCallback: (...args: any) => void;
-    config: {
-        minBuffer: Milliseconds;
-        lowLatencyMinBuffer: Milliseconds;
-        minBufferSegments: number;
-        lowLatencyMinBufferSegments: number;
-        maxParallelRequests: number;
-    };
-    logger: (...args: any[]) => void;
-}
-export default class LiveDashPlayer {
-    private paused;
-    private autoQuality;
-    private maxAutoQuality;
-    private buffering;
-    private destroyed;
-    private videoPlayStarted;
-    private lowLatency;
-    private rep?;
-    private bitrate;
-    private manifest;
-    private bitrateSwitcher?;
-    private filesFetcher?;
-    private sourceBuffer?;
-    private mediaSource?;
-    private currentManifestEntry?;
-    private manifestRequest?;
-    private manifestRefetchTimer?;
-    private bufferStates;
-    private downloadRate?;
-    private sourceJitter;
-    private chunkRateEstimator;
-    private manifestUrl;
-    private urlResolver;
-    private params;
-    constructor(params: IParams);
-    attachSource(manifestUrl: string): void;
-    /**
-     * switch to auto quality
-     */
-    setAutoQualityEnabled(enabled: boolean): void;
-    setMaxAutoQuality(height: number | undefined): void;
-    /**
-     * switch quality by name
-     */
-    switchByName(name: string): void;
-    /**
-     * seek to actual video position
-     */
-    catchUp(): void;
-    stop(): void;
-    pause(): void;
-    play(onPlayNotAllowed?: () => void): void;
-    startPlay(targetQ: IRepresentation, autoQuality: boolean): void;
-    /**
-     * destroy player
-     */
-    destroy(): void;
-    reinit(newManifestUrl: string): void;
-    /**
-     * if all retries fail...
-     */
-    private _handleNetworkError;
-    /**
-     * Retry request
-     */
-    private _retryCallback;
-    /**
-     * how many seconds are there in the buffer
-     */
-    private _getBufferSizeSec;
-    /**
-     * send buffering notification to player
-     */
-    private _notifyBuffering;
-    /**
-     * initialize video tag, add necessary event listeners
-     * @private
-     */
-    private _initVideo;
-    /**
-     * there may be small gaps of several milliseconds when switching quality
-     * we jump over these gaps here
-     */
-    private _fixupStall;
-    /**
-     * return best quality for rate
-     */
-    private _selectQuality;
-    private shouldPlay;
-    /**
-     * set video source
-     */
-    private _setVideoSrc;
-    /**
-     * initialize player with target quality
-     */
-    private _initPlayerWith;
-    /**
-     * represents specific quality stream
-     */
-    private _representation;
-    /**
-     * switch to quality
-     * TODO: Если новое качество выше старого – переключиться сразу. Если хуже, доиграть буфер
-     */
-    private _switchToQuality;
-    /**
-     * check if quality is available
-     */
-    private _qualityAvailable;
-    /**
-     * analyze bitrate data and switch qualities accordingly
-     */
-    private _initBitrateSwitcher;
-    /**
-     * load and parse manifest file
-     */
-    private _fetchManifest;
-    private _playVideoElement;
-    /**
-     * update internal state when manifest was received from remote
-     */
-    private _handleManifestUpdate;
-    /**
-     * schedule manifest update after delay
-     */
-    private _refetchManifest;
-    private _initManifest;
-}
-export {};

package/providers/DashProvider/utils/DashLite.d.ts

@@ -1,60 +0,0 @@
-import { Milliseconds } from '@vkontakte/videoplayer-shared';
-import HttpVideoBuffer from "../../../utils/buffer/HttpVideoBuffer";
-import { IDashConfig, IRef, IRepresentation } from '../types';
-interface IParams {
-    video: HTMLVideoElement;
-    buffer: HttpVideoBuffer;
-    selectRepresentation: (representations: IRepresentation[]) => IRepresentation;
-    onManifestReady: (representations: IRepresentation[]) => void;
-    onIdxRequestPing: (ping: Milliseconds) => void;
-    onResponseHeaders: (headers: Headers) => void;
-    onBandwidthChange: (payload: {
-        size: number;
-        duration: number;
-        speed: number;
-    }) => void;
-    onRepresentationPlay: (representation: IRepresentation) => void;
-    onError: (id: string, message: string, thrown?: Error | unknown) => void;
-    config: IDashConfig;
-    onDashCallback?: (eventName: string, param?: any) => any;
-}
-export default class DashLite {
-    private _params;
-    private _representations;
-    private _appendVector;
-    private _currentRepresentation?;
-    private _stream;
-    private _lastLoadOffset?;
-    private _loopTimeout?;
-    private _cachingPaused;
-    private _duration;
-    private STREAM_END_THRESHOLD;
-    private _video;
-    private _buffer;
-    private _onDashCallback;
-    private _config;
-    constructor(params: IParams);
-    /**
-     * Parse duration from ISO8601 string.
-     * @see https://en.wikipedia.org/wiki/ISO_8601#Durations
-     * @see https://github.com/moment/moment/blob/develop/src/lib/duration/create.js#L13
-     */
-    _parseDurationFromISO8601(input: string): number;
-    getRepresentations(): IRepresentation[];
-    attachSource(manifestUrl: string, failoverHosts?: string[]): void;
-    attachManifest(manifestString: string, failoverHosts?: string[], origin?: string): void;
-    _loadInitAndSidx(representation: IRepresentation, cb?: () => void): void;
-    startPlay(representation: IRepresentation): void;
-    _loadRef(representation: IRepresentation, fromTime: number, needToSeek?: boolean, forcePrecise?: boolean): void;
-    setQualityByRepresentation(newRepresentation: IRepresentation, force?: boolean): void;
-    setQuality(index: number): void;
-    pauseCaching(): void;
-    resumeCaching(): void;
-    seek(time: number, forcePrecise?: boolean): void;
-    updateRefsForCurrentTime(): void;
-    _findRef(time: number): IRef | undefined;
-    _isLastRef(ref: IRef): boolean;
-    _findBufferRangeEnd(time: number): number;
-    destroy(): void;
-}
-export {};