@vkontakte/videoplayer 1.1.102-dev.a5a2d3fc3.0 → 1.1.102-dev.cb6e2e206.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer",
-  "version": "1.1.102-dev.a5a2d3fc3.0",
+  "version": "1.1.102-dev.cb6e2e206.0",
   "author": "vk.ru",
   "description": "Videoplayer based on the vk.ru platform",
   "homepage": "https://vk.ru",
@@ -43,9 +43,9 @@
   ],
   "dependencies": {
     "@adtech/rbadman": "2.2.57",
-    "@vkontakte/videoplayer-core": "2.0.171-dev.a5a2d3fc3.0",
-    "@vkontakte/videoplayer-interactive": "1.0.77-dev.a5a2d3fc3.0",
-    "@vkontakte/videoplayer-shared": "1.0.100-dev.a5a2d3fc3.0",
-    "@vkontakte/videoplayer-statistics": "1.0.117-dev.a5a2d3fc3.0"
+    "@vkontakte/videoplayer-core": "2.0.171-dev.cb6e2e206.0",
+    "@vkontakte/videoplayer-interactive": "1.0.77-dev.cb6e2e206.0",
+    "@vkontakte/videoplayer-shared": "1.0.100-dev.cb6e2e206.0",
+    "@vkontakte/videoplayer-statistics": "1.0.117-dev.cb6e2e206.0"
   }
 }

package/types/components/Ads/admanWrapper.d.ts

@@ -57,6 +57,7 @@ export declare class AdmanWrapper {
 	initAdman(initParams: AdmanInitParams): Promise<void>;
 	private switchToVideo;
 	private setPostrollPassed;
+	private setAdsBlocked;
 	togglePlay(): void;
 	setInitialVolume(volume: number): void;
 	setVolume(volume: number): void;

package/types/config.d.ts

@@ -160,9 +160,6 @@ export interface IUIConfig {
 		tracerPausedAtInit: boolean;
 		/** Размер буфера для событий трейсера. 0 — буфер не используется */
 		tracerEventsBufferSize: number;
-		tracerResumeOnFormatSwitch: boolean;
-		tracerResumeOnFatalError: boolean;
-		tracerSpanOnRecoverableError: boolean;
 		apptracer: IAppTracerConfig;
 		interactiveGraph: boolean;
 		interactiveResponsiveUi?: boolean;
@@ -219,6 +216,10 @@ export interface IUIConfig {
 		*/
 		useCallbackForMediaSessionNextPrevClick: boolean;
 		/**
+		* Фикс производительности отрисовки.
+		*/
+		usePerformanceFix: boolean;
+		/**
 		* Включает восстановление выбранных настроек видео,
 		* например, звуковой дорожки и субтитров
 		*/

package/types/store/composition.d.ts

@@ -1,9 +1,18 @@
+import type { IUIConfig } from "../config";
+import type { IVKVideoPlayerConfig } from "../types";
+import type { IUIStatistics } from "../services/statistics";
 import type { IStore } from "./index";
-import type { FakeIsPlayingStore, GraphIsOpenedStore, HighlightedMenuItemsStore, InteractiveControlsOpacityStore, LanguageStore, NotificationsStore, PictureInPictureStore, IQoeStore, SeekToInteractiveDisabledTooltipStore, ShowInteractiveTimeIndicatorTooltipStore, SubtitlesStore, QualityStore, PlaybackRateStore, AudioVideoStreamsStore, SettingsStore } from "./modules";
-import type { IStoreContext } from "./modules/infrastructure";
+import type { FakeIsPlayingStore, GraphIsOpenedStore, HighlightedMenuItemsStore, InteractiveControlsOpacityStore, LanguageStore, NotificationsStore, PictureInPictureStore, IQoeStore, SeekToInteractiveDisabledTooltipStore, ShowInteractiveTimeIndicatorTooltipStore, SubtitlesStore, QualityStore, PlaybackRateStore, AudioVideoStreamsStore } from "./modules";
+import type { AppTracer, ITracer } from "@vkontakte/videoplayer-shared";
+import type { Interactives } from "@vkontakte/videoplayer-interactive";
 export interface ICompositionParams {
 	legacyStore: IStore;
-	storeContext: IStoreContext;
+	uiConfig: IUIConfig;
+	config: IVKVideoPlayerConfig;
+	interactiveController: Interactives | undefined;
+	getStatisticsService: () => IUIStatistics | undefined;
+	getAppTracer: () => AppTracer | undefined;
+	tracer: ITracer;
 }
 export interface ICompositionResult {
 	stores: {
@@ -21,7 +30,6 @@ export interface ICompositionResult {
 		qualityStore: QualityStore;
 		playbackRateStore: PlaybackRateStore;
 		audioVideoStreamsStore: AudioVideoStreamsStore;
-		settingsStore: SettingsStore;
 	};
 	/** Очистка ресурсов */
 	destroy(): void;

package/types/store/index.d.ts

@@ -4,4 +4,4 @@ export type { IStore, IAdsState, IUIState, EnrichedStore } from "./types";
 * Store приложения.
 * Если будет слишком большим - можно разделить его на модули
 */
-export declare const createStore: ({ initialVideoId, isTouch, isLiveCatchUpMode, isAudioDisabled, canDownload, callbacks, webApi, videoEpisodes: initialVideoEpisodes, previewThumbsData: initialPreviewThumbsData, uiConfig, coreConfig, player: playerInstance, disabledControls, isInteractive, interactiveRanges$, isInteractiveTime$, replayInteractive, stopPlayer, hasInteractiveBranches, playPrevChapterDisabledTooltip, additionalButtons, additionalContextMenuItems, playPrevVideo, playNextVideo, onVideoChanged, looped, getStatisticsService, internalsExposure, playerView, playerId, metaConfig, getAppTracer, getAdmanWrapper, logger, adsEnabled, rootTracer, tracer }: IStoreParams) => IStore;
+export declare const createStore: ({ initialVideoId, isTouch, isLiveCatchUpMode, isAudioDisabled, canDownload, callbacks, webApi, videoEpisodes: initialVideoEpisodes, previewThumbsData: initialPreviewThumbsData, uiConfig, coreConfig, player: playerInstance, disabledControls, isInteractive, interactiveRanges$, isInteractiveTime$, replayInteractive, stopPlayer, hasInteractiveBranches, playPrevChapterDisabledTooltip, additionalButtons, additionalSettingsMenuItems, additionalContextMenuItems, playPrevVideo, playNextVideo, onVideoChanged, looped, getStatisticsService, internalsExposure, playerView, playerId, metaConfig, getAppTracer, getAdmanWrapper, logger, adsEnabled, rootTracer, tracer }: IStoreParams) => IStore;

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

@@ -1,5 +1,5 @@
-export { SUBSCRIPTION_TOKEN, PLAYER_TOKEN, LOGGER_TOKEN, LEGACY_STORE_TOKEN, STORE_CONTEXT_TOKEN, registerInfrastructure } from "./infrastructure";
-export type { InfrastructureParams, IStoreContext } from "./infrastructure";
+export { SUBSCRIPTION_TOKEN, PLAYER_TOKEN, LOGGER_TOKEN, UI_CONFIG_TOKEN, PLAYER_CONFIG_TOKEN, LEGACY_STORE_TOKEN, INTERACTIVE_CONTROLLER_TOKEN, GET_STATISTICS_SERVICE_TOKEN, APP_TRACER_TOKEN, registerInfrastructure } from "./infrastructure";
+export type { InfrastructureParams } from "./infrastructure";
 export { registerModules } from "./utils";
 export type { Module } from "./utils";
 export type { FakeIsPlayingStoreState, FakeIsPlayingStore, FakeIsPlayingStoreActions } from "./fakeIsPlayingStore";
@@ -29,5 +29,3 @@ export type { PlaybackRateStoreDeps, PlaybackRateStoreState, PlaybackRateStoreAc
 export { playbackRateModule, PLAYBACK_RATE_STORE_TOKEN } from "./playbackRateStore";
 export type { AudioVideoStreamsStoreDeps, AudioVideoStreamsStoreState, AudioVideoStreamsStoreActions, AudioVideoStreamsStoreExternalActions, AudioVideoStreamsStore } from "./audioVideoStreamsStore";
 export { audioVideoStreamsModule, AUDIO_VIDEO_STREAMS_STORE_TOKEN } from "./audioVideoStreamsStore";
-export type { SettingsStoreDeps, SettingsStoreState, SettingsStoreActions, SettingsStoreExternalActions, SettingsStore } from "./settingsStore";
-export { settingsModule, SETTINGS_STORE_TOKEN } from "./settingsStore";

package/types/store/modules/infrastructure/index.d.ts

@@ -1,4 +1,3 @@
-export { SUBSCRIPTION_TOKEN, PLAYER_TOKEN, LOGGER_TOKEN, LEGACY_STORE_TOKEN, STORE_CONTEXT_TOKEN } from "./infrastructure.token";
+export { SUBSCRIPTION_TOKEN, PLAYER_TOKEN, LOGGER_TOKEN, UI_CONFIG_TOKEN, PLAYER_CONFIG_TOKEN, LEGACY_STORE_TOKEN, INTERACTIVE_CONTROLLER_TOKEN, TRACER_STORE_TOKEN, GET_STATISTICS_SERVICE_TOKEN, APP_TRACER_TOKEN } from "./infrastructure.token";
 export { registerInfrastructure } from "./infrastructure.module";
 export type { InfrastructureParams } from "./infrastructure.module";
-export type { IStoreContext } from "./types";

package/types/store/modules/infrastructure/infrastructure.module.d.ts

@@ -3,13 +3,22 @@
 *
 * Регистрация базовых зависимостей и store-модулей.
 */
-import type { IDIContainer, Subscription } from "@vkontakte/videoplayer-shared";
+import type { IDIContainer, Subscription, AppTracer } from "@vkontakte/videoplayer-shared";
+import type { IUIConfig } from "../../../config";
+import type { IVKVideoPlayerConfig } from "../../../types";
 import type { IStore } from "../../index";
-import type { IStoreContext } from "./types";
+import type { Interactives } from "@vkontakte/videoplayer-interactive";
+import type { IUIStatistics } from "../../../services/statistics";
+import type { ITracer } from "@vkontakte/videoplayer-shared";
 export interface InfrastructureParams {
 	legacyStore: IStore;
+	uiConfig: IUIConfig;
+	config: IVKVideoPlayerConfig;
+	interactiveController: Interactives | undefined;
 	subscription: Subscription;
-	storeContext: IStoreContext;
+	tracer: ITracer;
+	getStatisticsService: () => IUIStatistics | undefined;
+	getAppTracer: () => AppTracer | undefined;
 }
 /**
 * Регистрирует базовые зависимости в DI контейнере

package/types/store/modules/infrastructure/infrastructure.token.d.ts

@@ -4,16 +4,27 @@
 * Core DI токены для базовых зависимостей.
 */
 import { InjectionToken } from "@vkontakte/videoplayer-shared";
-import type { Subscription, ILogger } from "@vkontakte/videoplayer-shared";
+import type { Subscription, ILogger, ITracer, AppTracer } from "@vkontakte/videoplayer-shared";
 import type { IPlayer } from "@vkontakte/videoplayer-core";
+import type { Interactives } from "@vkontakte/videoplayer-interactive";
+import type { IUIConfig } from "../../../config";
+import type { IVKVideoPlayerConfig } from "../../../types";
 import type { IStore } from "../../index";
-import type { IStoreContext } from "./types";
+import type { IUIStatistics } from "../../../services/statistics";
 /** Общий subscription для всех rxjs подписок */
 export declare const SUBSCRIPTION_TOKEN: InjectionToken<Subscription>;
 /** Инстанс плеера */
 export declare const PLAYER_TOKEN: InjectionToken<IPlayer>;
 /** Логгер для store */
 export declare const LOGGER_TOKEN: InjectionToken<ILogger>;
+/** Конфигурация ui */
+export declare const UI_CONFIG_TOKEN: InjectionToken<IUIConfig>;
+/** Конфигурация плеера */
+export declare const PLAYER_CONFIG_TOKEN: InjectionToken<IVKVideoPlayerConfig>;
 /** Legacy store (монолитный стор для миграции) */
 export declare const LEGACY_STORE_TOKEN: InjectionToken<IStore>;
-export declare const STORE_CONTEXT_TOKEN: InjectionToken<IStoreContext>;
+/** Интерактивный контроллер */
+export declare const INTERACTIVE_CONTROLLER_TOKEN: InjectionToken<Interactives | undefined>;
+export declare const TRACER_STORE_TOKEN: InjectionToken<ITracer>;
+export declare const GET_STATISTICS_SERVICE_TOKEN: InjectionToken<() => IUIStatistics | undefined>;
+export declare const APP_TRACER_TOKEN: InjectionToken<() => AppTracer | undefined>;

package/types/store/types.d.ts

@@ -8,7 +8,7 @@ import type { AdmanWrapper } from "../components/Ads/admanWrapper";
 import type { QualitySettingsAppliesTo } from "../utils/userSettings";
 import type { GridTypes, PlayPrevChapterDisabledTooltipKey } from "../constans";
 import type { AdditionalButton, AdditionalDesktopControlPanelButton } from "../components/Controls/types";
-import type { AdditionalContextMenuItem, ContextMenuItem } from "../components/Menus/subMenuTabs/types";
+import type { AdditionalContextMenuItem, AdditionalSettingsMenuItem, ContextMenuItem, SettingsMenuItem } from "../components/Menus/subMenuTabs/types";
 import type { SlotsApi } from "../utils/webAPI/slotsApi";
 import type { FocusManager } from "../utils/webAPI/focusManager";
 import type { ISDKConfig, IUIConfig } from "../config";
@@ -21,6 +21,7 @@ export interface SetQualityInfo {
 	byUser?: boolean;
 }
 export interface IAdsStateValues {
+	blocked: boolean;
 	position: number;
 	duration: number;
 	playbackState: AdsPlaybackState;
@@ -102,11 +103,22 @@ export interface IUIState {
 	interactiveHideMobileControls: Writable<boolean>;
 	additionalButtonsDeprecated$: Readable<AdditionalButtonDeprecated[]>;
 	additionalDesktopControlPanelRightButtons$: Readable<AdditionalDesktopControlPanelButton[]>;
+	additionalSettingsMenuItems$: Readable<SettingsMenuItem[]>;
 	additionalContextMenuItems$: Readable<ContextMenuItem[]>;
 	overlayContainer$: Writable<HTMLDivElement | undefined>;
 	startedByKeyboard$: Writable<boolean>;
 	autoplayNextEnabled$: Writable<boolean>;
 	timerNextVideoRunning$: Writable<boolean>;
+	settingsMenu: {
+		visible$: Writable<boolean>;
+		ref$: Writable<HTMLElement | undefined>;
+		openedByBtnKeyboard$: Writable<boolean>;
+	};
+	settingsSubMenu: {
+		visible$: Writable<boolean>;
+		ref$: Writable<HTMLElement | undefined>;
+		name$: Writable<string | undefined>;
+	};
 	/**
 	* Отключаем любое действие пользователя.
 	*/
@@ -179,6 +191,10 @@ export interface IStoreInternalActions {
 	pause: () => void;
 	togglePlay: () => void;
 	toggleMuted: () => void;
+	openSettingsMenu: (wasOpenedByKey?: boolean, tick?: () => Promise<void>) => void;
+	closeSettingsMenu: (fromSubMenu?: boolean) => void;
+	openSettingsSubMenu: (name: string, ref: HTMLElement) => void;
+	closeSettingsSubMenu: (ref: HTMLElement, isClosing?: boolean) => void;
 	setVolume: (volume: number) => void;
 	setMuted: (muted: boolean) => void;
 	startVolumeChanging: () => void;
@@ -241,6 +257,9 @@ export interface IStoreExternalActions {
 	setMuted: (muted: boolean) => void;
 	setVolume: (volume: number) => void;
 	returnFocusToEpisodes: () => void;
+	updateAdditionalSettingsItem: (itemId: string, fields: Partial<Omit<AdditionalSettingsMenuItem, "id" | "type">>) => void;
+	addAdditionalSettingsItem: (newItem: AdditionalSettingsMenuItem) => void;
+	removeAdditionalSettingsItem: (itemId: string) => void;
 	updateAdditionalContextItem: (itemId: string, fields: Partial<Omit<AdditionalContextMenuItem, "id">>) => void;
 	addAdditionalContextItem: (newItem: AdditionalContextMenuItem) => void;
 	removeAdditionalContextItem: (itemId: string) => void;
@@ -265,6 +284,7 @@ export interface IStoreEvents {
 	actionRewind$: ISubject<void>;
 	actionSeek$: IValueSubject<SeekAction | ThinOneStat.ActionSeekType>;
 	nextMovie$: ISubject<number>;
+	fatalError$: ISubject<ThinOneStat.IUIFatalError | undefined>;
 }
 export interface IStore {
 	initVideo: (config: IStoreInitVideoConfig) => void;
@@ -322,6 +342,7 @@ export interface IStoreParams {
 	disabledControls: ControlsKeys;
 	playPrevChapterDisabledTooltip: PlayPrevChapterDisabledTooltipKey;
 	additionalButtons: Array<AdditionalButtonDeprecated | AdditionalDesktopControlPanelButton>;
+	additionalSettingsMenuItems: AdditionalSettingsMenuItem[];
 	additionalContextMenuItems: AdditionalContextMenuItem[];
 	playPrevVideo: () => void;
 	playNextVideo: () => void;

package/types/store/utils.d.ts

@@ -21,10 +21,8 @@ export type DebugData = {
 	id?: number;
 	volume: number;
 	videoSize?: string;
-	videoBuffer?: number;
-	audioBuffer?: number;
-	nativeVideoBuffer?: number;
-	nativeAudioBuffer?: number;
+	buffer?: number;
+	nativeBuffer?: number;
 	position?: number;
 	speed?: number;
 	bitrate?: number;

package/types/types/index.d.ts

@@ -338,7 +338,7 @@ export interface IVKVideoPlayerConfig {
 /**
 * Поля, которые можно обновить, сохранив итстанс плеера
 */
-export type IUpdatableVKVideoPlayerConfig = Pick<Omit<IVKVideoPlayerConfig, "callbacks" | "interactiveData">, "adsSlotId" | "adsParams" | "albumId" | "canDownload" | "canRewindLive" | "failoverHosts" | "fromTime" | "isAudioDisabled" | "mediascopePixels" | "loop" | "muted" | "repeat" | "preload" | "showAutoplayNext" | "showNextPrevButtons" | "statTrackCode" | "videoIndex" | "volumeMultiplier"> & {
+export type IUpdatableVKVideoPlayerConfig = Pick<Omit<IVKVideoPlayerConfig, "callbacks" | "interactiveData">, "adsSlotId" | "adsParams" | "adsPreviewParam" | "albumId" | "canDownload" | "canRewindLive" | "failoverHosts" | "fromTime" | "isAudioDisabled" | "mediascopePixels" | "loop" | "muted" | "repeat" | "preload" | "showAutoplayNext" | "showNextPrevButtons" | "statTrackCode" | "videoIndex" | "volumeMultiplier"> & {
 	videos?: IVideoData[];
 };
 export interface IControlInfo {

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

@@ -1,19 +0,0 @@
-import type { ITracer, AppTracer } from "@vkontakte/videoplayer-shared";
-import type { Interactives } from "@vkontakte/videoplayer-interactive";
-import type { IUIConfig } from "../../../config";
-import type { IVKVideoPlayerConfig } from "../../../types";
-import type { IUIStatistics } from "../../../services/statistics";
-import type { AdditionalSettingsMenuItem } from "../../../components/Menus/subMenuTabs/types";
-/**
-* Контекст store-модулей — конфигурация и сервисы, передаваемые извне.
-* Не включает legacyStore, subscription, player, logger (они структурно отдельные).
-*/
-export interface IStoreContext {
-	uiConfig: IUIConfig;
-	config: IVKVideoPlayerConfig;
-	tracer: ITracer;
-	interactiveController: Interactives | undefined;
-	getStatisticsService: () => IUIStatistics | undefined;
-	getAppTracer: () => AppTracer | undefined;
-	additionalSettingsMenuItems: AdditionalSettingsMenuItem[];
-}

package/types/store/modules/settingsStore/index.d.ts

@@ -1,3 +0,0 @@
-export { createSettingsStore, type SettingsStoreDeps, type SettingsStoreState, type SettingsStoreActions, type SettingsStoreExternalActions, type SettingsStore } from "./settingsStore.store";
-export { settingsModule } from "./settingsStore.module";
-export { SETTINGS_STORE_TOKEN } from "./settingsStore.token";

package/types/store/modules/settingsStore/settingsStore.module.d.ts

@@ -1,3 +0,0 @@
-import type { Module } from "../utils";
-import { type SettingsStore } from "./settingsStore.store";
-export declare const settingsModule: Module<SettingsStore>;

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

@@ -1,44 +0,0 @@
-import type { Readable, Writable } from "svelte/store";
-import type { ITracer, IComponentLogger } from "@vkontakte/videoplayer-shared";
-import type { IVKVideoPlayerCallbacks } from "../../../types";
-import type { AdditionalSettingsMenuItem, SettingsMenuItem } from "../../../components/Menus/subMenuTabs/types";
-export interface SettingsStoreDeps {
-	/** Трассировщик */
-	tracer: ITracer;
-	/** Логгер */
-	log: IComponentLogger;
-	/** Коллбэки плеера */
-	callbacks?: IVKVideoPlayerCallbacks;
-	/** Функция получения video-элемента */
-	getVideoElement: () => HTMLVideoElement | null;
-	/** Включены ли дополнительные пункты меню настроек */
-	additionalSettingsMenuItemsEnabled: boolean;
-	/** Начальные дополнительные пункты меню настроек */
-	initialAdditionalSettingsMenuItems: AdditionalSettingsMenuItem[];
-}
-export interface SettingsStoreState {
-	visible$: Writable<boolean>;
-	ref$: Writable<HTMLElement | undefined>;
-	openedByBtnKeyboard$: Writable<boolean>;
-	subMenuVisible$: Writable<boolean>;
-	subMenuRef$: Writable<HTMLElement | undefined>;
-	subMenuName$: Writable<string | undefined>;
-	additionalSettingsMenuItems$: Readable<SettingsMenuItem[]>;
-}
-export interface SettingsStoreActions {
-	openSettingsMenu: (wasOpenedByKeyboard?: boolean, tick?: () => Promise<void>) => void;
-	closeSettingsMenu: () => void;
-	openSettingsSubMenu: (name: string, ref: HTMLElement) => void;
-	closeSettingsSubMenu: (ref: HTMLElement, isClosing?: boolean) => void;
-}
-export interface SettingsStoreExternalActions {
-	updateAdditionalSettingsItem: (id: string, fields: Partial<Omit<AdditionalSettingsMenuItem, "id" | "type">>) => void;
-	addAdditionalSettingsItem: (newItem: AdditionalSettingsMenuItem) => void;
-	removeAdditionalSettingsItem: (id: string) => void;
-}
-export interface SettingsStore {
-	state: SettingsStoreState;
-	actions: SettingsStoreActions;
-	externalActions: SettingsStoreExternalActions;
-}
-export declare const createSettingsStore: (deps: SettingsStoreDeps) => SettingsStore;

package/types/store/modules/settingsStore/settingsStore.token.d.ts

@@ -1,3 +0,0 @@
-import { InjectionToken } from "@vkontakte/videoplayer-shared";
-import type { SettingsStore } from "./settingsStore.store";
-export declare const SETTINGS_STORE_TOKEN: InjectionToken<SettingsStore>;

package/types/utils/timers.d.ts

@@ -1,2 +0,0 @@
-import type { ITimers } from "@vkontakte/videoplayer-shared";
-export declare const timers: ITimers;