@vkontakte/videoplayer-core 2.0.165 → 2.0.166-dev.02230ed18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.165",
+  "version": "2.0.166-dev.02230ed18.0",
   "author": "vk.com",
   "description": "Videoplayer core library based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -42,6 +42,6 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-shared": "1.0.94"
+    "@vkontakte/videoplayer-shared": "1.0.95-dev.02230ed18.0"
   }
 }

package/types/player/types.d.ts

@@ -328,6 +328,8 @@ export interface PlayerInfoValues {
 	* default value: `undefined`
 	*/
 	currentNativeBuffer$: StartEnd<Seconds> | undefined;
+	/** Суммарная длительность всех буферизованных диапазонов в миллисекундах */
+	totalBufferDuration$: Milliseconds | undefined;
 	/**
 	* Статус буферизации видео. true если буфер пустой и воспроизведение прервано
 	* В отличии от isStalled показывает и буферизации на старте и после перемотки

package/types/providers/DashProviderVirtual/lib/buffer/virtualBuffer/baseVirtualBufferManager.d.ts

@@ -40,8 +40,7 @@ export declare abstract class BaseVirtualBufferManager<T extends Segment> implem
 	protected currentVirtualBufferSize: Byte;
 	private baseUrls;
 	private baseUrlsIndex;
-	protected maintainPlaybackBufferMutex: boolean;
-	protected maintainNativeBufferMutex: boolean;
+	protected maintainMutex: boolean;
 	protected bufferClearingMutex: boolean;
 	protected abortNativeBufferMutex: boolean;
 	protected switchMutex: boolean;
@@ -91,7 +90,7 @@ export declare abstract class BaseVirtualBufferManager<T extends Segment> implem
 	protected maintainPlaybackBuffer(position: Milliseconds): Promise<void>;
 	protected actualizeLastSegmentInfo(currentPosition: Milliseconds): void;
 	protected selectDownloadingItems(position: Milliseconds, segments: T[]): IBufferPlaybackQueueItem<T>[];
-	protected processCachedItems(): Promise<void>;
+	protected processCachedItems(): void;
 	protected withinInterval(currentPosition: Milliseconds | undefined, { from, to }: IRange<Milliseconds>, leftTolerance?: Milliseconds, rightTolerance?: Milliseconds): boolean;
 	protected withinAppendInterval(currentPosition: Milliseconds | undefined, { from, to }: IRange<Milliseconds>): boolean;
 	protected withinRemoveInterval(currentPosition: Milliseconds | undefined, { to }: IRange<Milliseconds>): boolean;
@@ -103,7 +102,7 @@ export declare abstract class BaseVirtualBufferManager<T extends Segment> implem
 	protected onItemFullyDownloaded(downloadedItem: IBufferPlaybackQueueItem<T>): void;
 	protected onItemFullyAppended(appendedItem: IBufferPlaybackQueueItem<T>): void;
 	protected removeSegment(nextRemoveItem: IBufferPlaybackQueueItem<T>, signal: AbortSignal): Promise<void>;
-	protected onDownloadItem(downloadedItem: IBufferPlaybackQueueItem<T>): Promise<void>;
+	protected onDownloadItem(downloadedItem: IBufferPlaybackQueueItem<T>): void;
 	protected pruneVirtualBuffer(currentPosition: Milliseconds): void;
 	protected updateRepresentationsBaseUrlIfNeeded(): void;
 }

package/types/providers/ProviderContainer/Mayday/MaydayService.d.ts

@@ -0,0 +1,21 @@
+import type { IError } from "@vkontakte/videoplayer-shared";
+import type { IMaydayDeps, IRecommendation } from "./types";
+export declare class MaydayService {
+	private deps;
+	private heuristics;
+	private tracer;
+	private providerFailures;
+	private failoverUrlIndex;
+	constructor(deps: IMaydayDeps);
+	get currentFailoverUrlIndex(): number | undefined;
+	getRecommendation(error: IError): IRecommendation;
+	private validateRecommendation;
+	private hasAvailableFailoverHost;
+	/**
+	* Если рекомендаций от эвристик нету, то идем по общему сценарию.
+	*/
+	private computeFallbackRecommendation;
+	private applyStateChange;
+	reset(): void;
+	destroy(): void;
+}

package/types/providers/ProviderContainer/Mayday/MaydayStatistics.d.ts

@@ -0,0 +1,25 @@
+import type { IObservable, IValueSubject } from "@vkontakte/videoplayer-shared";
+import { PlaybackState } from "../../../player/types";
+import type { IReinitHistory } from "./types";
+interface IMaydayStatisticsDeps {
+	firstFrameEvent$: IObservable<void>;
+	playbackState$: IValueSubject<PlaybackState | string>;
+}
+export declare class MaydayStatistics {
+	private deps;
+	private providerInitiatedAt;
+	private reinitTimestamps;
+	private reinitReachedPlaying;
+	private playingStartTime;
+	private accumulatedPlayingTime;
+	private firstFrameReceived;
+	private subscription;
+	constructor(deps: IMaydayStatisticsDeps);
+	recordReinit(): void;
+	recordProviderSwitch(): void;
+	getInitiatedAt(): number;
+	getAccumulatedPlayingTime(): number;
+	getReinitHistory(): IReinitHistory;
+	destroy(): void;
+}
+export {};

package/types/providers/ProviderContainer/Mayday/createHeuristicDeps.d.ts

@@ -0,0 +1,3 @@
+import type { ITracer } from "@vkontakte/videoplayer-shared";
+import type { IMaydayDeps, IHeuristicDeps } from "./types";
+export declare function createHeuristicDeps(deps: IMaydayDeps, tracer: ITracer): IHeuristicDeps;

package/types/providers/ProviderContainer/Mayday/heuristics/FetcherErrorHeuristic.d.ts

@@ -0,0 +1,9 @@
+import type { IError } from "@vkontakte/videoplayer-shared";
+import type { IRecommendation, IHeuristicDeps } from "../types";
+import type { IHeuristic } from "./IHeuristic";
+export declare class FetcherErrorHeuristic implements IHeuristic {
+	private _deps;
+	static readonly heuristicName = "FetcherErrorHeuristic";
+	constructor(_deps: IHeuristicDeps);
+	analyze(error: IError): IRecommendation | null;
+}

package/types/providers/ProviderContainer/Mayday/heuristics/IHeuristic.d.ts

@@ -0,0 +1,7 @@
+import type { IError } from "@vkontakte/videoplayer-shared";
+import type { IRecommendation } from "../types";
+export interface IHeuristic {
+	analyze(error: IError): IRecommendation | null;
+	reset?(): void;
+	destroy?(): void;
+}

package/types/providers/ProviderContainer/Mayday/heuristics/MediaErrorHeuristic.d.ts

@@ -0,0 +1,9 @@
+import type { IError } from "@vkontakte/videoplayer-shared";
+import type { IRecommendation, IHeuristicDeps } from "../types";
+import type { IHeuristic } from "./IHeuristic";
+export declare class MediaErrorHeuristic implements IHeuristic {
+	private deps;
+	static readonly heuristicName = "MediaErrorHeuristic";
+	constructor(deps: IHeuristicDeps);
+	analyze(error: IError): IRecommendation | null;
+}

package/types/providers/ProviderContainer/Mayday/index.d.ts

@@ -0,0 +1,6 @@
+export { MaydayService } from "./MaydayService";
+export type { IMaydayDeps, IFallbackContext, IRecommendation, RecoveryAction } from "./types";
+export type { IHeuristic } from "./heuristics/IHeuristic";
+export { MediaErrorHeuristic } from "./heuristics/MediaErrorHeuristic";
+export { FetcherErrorHeuristic } from "./heuristics/FetcherErrorHeuristic";
+export { MaydayStatistics } from "./MaydayStatistics";

package/types/providers/ProviderContainer/Mayday/types.d.ts

@@ -0,0 +1,53 @@
+import type { IVideoTrack, IVideoStream, IAudioStream } from "../../../player/types";
+import type { IValueSubject, Milliseconds, Seconds, IRange, ITracer } from "@vkontakte/videoplayer-shared";
+import type { ITuningConfig } from "../../../utils/tuningConfig";
+export interface IFallbackContext {
+	hasProviderStarted: boolean;
+	canSwitchCodec: boolean;
+}
+export interface IReinitHistory {
+	reachedPlaying: boolean[];
+	deltas: number[];
+}
+export interface IMaydayProviderOutput {
+	position$: IValueSubject<number>;
+	currentVideoTrack$: IValueSubject<IVideoTrack | undefined>;
+	totalBufferDuration$: IValueSubject<Milliseconds | undefined>;
+	currentNativeBuffer$: IValueSubject<IRange<Seconds> | undefined>;
+	bufferRangeCount$: IValueSubject<number | undefined>;
+	availableVideoStreams$: IValueSubject<IVideoStream[]>;
+	currentAudioStream$: IValueSubject<IAudioStream | undefined>;
+}
+export interface IMaydayDeps {
+	tuning: ITuningConfig;
+	failoverHosts: string[];
+	providerOutput: IMaydayProviderOutput;
+	maydayStatistics: {
+		getInitiatedAt: () => number;
+		getReinitHistory: () => IReinitHistory;
+		getAccumulatedPlayingTime: () => number;
+	};
+	getFallbackContext: () => IFallbackContext;
+	tracer: ITracer;
+}
+export interface IHeuristicDeps {
+	tuning: ITuningConfig;
+	getFallbackContext: () => IFallbackContext;
+	tracer: ITracer;
+	getPosition: () => number;
+	getCurrentVideoTrack: () => IVideoTrack | undefined;
+	getInitiatedAt: () => number;
+	getBufferLength: () => number;
+	getBufferAhead: () => number;
+	getBufferRangeCount: () => number;
+	getReinitHistory: () => IReinitHistory;
+	getAccumulatedPlayingTime: () => number;
+	getVideoCodec: () => string | undefined;
+	getAudioCodec: () => string | undefined;
+	getVisibilityState: () => DocumentVisibilityState | undefined;
+}
+export type RecoveryAction = "reinit" | "failover_host" | "switch_codec" | "switch_provider";
+export interface IRecommendation {
+	action: RecoveryAction;
+	reason: string;
+}

package/types/providers/ProviderContainer/index.d.ts

@@ -34,11 +34,14 @@ export default class ProviderContainer implements IProviderContainer {
 	private log;
 	private tracer;
 	private params;
-	private failoverIndex;
+	private currentProviderStarted;
 	private currentFailedVideoTrack;
 	private volumeMultiplierManager;
 	private dashMaxTvVideoQuality;
+	private mayday;
+	private maydayStatistics;
 	constructor(params: IParams);
+	private getFallbackContext;
 	init(): void;
 	destroy(): void;
 	private initProvider;
@@ -46,6 +49,8 @@ export default class ProviderContainer implements IProviderContainer {
 	private switchToNextProvider;
 	private switchToNextVideoCodec;
 	private destroyProvider;
+	private handleMaydayRecommendation;
+	private applyErrorSideEffects;
 	private createProvider;
 	private createScreenProvider;
 	private createChromecastProvider;

package/types/providers/types.d.ts

@@ -87,6 +87,8 @@ export interface IProviderOutput {
 	canChangePlaybackSpeed$: IValueSubject<boolean | undefined>;
 	currentBuffer$: IValueSubject<IRange<Seconds> | undefined>;
 	currentNativeBuffer$: IValueSubject<IRange<Seconds> | undefined>;
+	totalBufferDuration$: IValueSubject<Milliseconds | undefined>;
+	bufferRangeCount$: IValueSubject<number | undefined>;
 	videoLastDataObtainedTimestamp$: IValueSubject<Milliseconds | undefined>;
 	isBuffering$: IValueSubject<boolean>;
 	isLive$: IValueSubject<boolean | undefined>;

package/types/providers/utils/HTMLVideoElement/DroppedFramesManager.d.ts

@@ -12,6 +12,12 @@ interface IConnectData {
 	playing$: IObservable<undefined>;
 	pause$: IObservable<undefined>;
 }
+interface IDecoderMetrics {
+	totalVideoFrames: number;
+	droppedVideoFrames: number;
+	droppedPercent: number;
+	stalledFrames: number;
+}
 declare class DroppedFramesManager {
 	onDroopedVideoFramesLimit$: Subject<void>;
 	private subscription;
@@ -32,6 +38,10 @@ declare class DroppedFramesManager {
 	connect(data: IConnectData): void;
 	destroy(): void;
 	get droppedVideoMaxQualityLimit(): ExactVideoQuality | undefined;
+	/**
+	* Получить текущие метрики декодера
+	*/
+	getMetrics(): IDecoderMetrics;
 	private subscribe;
 	private handleChangeVideoQuality;
 	private onChangeQuality;

package/types/providers/utils/HTMLVideoElement/observable.d.ts

@@ -1,4 +1,4 @@
-import type { Seconds, IRange, IObservable, IError, IValueObservable } from "@vkontakte/videoplayer-shared";
+import type { Seconds, IRange, IObservable, IError, IValueObservable, Milliseconds } from "@vkontakte/videoplayer-shared";
 import type { IVolumeState, PlaybackRate } from "../../../player/types";
 export interface IObservableVideo {
 	playing$: IObservable<undefined>;
@@ -18,6 +18,8 @@ export interface IObservableVideo {
 	loadedData$: IObservable<undefined>;
 	isBuffering$: IObservable<boolean>;
 	currentBuffer$: IObservable<IRange<Seconds>>;
+	totalBufferDuration$: IObservable<Milliseconds>;
+	bufferRangeCount$: IObservable<number>;
 	volumeState$: IObservable<IVolumeState>;
 	playbackRateState$: IObservable<PlaybackRate>;
 	inPiP$: IValueObservable<boolean>;

package/types/utils/tuningConfig.d.ts

@@ -8,6 +8,12 @@ import { AudioRuleName, VideoRuleName } from "../providers/utils/Abr/types";
 export type ITuningConfig = {
 	/** @deprecated */
 	configName?: string[];
+	mayday: {
+		/** Порог суммарного времени проигрывания, при котором провайдер считается нестабильным после реинита (MediaError#3) */
+		playingUnstableThresholdMs: Milliseconds;
+		/** Список имён включённых эвристик. Пустой массив = все эвристики выключены */
+		heuristics: string[];
+	};
 	/**
 	* Если true, внутренний video элемент не будет уничтожаться при реините провайдера
 	* и при создании нового экземляра Player.
@@ -175,9 +181,9 @@ export type ITuningConfig = {
 		minNativeBufferSize: Milliseconds;
 		removeTimeShiftFromSegment: Milliseconds;
 		tickMaintainInterval: Milliseconds;
+		tickMaintainThrottle: Milliseconds;
 		minSafeBufferToPlay: Milliseconds;
 		useBufferHoldingOnlyOnStall: boolean;
-		useAbortResetNativeBufferMutex: boolean;
 		useNewAbr: boolean;
 		useAbrPhases: boolean;
 		abrVideoRules: VideoRuleName[];
@@ -329,6 +335,16 @@ export type ITuningConfig = {
 	useDashProviderVirtualMobile: boolean;
 	useNewAutoSelectVideoTrack: boolean;
 	useSafariEndlessRequestBugfix: boolean;
+	/**
+	* Ручка для фикса сброса playbackRate при перемотке live-трансляции на Safari.
+	*
+	* На WebKit/Safari в момент applying seek video.currentTime может кратко отдавать
+	* неверное значение (например, 0). Без фикса это проходит в условие
+	* atLiveDurationEdge и tap сбрасывает playbackRate в 1, перетирая пользовательскую скорость.
+	* С фиксом позиция берётся из optimisticPosition (seek target во время seek), и ложного
+	* срабатывания не происходит. Для VOD нейтрально (isLive=false).
+	*/
+	useSafariOptimisticPositionForLiveEdgeBugfix: boolean;
 	isAudioDisabled: boolean;
 	/**
 	* Разрешает ядру автостарт только если страница, на которой находится плеер активна