@vkontakte/videoplayer 1.1.91 → 1.1.92-beta.0

package/types/store/modules/utils.d.ts

@@ -0,0 +1,6 @@
+import type { IDIContainer, InjectionToken } from "@vkontakte/videoplayer-shared";
+export type Module<T> = {
+	token: InjectionToken<T>;
+	factory: (container: IDIContainer) => T;
+};
+export declare const registerModules: <T extends any[]>(container: IDIContainer, modules: { [K in keyof T] : Module<T[K]> }) => void;

package/types/store/types.d.ts

@@ -15,19 +15,21 @@ import type { FocusManager } from "../utils/webAPI/focusManager";
 import type { ISDKConfig, IUIConfig } from "../config";
 import type { IUIStatistics } from "../services/statistics";
 import type { DebugData } from "./utils";
+import type { ICompositionResult } from "./composition";
 export interface SetQualityInfo {
 	appliesTo?: QualitySettingsAppliesTo;
 	changeReason?: "default" | "limit-changed";
 	byUser?: boolean;
 }
-export interface IAdsState {
-	position: Writable<number>;
-	duration: Writable<number>;
-	playbackState: Writable<AdsPlaybackState>;
-	canSkip: Writable<boolean>;
-	secondsToWatchBeforeSkip: Writable<number>;
-	postrollPassed: Writable<boolean>;
+export interface IAdsStateValues {
+	position: number;
+	duration: number;
+	playbackState: AdsPlaybackState;
+	canSkip: boolean;
+	secondsToWatchBeforeSkip: number;
+	postrollPassed: boolean;
 }
+export type IAdsState = { [K in keyof IAdsStateValues] : Writable<IAdsStateValues[K]> };
 export interface IUIState {
 	t: (key: Key, params?: Record<string, string>) => string;
 	isMinimalView$: Writable<boolean>;
@@ -259,7 +261,6 @@ export interface IStoreInternalActions {
 	setLiveWaitingRecord: (state: boolean) => void;
 	clearDelayedBufferingCheckTimeout: () => void;
 	getDebugTextData: () => string;
-	getTraceTextData: () => string;
 	getDebugPanelData: () => DebugData;
 	getVideoElement: () => HTMLVideoElement | null;
 	startLogging: () => void;
@@ -356,6 +357,7 @@ export interface IStore {
 	callbacks?: IVKVideoPlayerCallbacks;
 	setUiCallbacks: (uiCallbacks: IVKVideoPlayerUICallbacks) => void;
 	initAdmanWrapper: VoidFunction;
+	resetAdsState: VoidFunction;
 	updateAdmanWrapperSubscriptions: VoidFunction;
 	updateStatisticsSubscriptions: VoidFunction;
 	updateAppTracerSubscriptions: VoidFunction;
@@ -363,6 +365,10 @@ export interface IStore {
 	getPlayer: () => IPlayer;
 	destroy(): void;
 }
+export type EnrichedStore = IStore & {
+	stores: ICompositionResult["stores"];
+	destroyComposedStore: () => void;
+};
 export interface IStoreParams {
 	interfaceLanguage: InterfaceLanguage | string;
 	isCyrillicRelatedInterface: boolean;

package/types/store/utils.d.ts

@@ -1,13 +1,12 @@
 import type { Readable } from "svelte/store";
 import type { IValueObservable } from "@vkontakte/videoplayer-shared";
 import type { IPlayer, IConfig, IObservable } from "@vkontakte/videoplayer-core";
-import type { IStore } from "./types";
-import type { AdditionalButtonDeprecated, IMicroStores } from "../types";
+import type { EnrichedStore, IAdsStateValues, IStore } from "./types";
+import { type AdditionalButtonDeprecated } from "../types";
 import type { AdditionalDesktopControlPanelButton } from "../components/Controls/types";
 import type { ISDKConfig } from "../config";
-export declare const setStores: (store: IStore, microStores: IMicroStores) => void;
-export declare const getStore: () => IStore;
-export declare const getMicroStores: () => IMicroStores;
+export declare const setStores: (store: EnrichedStore) => void;
+export declare const getStore: () => EnrichedStore;
 /**
 * Создаёт readable store svelte'а из `IObservableValue` sdk
 */
@@ -51,3 +50,4 @@ export declare class SubtitlesDownloader {
 	destroy(): void;
 	isDestroyed(): boolean;
 }
+export declare const getAdsDefaultStateValues: () => IAdsStateValues;

package/types/types/index.d.ts

@@ -1,13 +1,11 @@
 import type { VideoQuality, VideoFormat, ISources, IExternalTextTrack, IAudioStream } from "@vkontakte/videoplayer-core";
-import type { IValueObservable, InterfaceLanguage, Subscription, IRectangle, DevNullEntry } from "@vkontakte/videoplayer-shared";
-import type { Chapter, Manifest, ManifestVideo, VideoInfo, Interactives, IInteractiveOptions } from "@vkontakte/videoplayer-interactive";
+import type { IValueObservable, InterfaceLanguage, IRectangle, DevNullEntry } from "@vkontakte/videoplayer-shared";
+import type { Chapter, Manifest, ManifestVideo, VideoInfo, IInteractiveOptions } from "@vkontakte/videoplayer-interactive";
 import type { PlaybackState } from "@vkontakte/videoplayer-core";
 import type { MediascopePixelTypes, SeekAction, ThinOneStat } from "@vkontakte/videoplayer-statistics";
 import type { Writable, Readable } from "svelte/store";
-import type { IDpipConfig, ISDKConfig, IUIConfig } from "../config";
-import type { IStore } from "../store";
+import type { IDpipConfig, ISDKConfig } from "../config";
 import type { Controls, GridTypes } from "../constans";
-import { type SeekToInteractiveDisabledTooltipKey } from "../constans";
 import type { Key } from "../translation/types";
 import type { IUIStatistics } from "../services/statistics";
 import type { AdditionalContextMenuItem, AdditionalSettingsMenuItem } from "../components/Menus/subMenuTabs/types";
@@ -41,6 +39,7 @@ export interface IVKVideoPlayerCallbacks {
 	onPlay?: () => void;
 	onLooped?: () => void;
 	onPause?: () => void;
+	onFinished?: () => void;
 	onVolumeChange?: (volume: number) => void;
 	onFullscreenEnter?: () => void;
 	onFullscreenExit?: () => void;
@@ -157,6 +156,12 @@ export interface IVKVideoPlayerCallbacks {
 		onTitleChanged?: (value?: IControlInfo) => void;
 		onControlWillChange?: (params: ControlWillChangeParams) => void;
 		onPreviewTimelineActiveChanged?: (active: boolean) => void;
+		onSubtitlesInfo?: (value: {
+			subtitlesLineCount?: number;
+			bottomOffest: number;
+			height: number;
+			visible: boolean;
+		}) => void;
 	};
 	adsInfo?: {
 		onLoadStarted?: () => void;
@@ -488,12 +493,13 @@ export interface ExternalPictureInPictureEventHandlers {
 	resize?: (size: Size) => void;
 }
 export interface IPictureInPictureApi {
+	info: IPictureInPictureApiInfo;
+	dpipConfig?: IDpipConfig;
 	isSupported(): boolean;
 	isActive(): boolean;
 	setContext(svelteContext: Map<unknown, unknown>): void;
 	request(): Promise<void>;
 	exit(): Promise<void>;
-	info: IPictureInPictureApiInfo;
 	setEnabled(enabled: boolean): void;
 	dispose(): Promise<void>;
 	assignPlayerContainer(playerContainer: HTMLElement): void;
@@ -605,54 +611,6 @@ export declare enum EpisodesModes {
 	COUNT = "COUNT",
 	SHORT = "SHORT"
 }
-export type IToggleable<T> = T & {
-	toggle: () => void;
-};
-type MicroStoreWritableBase<T = unknown> = Writable<T>;
-type ToggleableMicroStore = IToggleable<MicroStoreWritableBase<boolean | null>>;
-export type PictureInPictureMicroStore = {
-	isActive$: Writable<boolean>;
-	isEnabled$: Writable<boolean>;
-	type$: Writable<PictureInPictureType | undefined>;
-};
-export type NotificationsMicroStore = {
-	notificationsToShow$: Writable<Partial<Record<NotificationId, boolean>>>;
-	showNotification: (id: NotificationId) => void;
-	closeNotification: (id: NotificationId) => void;
-};
-export type PreviewPlayerMicroStore = {
-	timelineActive$: Writable<boolean>;
-};
-export interface IMicroStores {
-	fakeIsPlaying$: ToggleableMicroStore;
-	interactiveControlsOpacity$: ToggleableMicroStore;
-	seekToInteractiveDisabledTooltip$: MicroStoreWritableBase<SeekToInteractiveDisabledTooltipKey>;
-	showInteractiveTimeIndicatorTooltip$: MicroStoreWritableBase<boolean> & {
-		set: (newValue: boolean, useTimeout: boolean) => void;
-		clearTimeout: () => void;
-	};
-	graphIsOpened$: ToggleableMicroStore;
-	pictureInPicture$: PictureInPictureMicroStore;
-	notifications$: NotificationsMicroStore;
-	previewPlayer$: PreviewPlayerMicroStore;
-}
-export interface InitMicroStoreParams {
-	store: IStore;
-	microStores: IMicroStores;
-	uiConfig: IUIConfig;
-	interactiveController?: Interactives;
-	interactiveData?: IInteractiveData;
-}
-export interface IMicroStore<StateName extends keyof IMicroStores = keyof IMicroStores> {
-	readonly stateName: StateName;
-	state$: IMicroStores[StateName];
-	subscription: Subscription;
-	init: (initStoreParams: InitMicroStoreParams) => Subscription;
-}
-export type IMicroStoresRoot = {
-	subscribers: IMicroStore[];
-	stores: IMicroStores;
-};
 export type Position = {
 	top?: number;
 	left?: number;

package/types/utils/webAPI/pictureInPictureApi/documentPictureInPictureApi.svelte.d.ts

@@ -1,8 +1,9 @@
 import { ValueSubject } from "@vkontakte/videoplayer-shared";
+import type { IDpipConfig } from "../../../config";
 import type { ExternalPictureInPictureEventHandlers, IPictureInPictureApi, PictureInPictureSettings } from "../../../types";
 import { PictureInPictureType } from "../../../types";
 export declare class DocumentPictureInPictureApiSvelte implements IPictureInPictureApi {
-	private readonly initialSize;
+	readonly settings: PictureInPictureSettings;
 	private playerDomElement;
 	private playerParentShadowRoot;
 	private playerDummyElement;
@@ -18,7 +19,8 @@ export declare class DocumentPictureInPictureApiSvelte implements IPictureInPict
 	*/
 	private pipActive;
 	private readonly pipApi;
-	constructor({ enabled, initialSize }: PictureInPictureSettings);
+	constructor(settings: PictureInPictureSettings);
+	get dpipConfig(): IDpipConfig;
 	/**
 	* Флаг показывает, есть ли в целом возможность использовать dpip в данном браузере, поддерживается ли это.
 	*/
@@ -39,6 +41,7 @@ export declare class DocumentPictureInPictureApiSvelte implements IPictureInPict
 	assignPlayerContainer(playerContainer: HTMLElement): void;
 	updateVideoElement(): void;
 	setExternalEventHandlers(externalEventHandlers: ExternalPictureInPictureEventHandlers): void;
+	private get initialSize();
 	private createStretchedContainer;
 }
 export declare function isInstanceOfDocumentPictureInPictureApi(pictureInPictureApi?: IPictureInPictureApi): pictureInPictureApi is DocumentPictureInPictureApiSvelte;

package/types/store/micro/base.d.ts

@@ -1,8 +0,0 @@
-import { Subscription } from "@vkontakte/videoplayer-shared";
-import type { IMicroStore, IMicroStores, InitMicroStoreParams } from "../../types";
-export declare class BaseMicroStore<StateName extends keyof IMicroStores = keyof IMicroStores> implements IMicroStore {
-	readonly stateName: StateName;
-	state$: IMicroStores[StateName];
-	subscription: Subscription;
-	init({ store, microStores, interactiveController, interactiveData }: InitMicroStoreParams): Subscription;
-}

package/types/store/micro/fakeIsPlaying.d.ts

@@ -1,10 +0,0 @@
-import { type Writable } from "svelte/store";
-import { BaseMicroStore } from "./base";
-import type { InitMicroStoreParams, IToggleable } from "../../types";
-import type { Subscription } from "@vkontakte/videoplayer-shared";
-type ToggleableMicroStore = IToggleable<Writable<boolean | null>>;
-export default class FakeIsPlaying extends BaseMicroStore {
-	readonly stateName = "fakeIsPlaying$";
-	state$: ToggleableMicroStore;
-	init(initStoreParams: InitMicroStoreParams): Subscription;
-}

package/types/store/micro/graphIsOpened.d.ts

@@ -1,13 +0,0 @@
-import { type Writable } from "svelte/store";
-import type { Subscription } from "@vkontakte/videoplayer-shared";
-import { BaseMicroStore } from "./base";
-import type { InitMicroStoreParams, IToggleable } from "../../types";
-import { GridTypes } from "../../constans";
-type ToggleableMicroStore = IToggleable<Writable<boolean | null>>;
-export default class GraphIsOpened extends BaseMicroStore {
-	readonly stateName = "graphIsOpened$";
-	private graphMadePause;
-	state$: ToggleableMicroStore;
-	checkIfShouldHide: (currentGridType: GridTypes) => boolean;
-	init(initStoreParams: InitMicroStoreParams): Subscription;
-}

package/types/store/micro/index.d.ts

@@ -1,2 +0,0 @@
-import type { IMicroStoresRoot } from "../../types";
-export declare const createMicroStoresRoot: () => IMicroStoresRoot;

package/types/store/micro/interactiveControlsOpacity.d.ts

@@ -1,10 +0,0 @@
-import { type Writable } from "svelte/store";
-import { BaseMicroStore } from "./base";
-import type { InitMicroStoreParams, IToggleable } from "../../types";
-import type { Subscription } from "@vkontakte/videoplayer-shared";
-type ToggleableMicroStore = IToggleable<Writable<boolean | null>>;
-export default class InteractiveControlsOpacity extends BaseMicroStore {
-	readonly stateName = "interactiveControlsOpacity$";
-	state$: ToggleableMicroStore;
-	init(initStoreParams: InitMicroStoreParams): Subscription;
-}

package/types/store/micro/notifications.d.ts

@@ -1,9 +0,0 @@
-import { BaseMicroStore } from "./base";
-import { type InitMicroStoreParams, type NotificationsMicroStore } from "../../types";
-import type { Subscription } from "@vkontakte/videoplayer-shared";
-export default class Notifications extends BaseMicroStore {
-	readonly stateName = "notifications$";
-	private notificationManager;
-	state$: NotificationsMicroStore;
-	init(initStoreParams: InitMicroStoreParams): Subscription;
-}

package/types/store/micro/pictureInPicture.d.ts

@@ -1,8 +0,0 @@
-import { BaseMicroStore } from "./base";
-import type { InitMicroStoreParams, PictureInPictureMicroStore } from "../../types";
-import type { Subscription } from "@vkontakte/videoplayer-shared";
-export default class PictureInPicture extends BaseMicroStore {
-	readonly stateName = "pictureInPicture$";
-	state$: PictureInPictureMicroStore;
-	init(initStoreParams: InitMicroStoreParams): Subscription;
-}

package/types/store/micro/seekToInteractiveDisabledTooltip.d.ts

@@ -1,10 +0,0 @@
-import { BaseMicroStore } from "./base";
-import { type Writable } from "svelte/store";
-import type { SeekToInteractiveDisabledTooltipKey } from "../../constans";
-import type { InitMicroStoreParams } from "../../types";
-import type { Subscription } from "@vkontakte/videoplayer-shared";
-export default class SeekToInteractiveDisabledTooltip extends BaseMicroStore {
-	readonly stateName = "seekToInteractiveDisabledTooltip$";
-	state$: Writable<SeekToInteractiveDisabledTooltipKey>;
-	init(initStoreParams: InitMicroStoreParams): Subscription;
-}

package/types/store/micro/showInteractiveTimeIndicatorTooltip.d.ts

@@ -1,15 +0,0 @@
-import { type Writable } from "svelte/store";
-import { BaseMicroStore } from "./base";
-import type { InitMicroStoreParams } from "../../types";
-import type { Subscription } from "@vkontakte/videoplayer-shared";
-type ShowInteractiveTimeIndicatorTooltipState = Writable<boolean> & {
-	set: (newValue: boolean, useTimeout?: boolean) => void;
-	clearTimeout: () => void;
-};
-export default class ShowInteractiveTimeIndicatorTooltip extends BaseMicroStore {
-	readonly stateName = "showInteractiveTimeIndicatorTooltip$";
-	private timeout;
-	state$: ShowInteractiveTimeIndicatorTooltipState;
-	init(initStoreParams: InitMicroStoreParams): Subscription;
-	clearTimeout(): void;
-}