@vkontakte/videoplayer-core 2.0.168-dev.e41f01b90.0 → 2.0.168

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.168-dev.e41f01b90.0",
+  "version": "2.0.168",
   "author": "vk.ru",
   "description": "Videoplayer core library based on the vk.ru platform",
   "homepage": "https://vk.ru",
@@ -42,6 +42,6 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-shared": "1.0.97-dev.e41f01b90.0"
+    "@vkontakte/videoplayer-shared": "1.0.97"
   }
 }

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

@@ -0,0 +1,110 @@
+import type { Fetcher, FetchParamsWithUrl, Priority, RepresentationFetchResult } from "../../fetcher";
+import type { CommonInit, ContainerParser, Representation, Segment } from "../../../../utils/parsers/types";
+import { StreamKind } from "../../../../utils/parsers/types";
+import type { ITuningConfig } from "../../../../../utils/tuningConfig";
+import type { Byte, IError, IRange, ISubject, ITracer, IValueSubject, Milliseconds, Seconds } from "@vkontakte/videoplayer-shared";
+import { abortable, Subscription } from "@vkontakte/videoplayer-shared";
+import type { NativeBufferManager } from "../nativeBufferManager";
+import { SwithRepresentationMode, type Dependencies, type IBufferPlaybackQueueItem, type ISomeDataLoadedCallbackParams, type IVirtualBufferManager } from "../types";
+import type { VideoSegmentLoadProgress } from "../../../../utils/Abr/types";
+export declare abstract class BaseVirtualBufferManager<T extends Segment> implements IVirtualBufferManager<T> {
+	error$: ISubject<IError>;
+	playingRepresentation$: IValueSubject<Representation["id"] | undefined>;
+	playingRepresentationInit$: IValueSubject<CommonInit | undefined>;
+	currentSegmentLength$: IValueSubject<number>;
+	onLastSegment$: IValueSubject<boolean>;
+	fullyBuffered$: IValueSubject<boolean>;
+	protected readonly kind: StreamKind;
+	protected readonly nativeBufferManager: NativeBufferManager;
+	protected readonly fetcher: Fetcher;
+	protected readonly tracer: ITracer;
+	protected readonly tuning: ITuningConfig;
+	protected representations: Map<Representation["id"], Representation>;
+	protected playingRepresentationId: Representation["id"] | undefined;
+	protected downloadingRepresentationId: Representation["id"] | undefined;
+	protected switchingRepresentationId: Representation["id"] | null;
+	protected initData: Map<Representation["id"], ArrayBuffer>;
+	protected initDataPromises: Map<Representation["id"], Promise<RepresentationFetchResult<T> | null | undefined>>;
+	protected idleCallbacks: Map<Representation["id"], number>;
+	protected parsedInitData: Map<Representation["id"], CommonInit>;
+	protected forwardBufferRepresentations: Map<Representation["id"], T[]>;
+	protected segments: Map<Representation["id"], T[]>;
+	protected containerParser: ContainerParser;
+	protected bufferPlaybackQueue: IBufferPlaybackQueueItem<T>[];
+	protected downloadingBufferItems: IBufferPlaybackQueueItem<T>[];
+	protected preloadOnly: boolean;
+	protected forwardBufferTarget: Milliseconds;
+	protected failedDownloads: number;
+	protected lastDataObtainedTimestampMs: Milliseconds;
+	protected loadByteRangeSegmentsTimeoutId: number;
+	protected currentVirtualBufferSize: Byte;
+	private baseUrls;
+	private baseUrlsIndex;
+	protected maintainAbortController: AbortController;
+	protected maintainMutexPromise: Promise<void> | null;
+	protected bufferClearingMutex: boolean;
+	protected abortNativeBufferMutex: boolean;
+	protected switchMutex: boolean;
+	protected seekMutex: boolean;
+	protected destroyAbortController: AbortController;
+	protected switchAbortController: AbortController;
+	protected downloadAbortController: AbortController;
+	protected subscription: Subscription;
+	protected readonly getCurrentPosition: () => Milliseconds | undefined;
+	protected readonly getCurrentStallDuration: () => Milliseconds | undefined;
+	protected constructor(kind: StreamKind, nativeBufferManager: NativeBufferManager, representations: Representation[], { fetcher, tracer, tuning, getCurrentPosition, getCurrentStallDuration, manifest }: Dependencies);
+	protected abstract loadItems(itemsToLoad: IBufferPlaybackQueueItem<T>[], representation: Representation, priority?: Priority): Promise<void>;
+	protected abstract selectItemsToLoad(): IBufferPlaybackQueueItem<T>[];
+	protected abstract prepareFetchParams(items: IBufferPlaybackQueueItem<T>[], representation: Representation): FetchParamsWithUrl;
+	protected abstract onSomeDataLoaded(data: ISomeDataLoadedCallbackParams<T>): Promise<void>;
+	protected abstract updateRepresentationBaseUrl(representation: Representation, newBaseUrl: string): void;
+	startWith: ReturnType<typeof abortable<[Representation["id"]]>>;
+	switchTo(newRepresentationId: Representation["id"], mode?: SwithRepresentationMode): Promise<void>;
+	protected getSwitchWithAbort(switchToTracer: ITracer): ReturnType<typeof abortable<[Representation["id"], SwithRepresentationMode], void>>;
+	prepareSeek(): Promise<void>;
+	seek(position: Milliseconds | undefined): Promise<void>;
+	maintain(currentPosition?: Milliseconds | undefined): Promise<void>;
+	getForwardBufferRepresentations(currentPosition?: Milliseconds | undefined): Map<Representation["id"], T[]>;
+	getForwardPlaybackBufferDuration(currentPosition?: Milliseconds | undefined): Milliseconds;
+	getPlaybackBufferState(): IRange<Milliseconds> | null;
+	abort(): Promise<void>;
+	findSegmentStartTime(position: Milliseconds): Milliseconds | undefined;
+	getRepresentationInitialTime(): Seconds;
+	getMutexInfo(): string;
+	calculateDurationFromSegments(): Milliseconds;
+	getActiveSegmentProgress(): VideoSegmentLoadProgress | undefined;
+	getMpdSegmentDuration(): Milliseconds | undefined;
+	get lastDataObtainedTimestamp(): Milliseconds;
+	setTarget(time: Milliseconds): void;
+	setPreloadOnly(preloadOnly: boolean): void;
+	destroy(): void;
+	protected verifyBufferPlaybackQueue(position: Milliseconds): Promise<void>;
+	protected forceSwitchCondition(oldRepresentation: Representation, newRepresentation: Representation): boolean;
+	protected clearBuffer(): Promise<void>;
+	protected abortDownload(): void;
+	protected abortDownloadingItems(): void;
+	protected abortNativeBuffer(): Promise<boolean>;
+	protected loadInits(): Promise<void>;
+	protected loadInitIfNeeded(representation: Representation, requestedPriority?: Priority, critical?: boolean): Promise<void>;
+	protected loadInit(representation: Representation, requestedPriority?: Priority, critical?: boolean): Promise<void>;
+	private isMaintainNativeBufferMutexActive;
+	protected maintainNativeBuffer(signal: AbortSignal): Promise<void>;
+	protected maintainPlaybackBuffer(position: Milliseconds): Promise<void>;
+	protected actualizeLastSegmentInfo(currentPosition: Milliseconds): void;
+	protected selectDownloadingItems(position: Milliseconds, segments: T[]): IBufferPlaybackQueueItem<T>[];
+	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;
+	protected getExponentialDownloadDelay(): ReturnType<typeof abortable>;
+	protected waitExponentialDownloadDelay(): Promise<void>;
+	protected appendSegmentFully(nextPlayingItem: IBufferPlaybackQueueItem<T>, signal: AbortSignal): Promise<void>;
+	protected appendSegmentPartially(nextPlayingItem: IBufferPlaybackQueueItem<T>, signal: AbortSignal): Promise<void>;
+	protected parseFeedableSegmentChunk(chunk: DataView): DataView | null;
+	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>): void;
+	protected pruneVirtualBuffer(currentPosition: Milliseconds): void;
+	protected updateRepresentationsBaseUrlIfNeeded(): void;
+}

package/types/providers/DashProviderVirtual/lib/buffer/virtualBuffer/byteRangeVirtualBufferManager.versionA.d.ts

@@ -0,0 +1,21 @@
+import { BaseVirtualBufferManager } from "./baseVirtualBufferManager.versionA";
+import type { Dependencies, IBufferPlaybackQueueItem, ISomeDataLoadedCallbackParams, IVirtualBufferManager } from "../types";
+import type { ByteRangeSegment, Representation, StreamKind } from "../../../../utils/parsers/types";
+import type { NativeBufferManager } from "../nativeBufferManager";
+import type { FetchParamsWithUrl, Priority } from "../../fetcher";
+export declare class ByteRangeVirtualBufferManager extends BaseVirtualBufferManager<ByteRangeSegment> implements IVirtualBufferManager<ByteRangeSegment> {
+	constructor(kind: StreamKind, nativeBufferManager: NativeBufferManager, representations: Representation[], dependencies: Dependencies);
+	protected override loadItems(itemsToLoad: IBufferPlaybackQueueItem<ByteRangeSegment>[], representation: Representation, priority?: Priority): Promise<void>;
+	protected override selectItemsToLoad(): IBufferPlaybackQueueItem<ByteRangeSegment>[];
+	protected override prepareFetchParams(items: IBufferPlaybackQueueItem<ByteRangeSegment>[], representation: Representation): FetchParamsWithUrl;
+	/**
+	* Закидываем в буфер сегменты атомарнее чем сегмент целиком. Например, по боксам в мпеге и по блокам в вебме.
+	* Таким образом не ждём его полной загрузки и готовы играть его намного быстрее
+	* @param dataView – данные, размер буфера – весь запрос
+	* @param globalFrom – Отступ dataView от начала файла, совпадает с отсупами сегментов
+	* @param loaded – Объём загруженных в dataView данных (всё что больше – пока нули)
+	* @private
+	*/
+	protected override onSomeDataLoaded({ downloadingItems, dataView, representationId, globalFrom, loaded, signal }: ISomeDataLoadedCallbackParams<ByteRangeSegment>): Promise<void>;
+	protected override updateRepresentationBaseUrl(representation: Representation, newBaseUrl: string): void;
+}

package/types/providers/DashProviderVirtual/lib/buffer/virtualBuffer/templateVirtualBufferManager.versionA.d.ts

@@ -0,0 +1,21 @@
+import { BaseVirtualBufferManager } from "./baseVirtualBufferManager.versionA";
+import type { Dependencies, IBufferPlaybackQueueItem, ISomeDataLoadedCallbackParams, IVirtualBufferManager } from "../types";
+import type { TemplateSegment, Representation, StreamKind } from "../../../../utils/parsers/types";
+import type { NativeBufferManager } from "../nativeBufferManager";
+import type { FetchParamsWithUrl, Priority } from "../../fetcher";
+export declare class TemplateVirtualBufferManager extends BaseVirtualBufferManager<TemplateSegment> implements IVirtualBufferManager<TemplateSegment> {
+	constructor(kind: StreamKind, nativeBufferManager: NativeBufferManager, representations: Representation[], dependencies: Dependencies);
+	protected override loadItems(itemsToLoad: IBufferPlaybackQueueItem<TemplateSegment>[], representation: Representation, priority?: Priority): Promise<void>;
+	protected override selectItemsToLoad(): IBufferPlaybackQueueItem<TemplateSegment>[];
+	protected override prepareFetchParams(items: IBufferPlaybackQueueItem<TemplateSegment>[], representation: Representation): FetchParamsWithUrl;
+	protected getFetchUrl(items: IBufferPlaybackQueueItem<TemplateSegment>[], representation: Representation): URL;
+	/**
+	* Закидываем в буфер сегменты атомарнее чем сегмент целиком. Например, по боксам в мпеге и по блокам в вебме.
+	* Таким образом не ждём его полной загрузки и готовы играть его намного быстрее
+	* @param dataView – данные, размер буфера – весь запрос
+	* @param loaded – Объём загруженных в dataView данных (всё что больше – пока нули)
+	* @private
+	*/
+	protected override onSomeDataLoaded({ downloadingItems, dataView, representationId, loaded, signal }: ISomeDataLoadedCallbackParams<TemplateSegment>): Promise<void>;
+	protected override updateRepresentationBaseUrl(representation: Representation, newBaseUrl: string): void;
+}

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

@@ -1,6 +1,7 @@
 import type { Representation, StreamKind } from "../../../../utils/parsers/types";
 import type { NativeBufferManager } from "../nativeBufferManager";
 import type { Dependencies, IVirtualBufferManager } from "../types";
+import type { ITuningConfig } from "../../../../../utils/tuningConfig";
 export declare class VirtualBufferFactory {
-	static getBufferManager(kind: StreamKind, nativeBufferManager: NativeBufferManager, representations: Representation[], dependencies: Dependencies): IVirtualBufferManager;
+	static getBufferManager(kind: StreamKind, nativeBufferManager: NativeBufferManager, representations: Representation[], dependencies: Dependencies, tuning: ITuningConfig): IVirtualBufferManager;
 }

package/types/utils/ClientChecker/services/DeviceChecker.d.ts

@@ -23,6 +23,7 @@ export declare class DeviceChecker implements Checker {
 	get os(): OS;
 	get details(): DeviceDetails;
 	get isIOS(): boolean;
+	get isIPadOS(): boolean;
 	get isMac(): boolean;
 	get isApple(): boolean;
 	get isIphoneOrOldIpad(): boolean;

package/types/utils/tuningConfig.d.ts

@@ -175,6 +175,7 @@ export type ITuningConfig = {
 		virtualBufferEmptinessTolerance: Milliseconds;
 		useBufferQueueVerification: boolean;
 		useVirtualBufferImplicitSeek: boolean;
+		bufferQueueVerificationMinPosition: Milliseconds;
 		useNewRepresentationSwitch: boolean;
 		useDelayedRepresentationSwitch: boolean;
 		useSmartRepresentationSwitch: boolean;
@@ -353,6 +354,7 @@ export type ITuningConfig = {
 	useNewSwitchTo: boolean;
 	alwaysAbortPreviousSwitch: boolean;
 	useDashProviderVirtual: boolean;
+	useDashProviderVirtualVersionA: boolean;
 	useDashProviderVirtualMobile: boolean;
 	useNewAutoSelectVideoTrack: boolean;
 	useSafariEndlessRequestBugfix: boolean;