@vkontakte/videoplayer-core 2.0.162 → 2.0.163-dev.2ed41cd75.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.162",
+  "version": "2.0.163-dev.2ed41cd75.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.91"
+    "@vkontakte/videoplayer-shared": "1.0.92-dev.2ed41cd75.0"
   }
 }

package/types/player/Player.d.ts

@@ -1,6 +1,6 @@
 import type { IOptionalTuningConfig } from "../utils/tuningConfig";
-import type { ILogEntry, Seconds, QualityLimits, VideoQuality, ITracer } from "@vkontakte/videoplayer-shared";
-import { type IAudioStream, type IConfig, type ICueSettings, type IExternalTextTrack, type IPlayer, type ITextTrack, type IVideoStream, type PlaybackRate, PredefinedQualityLimits, type PlayerInfoImpl, type PlayerEventsImpl, type PlayerExperimentalImpl } from "./types";
+import type { ILogEntry, ITracer, QualityLimits, Seconds, VideoQuality } from "@vkontakte/videoplayer-shared";
+import { type IAudioStream, type IConfig, type ICueSettings, type IExternalTextTrack, type IPlayer, type ITextTrack, type IVideoStream, type PlaybackRate, type PlayerEventsImpl, type PlayerExperimentalImpl, type PlayerInfoImpl, PredefinedQualityLimits } from "./types";
 import type { IPlayerOptions } from "../utils/playerOptions";
 export default class Player implements IPlayer {
 	private readonly subscription;

package/types/player/types.d.ts

@@ -1,4 +1,4 @@
-import type { IObservable, IValueObservable, IValueSubject, ILogEntry, Kbps, Milliseconds, Seconds, IRectangle, IError, QualityLimits, VideoQuality, Subject, ValueSubject } from "@vkontakte/videoplayer-shared";
+import type { IError, ILogEntry, IObservable, IRectangle, IValueObservable, IValueSubject, Kbps, Milliseconds, QualityLimits, Seconds, Subject, ValueSubject, VideoQuality } from "@vkontakte/videoplayer-shared";
 import type { Pixel } from "../utils/3d/types";
 import type { dump } from "../utils/playbackTelemetry";
 export interface StartEnd<Unit extends number> {
@@ -251,6 +251,12 @@ export interface PlayerInfoValues {
 	* default value: `Infinity`
 	*/
 	duration$: Seconds;
+	/**
+	* Сумма времени воспроизведенных отрывков
+	*
+	* default value: `0`
+	*/
+	playedTime$: Seconds;
 	muted$: boolean;
 	volume$: number;
 	availableVideoStreams$: IVideoStream[];
@@ -527,7 +533,9 @@ export interface IVolumeState {
 	muted: boolean;
 }
 export interface IConfig {
-	container: string | HTMLElement;
+	/** @deprecated */
+	container?: string | HTMLElement;
+	readonly allocation?: TAnyAllocation;
 	sources: ISources;
 	meta?: IMetadata;
 	failoverHosts?: string[];
@@ -539,6 +547,26 @@ export interface IConfig {
 	*/
 	handleNetworkRecoverableErrorAsProviderError?: boolean;
 }
+export type TAllocationParent = string | HTMLElement;
+export type TAllocationSelf = HTMLAudioElement;
+export interface IAllocation<Parent extends TAllocationParent = TAllocationParent> {
+	readonly strategy: string;
+	readonly parent?: Parent;
+	readonly self?: TAllocationSelf;
+}
+export interface IEmbeddableAllocation<Parent extends TAllocationParent = TAllocationParent> extends IAllocation<Parent> {
+	readonly strategy: "embeddable";
+	readonly parent: Parent;
+	readonly self?: never;
+}
+export type IStringifiedEmbeddableAllocation = IEmbeddableAllocation<string>;
+export type IDirectEmbeddableAllocation = IEmbeddableAllocation<HTMLElement>;
+export interface IPersonalAllocation extends IAllocation {
+	readonly strategy: "personal";
+	readonly self: TAllocationSelf;
+	readonly parent?: never;
+}
+export type TAnyAllocation = IStringifiedEmbeddableAllocation | IDirectEmbeddableAllocation | IPersonalAllocation;
 export interface ISources {
 	[VideoFormat.MPEG]?: IMpegSource;
 	[VideoFormat.DASH]?: IDashURLSource;

package/types/player/utils/extractEmbeddableAllocation.d.ts

@@ -0,0 +1,3 @@
+import type { IConfig, IDirectEmbeddableAllocation } from "../types";
+declare const _default: (config: IConfig) => IDirectEmbeddableAllocation | null;
+export default _default;

package/types/providers/ChromecastProvider/types.d.ts

@@ -1,7 +1,7 @@
 import type { IMetadata, ISources, VideoFormat } from "../../player/types";
 import type { IProviderParams } from "../types";
 import type { IChromecastConnection } from "./ChromecastInitializer/types";
-export interface IParams extends Omit<IProviderParams<ISources>, "skipVideoElVolumeSync$"> {
+export interface IParams extends Omit<IProviderParams<ISources>, "skipVideoElVolumeSync$" | "allocation"> {
 	meta: IMetadata;
 	format: VideoFormat;
 	connection: IChromecastConnection;

package/types/providers/DashLiveProvider/DashLiveProvider.d.ts

@@ -11,7 +11,7 @@ type Params = IProviderParams<IDashURLSource> & {
 export default class DashLiveProvider implements IProvider {
 	private subscription;
 	private volumeSubscription;
-	private video;
+	private readonly allocation;
 	private videoState;
 	private dash;
 	private representations$;

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

@@ -5,7 +5,7 @@ import { IRepresentation, State } from "../types";
 import { Subject } from "@vkontakte/videoplayer-shared";
 import { PlaybackState } from "../../../player/types";
 interface IParams {
-	videoElement: HTMLVideoElement;
+	videoElement: HTMLMediaElement;
 	videoState: IStateMachine<State>;
 	playbackState: IStateMachine<PlaybackState>;
 	liveOffset: ILiveOffset;

package/types/providers/DashProvider/baseDashProvider.d.ts

@@ -2,7 +2,7 @@ import type { IAudioTrack, IDashURLSource, IHLSSource, IInternalTextTrack, IVide
 import type { IProviderSubscriptionInfo } from "./lib/types";
 import { ProviderState } from "./lib/types";
 import type { CommonInit, Representation, Stream } from "../utils/parsers/types";
-import type { IProvider, IProviderParams } from "../types";
+import type { IProvider, IProviderAllocationResolution, IProviderParams } from "../types";
 import type { IObservableVideo } from "../utils/HTMLVideoElement/observable";
 import { TrackHistory } from "../../utils/autoSelectTrack";
 import type { IStateMachine } from "../../utils/StateMachine/types";
@@ -26,7 +26,7 @@ export default abstract class BaseDashProvider implements IProvider {
 	protected subscription: ISubscription;
 	protected volumeSubscription: ISubscription;
 	protected videoState: IStateMachine<ProviderState>;
-	protected video: HTMLVideoElement;
+	protected readonly allocation: IProviderAllocationResolution;
 	protected observableVideo: IObservableVideo | null;
 	protected player: Player;
 	protected params: IParams;

package/types/providers/DashProvider/lib/player.d.ts

@@ -89,7 +89,7 @@ export declare class Player {
 	private dashMaxTvVideoQuality;
 	private destroyController;
 	constructor(params: Params);
-	initManifest: ReturnType<typeof abortable<[HTMLVideoElement, string, number]>>;
+	initManifest: ReturnType<typeof abortable<[HTMLMediaElement, string, number]>>;
 	updateManifest: ReturnType<typeof abortable<[], Manifest | null>>;
 	setSmartRepresentationSwitch(state: boolean): void;
 	seekLive(nextOffset: Milliseconds): Promise<void>;

package/types/providers/DashProviderVirtual/baseDashProvider.d.ts

@@ -2,7 +2,7 @@ import type { IAudioTrack, IBaseTrack, IDashURLSource, IHLSSource, IInternalText
 import type { IProviderSubscriptionInfo } from "./lib/types";
 import { ProviderState } from "./lib/types";
 import type { CommonInit, Representation, Stream } from "../utils/parsers/types";
-import type { IProvider, IProviderParams } from "../types";
+import type { IProvider, IProviderAllocationResolution, IProviderParams } from "../types";
 import type { IObservableVideo } from "../utils/HTMLVideoElement/observable";
 import { TrackHistory } from "../../utils/autoSelectTrack";
 import type { IStateMachine } from "../../utils/StateMachine/types";
@@ -26,7 +26,7 @@ export default abstract class BaseDashProvider implements IProvider {
 	protected subscription: ISubscription;
 	protected volumeSubscription: ISubscription;
 	protected videoState: IStateMachine<ProviderState>;
-	protected video: HTMLVideoElement;
+	protected readonly allocation: IProviderAllocationResolution;
 	protected observableVideo: IObservableVideo | null;
 	protected player: BasePlayer;
 	protected params: IParams;

package/types/providers/DashProviderVirtual/lib/player/basePlayer.d.ts

@@ -14,7 +14,7 @@ import type { Params } from "./types";
 import { State } from "./types";
 import { NativeBufferManager } from "../buffer/nativeBufferManager";
 export declare abstract class BasePlayer {
-	protected element: HTMLVideoElement | null;
+	protected element: HTMLMediaElement | null;
 	protected manifestUrlString: string;
 	protected source: MediaSource | null;
 	protected manifest: Manifest | null;
@@ -80,7 +80,7 @@ export declare abstract class BasePlayer {
 	protected abstract setSourceInitDuration(): void;
 	protected abstract restoreAfterDeepStall(): Promise<void>;
 	initRepresentations: ReturnType<typeof abortable<[Representation["id"], Representation["id"] | undefined, IHLSSource | undefined]>>;
-	initManifest(element: HTMLVideoElement, manifestBaseUrlString: string, offset: number): Promise<void>;
+	initManifest(element: HTMLMediaElement, manifestBaseUrlString: string, offset: number): Promise<void>;
 	initBuffer(): void;
 	switchRepresentation(kind: StreamKind, id: Representation["id"], mode: SwithRepresentationMode): Promise<void>;
 	seek(requestedPosition: Milliseconds, forcePrecise?: boolean): Promise<void>;

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

@@ -12,7 +12,7 @@ export default class HlsLiveProvider implements IProvider {
 	private subscription;
 	private volumeSubscription;
 	private videoState;
-	private video;
+	private readonly allocation;
 	private params;
 	private textTracksManager;
 	private liveTextManager;

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

@@ -7,7 +7,7 @@ export default class HlsProvider implements IProvider {
 	private subscription;
 	private volumeSubscription;
 	private videoState;
-	private video;
+	private readonly allocation;
 	private params;
 	private textTracksManager;
 	private masterManifest;

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

@@ -5,7 +5,7 @@ export default class MpegProvider implements IProvider {
 	private subscription;
 	private volumeSubscription;
 	private videoState;
-	private video;
+	private readonly allocation;
 	private trackUrls;
 	private params;
 	private textTracksManager;

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

@@ -3,10 +3,10 @@ import { VideoFormat } from "../../player/types";
 import type { ITuningConfig } from "../../utils/tuningConfig";
 import type { IError, ISubject, IValueSubject, IRectangle } from "@vkontakte/videoplayer-shared";
 import { ValueSubject } from "@vkontakte/videoplayer-shared";
-import type { IDesiredState, IProviderDependencies, IProviderOutput } from "../types";
+import type { IDesiredState, IProviderDependencies, IProviderOutput, TProviderAllocation } from "../types";
 import type { IProviderContainer, IProviderEntry } from "./types";
 interface IParams extends IProviderDependencies {
-	container: HTMLElement;
+	allocation: TProviderAllocation;
 	sources: ISources;
 	meta: IMetadata;
 	failoverHosts: string[];

package/types/providers/WebRTCLiveProvider/WebRTCLiveProvider.d.ts

@@ -10,7 +10,7 @@ export default class WebRTCLiveProvider implements IProvider {
 	private readonly volumeSubscription;
 	private readonly params;
 	private log;
-	private video;
+	private readonly allocation;
 	private videoState;
 	private liveStreamClient;
 	private maxSeekBackTime$;

package/types/providers/types.d.ts

@@ -1,8 +1,8 @@
 import type { ITuningConfig } from "../utils/tuningConfig";
-import type { ILogger, ISubject, IValueSubject, Milliseconds, Seconds, IRange, IError, QualityLimits, IWarning, IComponentLogger, ITracer, IRectangle } from "@vkontakte/videoplayer-shared";
+import type { IComponentLogger, IError, ILogger, IRange, IRectangle, ISubject, ITracer, IValueSubject, IWarning, Milliseconds, QualityLimits, Seconds } from "@vkontakte/videoplayer-shared";
 import type { IChromecastInitializer } from "./ChromecastProvider/ChromecastInitializer/types";
-import type { HttpConnectionType, HttpConnectionMetrics, HttpDownloadMetrics, VideoCodec, AudioCodec, IAudioStream, IAudioTrack, ICueSettings, ISources, IVideoStream, SeekState } from "../player/types";
-import type { IExternalTextTrack, IInternalTextTrack, ITextTrack, IVideoTrack, IVolumeState, PlaybackState, PlaybackRate } from "../player/types";
+import type { IExternalTextTrack, IInternalTextTrack, ITextTrack, IVideoTrack, IVolumeState, PlaybackRate, PlaybackState } from "../player/types";
+import type { AudioCodec, HttpConnectionMetrics, HttpConnectionType, HttpDownloadMetrics, IAudioStream, IAudioTrack, ICueSettings, IDirectEmbeddableAllocation, IPersonalAllocation, ISources, IVideoStream, SeekState, TAnyAllocation, VideoCodec } from "../player/types";
 import type { IStateMachine } from "../utils/StateMachine/types";
 import type ThroughputEstimator from "../utils/ThroughputEstimator";
 import type { Scene3D } from "../utils/3d/Scene3D";
@@ -21,7 +21,7 @@ export interface IProviderDependencies {
 	};
 }
 export interface IProviderParams<TSourceType> extends IProviderDependencies {
-	container: HTMLElement;
+	readonly allocation: TProviderAllocation;
 	source: TSourceType;
 	desiredState: IDesiredState;
 	output: IProviderOutput;
@@ -66,6 +66,7 @@ export type IDesiredState = { [K in keyof DesiredStateValues] : IStateMachine<De
 export interface IProviderOutput {
 	position$: IValueSubject<Seconds>;
 	duration$: IValueSubject<Seconds>;
+	playedTime$: IValueSubject<Seconds>;
 	volume$: IValueSubject<IVolumeState>;
 	currentVideoSegmentLength$: IValueSubject<number>;
 	currentAudioSegmentLength$: IValueSubject<number>;
@@ -129,3 +130,8 @@ export interface IProviderOutput {
 	playbackState$: IValueSubject<PlaybackState | string>;
 	getCurrentTime$: IValueSubject<(() => number) | null>;
 }
+export type TProviderAllocation = Extract<TAnyAllocation, IDirectEmbeddableAllocation | IPersonalAllocation>;
+export interface IProviderAllocationResolution {
+	readonly target: HTMLMediaElement;
+	readonly video: HTMLVideoElement | null;
+}

package/types/providers/utils/Abr/types.d.ts

@@ -55,7 +55,7 @@ export interface IInitAbrManagerContext {
 	throughput$: IValueSubject<Kbps>;
 	rtt$: IValueSubject<Milliseconds>;
 	throughputVariance$?: IValueSubject<number>;
-	element: HTMLVideoElement;
+	element: HTMLMediaElement;
 	failedVideoTrack: Nullable<IVideoTrack>;
 	abrLogger: IComponentLogger;
 	panelSize?: IRectangle;
@@ -63,7 +63,7 @@ export interface IInitAbrManagerContext {
 export interface IVideoElementAbrManagerContext {
 	observableVideo: IObservableVideo;
 	elementVisible$: IValueSubject<boolean>;
-	elementSizeManager: ElementSizeManager;
+	elementSizeManager?: ElementSizeManager;
 }
 export interface IVideoTracksContext {
 	videoTracksAsc: IVideoTrack[];

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

@@ -1 +1 @@
-export declare const destroy: (video: HTMLVideoElement, clearVideoElementInnerHTML: boolean) => void;
+export declare const destroy: (video: HTMLMediaElement, clearVideoElementInnerHTML: boolean) => void;

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

@@ -4,5 +4,5 @@
 * @param {Function} soundNotAllowedCallback - колбэк, который вызовется если нам не разрешили играть со звуком
 * @return {Promise}<boolean> - получилось начать воспроизведение
 */
-declare const _default: (video: HTMLVideoElement, soundNotAllowedCallback?: () => void) => Promise<boolean>;
+declare const _default: (video: HTMLMediaElement, soundNotAllowedCallback?: () => void) => Promise<boolean>;
 export default _default;

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

@@ -12,6 +12,7 @@ export interface IObservableVideo {
 	progress$: IObservable<undefined>;
 	timeUpdate$: IObservable<Seconds>;
 	durationChange$: IObservable<Seconds>;
+	playedTime$: IObservable<Seconds>;
 	loadStart$: IObservable<void>;
 	loadedMetadata$: IObservable<undefined>;
 	loadedData$: IObservable<undefined>;
@@ -25,4 +26,4 @@ export interface IObservableVideo {
 	leavePip$: IObservable<PictureInPictureEvent>;
 	destroy: () => void;
 }
-export declare const observe: (video: HTMLVideoElement) => IObservableVideo;
+export declare const observe: (video: HTMLMediaElement) => IObservableVideo;

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

@@ -1,6 +1,7 @@
 import type { ITuningConfig } from "../../../utils/tuningConfig";
-type AllocateConstraints = Pick<ITuningConfig, "audioVideoSyncRate" | "disableYandexPiP" | "clearVideoElementInnerHTML" | "reuseOwnVideoElement">;
+export type AllocateConstraints = Pick<ITuningConfig, "audioVideoSyncRate" | "disableYandexPiP" | "clearVideoElementInnerHTML" | "reuseOwnVideoElement">;
 type DisposeConstraints = Pick<ITuningConfig, "keepVideoElement" | "clearVideoElementInnerHTML" | "reuseOwnVideoElement">;
 export declare const allocate: (container: HTMLElement, { audioVideoSyncRate, disableYandexPiP, clearVideoElementInnerHTML, reuseOwnVideoElement }: AllocateConstraints) => HTMLVideoElement;
-export declare const dispose: (videoElement: HTMLVideoElement, { keepVideoElement, clearVideoElementInnerHTML, reuseOwnVideoElement }: DisposeConstraints) => void;
+export declare const initializeAudio: (element: HTMLAudioElement) => HTMLAudioElement;
+export declare const dispose: (element: HTMLMediaElement, constraints: DisposeConstraints) => void;
 export {};

package/types/providers/utils/createAllocationResolution.d.ts

@@ -0,0 +1,3 @@
+import type { IProviderAllocationResolution, TProviderAllocation } from "../types";
+import { type AllocateConstraints } from "./HTMLVideoElement/pool";
+export declare function resolveAllocation(allocation: TProviderAllocation, constraints: AllocateConstraints): IProviderAllocationResolution;

package/types/providers/utils/syncDesiredState.d.ts

@@ -6,9 +6,9 @@ declare const syncDesiredState: <Value>(desiredState: IStateMachine<Value | unde
 	changed$?: IObservable<Value | undefined>;
 	onError?: IListener<Error | unknown>;
 }) => 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>, params?: {
+export declare const syncVideoLooped: (video: HTMLMediaElement, desiredState: IStateMachine<boolean>, onError?: IListener<Error | unknown>) => ISubscription;
+export declare const syncVideoVolumeState: (video: HTMLMediaElement, desiredState: IStateMachine<IVolumeState>, changed$: IObservable<IVolumeState>, onError?: IListener<Error | unknown>, params?: {
 	skipVideoElVolumeSync$: IValueSubject<boolean>;
 }) => ISubscription;
-export declare const syncVideoPlaybackRate: (video: HTMLVideoElement, desiredState: IStateMachine<PlaybackRate>, changed$: IObservable<PlaybackRate>, onError?: IListener<Error | unknown>) => ISubscription;
+export declare const syncVideoPlaybackRate: (video: HTMLMediaElement, desiredState: IStateMachine<PlaybackRate>, changed$: IObservable<PlaybackRate>, onError?: IListener<Error | unknown>) => ISubscription;
 export default syncDesiredState;

package/types/utils/buffer/getPlayedTime.d.ts

@@ -0,0 +1,3 @@
+import type { Seconds } from "@vkontakte/videoplayer-shared";
+declare const _default: (ranges: TimeRanges) => Seconds;
+export default _default;

package/types/utils/changePlaybackRate.d.ts

@@ -1,2 +1,2 @@
 import type { Nullable } from "@vkontakte/videoplayer-shared";
-export declare const changePlaybackRate: (element: Nullable<HTMLVideoElement>, targetPlaybackRate: number) => void;
+export declare const changePlaybackRate: (element: Nullable<HTMLMediaElement>, targetPlaybackRate: number) => void;

package/types/player/utils/selectContainer.d.ts

@@ -1,3 +0,0 @@
-import type { IConfig } from "../types";
-declare const _default: (config: IConfig) => HTMLElement;
-export default _default;