@vkontakte/videoplayer 1.1.88 → 1.1.89-dev.fdf6110f.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer",
-  "version": "1.1.88",
+  "version": "1.1.89-dev.fdf6110f.0",
   "author": "vk.com",
   "description": "Videoplayer based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -25,16 +25,6 @@
       "import": "./esnext.esm.js",
       "require": "./esnext.cjs"
     },
-    "./es2024": {
-      "types": "./types/index.d.ts",
-      "import": "./es2024.esm.js",
-      "require": "./es2024.cjs"
-    },
-    "./es2018": {
-      "types": "./types/index.d.ts",
-      "import": "./es2018.esm.js",
-      "require": "./es2018.cjs"
-    },
     "./es2015": {
       "types": "./types/index.d.ts",
       "import": "./es2015.esm.js",
@@ -43,8 +33,6 @@
     "./evergreen.esm.js": "./evergeen.esm.js",
     "./esnext.esm.js": "./esnext.esm.js",
     "./esnext.cjs": "./esnext.cjs",
-    "./es2018.esm.js": "./es2018.esm.js",
-    "./es2018.cjs": "./es2018.cjs",
     "./es2015.esm.js": "./es2015.esm.js",
     "./es2015.cjs": "./es2015.cjs"
   },
@@ -55,9 +43,9 @@
   ],
   "dependencies": {
     "@adtech/rbadman": "2.2.57",
-    "@vkontakte/videoplayer-core": "2.0.157",
-    "@vkontakte/videoplayer-interactive": "1.0.63",
-    "@vkontakte/videoplayer-shared": "1.0.86",
-    "@vkontakte/videoplayer-statistics": "1.0.103"
+    "@vkontakte/videoplayer-core": "2.0.158-dev.fdf6110f.0",
+    "@vkontakte/videoplayer-interactive": "1.0.64-dev.fdf6110f.0",
+    "@vkontakte/videoplayer-shared": "1.0.87-dev.fdf6110f.0",
+    "@vkontakte/videoplayer-statistics": "1.0.104-dev.fdf6110f.0"
   }
 }

package/types/VKVideoPlayer/defaultConfig.d.ts

@@ -0,0 +1,5 @@
+import type { IVKVideoPlayerConfig } from "../types";
+type IDefaultVideoConfig = Required<Pick<IVKVideoPlayerConfig, "preload" | "autoplay" | "repeat" | "loop" | "fromTime" | "canRewindLive" | "showAds" | "interfaceLanguage" | "isCyrillicRelatedInterface" | "logoClickable" | "logoHidden" | "isTouch" | "isMediaSessionEnabled" | "isPictureInPictureEnabled" | "isAudioDisabled" | "callbacks" | "saveRate" | "volumeMultiplier" | "showEndScreen" | "showAutoplayNext" | "showNextPrevButtons">>;
+export declare const defaultVideoConfig: IDefaultVideoConfig;
+export type EnsuredVideoConfig = IVKVideoPlayerConfig & IDefaultVideoConfig;
+export {};

package/types/VKVideoPlayer/index.svelte.d.ts

@@ -1,10 +1,10 @@
 import type { ISDKConfig } from "../config";
 import type { LanguageConfig } from "../translation/types";
-import type { IVideoData, IVKVideoPlayerConfig } from "../types";
+import type { IUpdatableVKVideoPlayerConfig, IVideoData, IVKVideoPlayerConfig } from "../types";
 import { type QualityLimits, type Seconds } from "@vkontakte/videoplayer-shared";
-import { InterfaceLanguage } from "@vkontakte/videoplayer-shared";
-import { type PlaybackRate } from "@vkontakte/videoplayer-core";
-import type { IStatContext } from "@vkontakte/videoplayer-statistics";
+import type { InterfaceLanguage } from "@vkontakte/videoplayer-shared";
+import type { PlaybackRate } from "@vkontakte/videoplayer-core";
+import { type IStatContext } from "@vkontakte/videoplayer-statistics";
 import { ThinOneStat } from "@vkontakte/videoplayer-statistics";
 import { AnnotationsApi } from "../utils/webAPI/annotationsApi/annotationsApi";
 import type { AdditionalContextMenuItem, AdditionalSettingsMenuItem } from "../components/Menus/subMenuTabs/types";
@@ -22,6 +22,8 @@ export declare class VKVideoPlayer extends HTMLElement {
 	private store?;
 	private microStoresRoot?;
 	private statistics?;
+	private appTracer?;
+	private admanWrapper?;
 	private _shadowRoot;
 	private playerContainer;
 	private rootContainer;
@@ -50,6 +52,7 @@ export declare class VKVideoPlayer extends HTMLElement {
 	private focusManager;
 	private prevIsid;
 	private isInited;
+	private videoStarted;
 	private postponedInitParams;
 	private internalsExposure;
 	private shadowDOMCallbacksDisabled;
@@ -64,19 +67,49 @@ export declare class VKVideoPlayer extends HTMLElement {
 	private isPrevButtonActive;
 	private isControlDisabled;
 	private getNextVideoInfo;
-	private createOneStat;
+	private readonly createOneStat;
 	private createThinOneStat;
+	private createStatisticsForVideo;
+	private createAppTracerForVideo;
+	private createAdsParamsForVideo;
 	private createPlayer;
+	private readonly handleDomReady;
+	private readonly firstStart;
+	private initVideo;
+	private initQualitySettings;
+	private get shouldLoop();
+	private get isMobile();
 	private get useMinimalViewForDpip();
+	private get shouldKeepPlayerElement();
 	private addPlayerInfoSubscriptions;
 	playNextVideo(): void;
 	playPrevVideo(): void;
+	/**
+	* !!! Сейчас нее будет полноценно работать,
+	* потому что часть полей которые реально относятся к видео передаются в videoConfig
+	* А videoConfig формируется в слое интеграции.
+	* В частности: adsParams, canDownload, failoverHosts, volumeMultiplier...
+	* @private
+	*/
+	private updatePlayerWithCurrentVideo;
 	private createPlayerWithCurrentVideo;
 	private playPrevChapter;
 	private seekToInteractive;
 	private initInteractives;
+	private checkVideosList;
+	/**
+	* Lagacy comment:
+	* А это из-за проблем архитектуры
+	* videoConfig - настройки экземпляра плеера для конкретного видео, sdkConfig.ui – настройки поведения плеера для всех
+	* Фичи включаются как суперпозиция этих двух конфигов.
+	* Из-за того что Root и Store – два источника правды синхронизировать конфиги придётся здесь переопределением дописывая поля из sdkConfig в videoConfig
+	* TODO: структурировать поток данных в рамках VP-958: Конфиги -> стор -> Root
+	*/
+	private overrideVideoConfigFromUIConfig;
 	initPlayer(videoConfig: IVKVideoPlayerConfig, sdkConfig?: Partial<ISDKConfig>): void;
+	updatePlayer(videoConfig: IUpdatableVKVideoPlayerConfig): void;
 	private isOneVideoPlaylist;
+	private updateRootPropsAfterPlaylistChanged;
 	private updateVideos;
 	/**
 	* Обновление плейлиста. Будут перезаписаны все видео до текущего
@@ -102,6 +135,7 @@ export declare class VKVideoPlayer extends HTMLElement {
 	setVolume(volume: number): void;
 	setRepeat(repeat: boolean): void;
 	seekTime(time: number): void;
+	private readonly seekTimeInternal;
 	seekEpisodeStartTime(time: number): void;
 	returnFocusToEpisodes(): void;
 	setPlaybackRate(playbackRate: PlaybackRate): void;
@@ -125,6 +159,7 @@ export declare class VKVideoPlayer extends HTMLElement {
 	changeAudioStream(id: string): void;
 	addLanguage(config: LanguageConfig): void;
 	setLanguage(language: InterfaceLanguage | string): Promise<void>;
+	private replaceVideoDataInConfig;
 	setLiveStart(videoData: IVideoData): void;
 	setLiveWaitingStart(): void;
 	/**

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

@@ -1,9 +1,9 @@
 import type { AdsTimeRemained } from "../../types";
-import { AdsSection } from "../../types";
+import { AdsSection, type AdmanInitParams } from "../../types";
 import { type ILogger } from "@vkontakte/videoplayer-shared";
 import { Subject } from "@vkontakte/videoplayer-shared";
 import type { IAdsState } from "../../store";
-import type { AdmanInitParams, ExternalActions, IConfig, IPlayerState } from "./types";
+import type { ExternalActions, IConfig, IPlayerState } from "./types";
 export declare class AdmanWrapper {
 	private adman;
 	private initialVolume;
@@ -16,6 +16,7 @@ export declare class AdmanWrapper {
 	private ordIds;
 	private isDestroyed;
 	private readonly log;
+	private loadPromise?;
 	private loadTimeout;
 	private initTimeout;
 	private runtimeTimeout;
@@ -48,7 +49,7 @@ export declare class AdmanWrapper {
 	constructor(logger: ILogger, config: IConfig);
 	init(actions: ExternalActions, adsState: IAdsState, playerState: IPlayerState): void;
 	loadAdman: (abortSignal: AbortSignal) => Promise<void>;
-	loadAdmanMailRu: (abortSignal: AbortSignal) => Promise<void>;
+	private loadAdmanMailRu;
 	private loadAdmanNPM;
 	onAdmanLoadingError(): void;
 	initAdman(initParams: AdmanInitParams): Promise<void>;

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

@@ -5,26 +5,6 @@ export type ExternalActions = {
 	switchFromVideoToAds: () => void;
 	setMuted: (muted: boolean) => void;
 };
-export type AdsParams = Record<string, unknown>;
-export interface IAdmanInitParamsExternalApi {
-	videoGetAds?: (p: AdsParams) => Promise<Record<string, unknown> | null>;
-	videoTrackAdEvent?: (sectionKey: string, bannerId: string) => Promise<void>;
-}
-export type AdmanInitParams = {
-	width: number;
-	height: number;
-	isFullscreen: boolean;
-	isAutoplay: boolean;
-	slotId: number;
-	params?: AdsParams;
-	duration: number;
-	previewParam?: number;
-	adsContainer: HTMLElement;
-	adsVideoElement: HTMLVideoElement;
-	paramsOverride?: AdsParams;
-	externalApi?: IAdmanInitParamsExternalApi;
-	json?: Record<string, unknown>;
-};
 export type IPlayerState = {
 	vsid: Readable<string | undefined>;
 };

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

@@ -0,0 +1,6 @@
+import type { ILogger } from "@vkontakte/videoplayer-shared";
+import type { IAdsConfig } from "../../config";
+import { AdmanWrapper } from "./admanWrapper";
+type AdmanWrapperFactory = (logger: ILogger, adsConfig: IAdsConfig) => AdmanWrapper;
+export declare const createAdmanWrapper: AdmanWrapperFactory;
+export {};

package/types/components/Root/types.d.ts

@@ -1,39 +1,20 @@
-import type { IExternalTextTrack, ISources, PlaybackRate } from "@vkontakte/videoplayer-core";
 import type { IStore } from "../../store";
-import type { IMicroStoresRoot, IVideoLive, IVKVideoPlayerConfig } from "../../types";
+import type { AdmanInitParams, IMicroStoresRoot, IVideoData, IVKVideoPlayerConfig } from "../../types";
 import type { IUIConfig } from "../../config";
 import type { Interactives } from "@vkontakte/videoplayer-interactive";
 import type KeyboardControls from "../KeyboardControls.svelte";
-import type { QualityLimits } from "@vkontakte/videoplayer-shared";
-import type { AdmanInitParams } from "../Ads/types";
+import type { AdmanWrapper } from "../Ads/admanWrapper";
 export interface RootProps {
-	sources: ISources | undefined;
+	videoData: IVideoData;
 	store: IStore;
+	admanWrapper: AdmanWrapper;
 	microStoresRoot: IMicroStoresRoot;
 	videoConfig: IVKVideoPlayerConfig;
 	uiConfig: IUIConfig;
-	title: string;
-	thumbUrl: string | undefined;
 	interactiveContainer: HTMLElement | undefined;
 	interactiveController: Interactives | undefined;
-	subtitles: Omit<IExternalTextTrack, "type">[] | undefined;
-	subtitlesForcedLanguage?: string;
-	live: IVideoLive | undefined;
-	preload: boolean;
 	autoplay: boolean;
-	volume?: number | undefined;
-	muted?: boolean | undefined;
-	fromTime: number;
-	canRewindLive: boolean;
-	showAds: boolean;
-	adsSlotId?: number | undefined;
 	adsParams?: AdmanInitParams["params"];
-	adsAutoplayParam?: boolean;
-	adsExternalApi?: AdmanInitParams["externalApi"];
-	adsJson?: AdmanInitParams["json"];
-	duration?: number | undefined;
-	logoClickable: boolean;
-	logoHidden: boolean;
 	isMobile: boolean;
 	showNextPrevButtons?: boolean;
 	nextButtonActive?: boolean;
@@ -41,44 +22,25 @@ export interface RootProps {
 	endScreenVideoTitle?: string | undefined;
 	endScreenVideoThumb?: string | undefined;
 	isOneVideoPlaylist?: boolean;
-	supportLink: string;
 	shadowRootContainer: HTMLElement;
 	outerContainerRef: HTMLElement;
 	fullScreenTarget?: HTMLElement | undefined;
-	failoverHosts?: string[] | undefined;
-	showMiniTimer?: boolean;
-	saveRate: boolean;
 	seekToInteractive?: () => void;
 	playPrevChapter?: () => void;
-	volumeMultiplier: number;
-	showEndScreen?: boolean;
-	showAutoplayNext: boolean;
 	keyboardControls?: KeyboardControls | undefined;
 	needToRepeatPlaylist?: boolean;
 	getVideoDeeplink?: (timestamp: number) => string;
+	firstStart: (external?: boolean) => void;
+	seekTime: (Seconds: number) => void;
+	onDomReady: VoidFunction;
 }
 export interface RootExports {
-	play: () => void;
-	pause: () => void;
-	setMuted: (muted: boolean) => void;
-	toggleSubtitle: () => void;
-	changeSubtitle: (enabled: boolean, id?: string) => void;
-	changeAudioStream: (id: string) => void;
-	hideControls: () => void;
-	showControls: () => void;
-	setVolume: (volume: number) => void;
-	seekTime: (time: number) => void;
-	seekEpisodeStartTime: (time: number) => void;
-	returnFocusToEpisodes: () => void;
-	setPlaybackRate: (playbackRate: PlaybackRate) => void;
-	setAutoQualityLimits: (limits: QualityLimits) => void;
+	setPlayerStarted: (value: boolean) => void;
+	videoContainer?: HTMLElement;
 	keyboardControls?: {
 		focus: () => void;
 		handleExternalKeyboardEvent: (event: KeyboardEvent) => boolean;
 	};
-	setAutoQuality: () => void;
-	toggleTrafficSaving: (value: boolean) => void;
-	toggleHighQuality: (value: boolean) => void;
 }
 export interface PersistentLayerExports {
 	startVideoChangedAnimation: (prev: boolean) => void;

package/types/config.d.ts

@@ -25,8 +25,34 @@ export interface IDpipConfig {
 	minimalView?: boolean;
 	initialSize?: Size;
 }
+export interface IAdsConfig {
+	enable: ForceOrRelay;
+	loadTimeout: Milliseconds;
+	initTimeout: Milliseconds;
+	runtimeTimeout: Milliseconds;
+	slot?: number;
+	/** @deprecated, Вместо этого используйте paramsOverride: { preview } */
+	preview?: number;
+	paramsOverride?: Record<string, unknown>;
+	isMobileGoToSiteButton: boolean;
+	useAdmanFromNPM: boolean;
+	volumeMultiplier: number;
+	isVsidOriginal: boolean;
+	/**
+	* Включает режим переиспользования видеоэлемента рекламы между инстансами плеера
+	* (нужно для передачи разрешений браузера от одного плеера другому, например: стартовать со звуком)
+	* (Врядли имеет смысл без такого же включенного флага в настройках ядра)
+	*/
+	reuseOwnVideoElement: boolean;
+	/**
+	* Бывает, что  баннер без звука или не смог с ним стартануть
+	* Этот флаг регулирует нужно ли передавать сомтояние мьюта в основной плеер
+	*/
+	preserveMutedState: boolean;
+}
 export interface IUIConfig {
 	isMobile: ForceOrRelay;
+	keepPlayerElement: boolean;
 	disableInvisibleComponentsTimeout: Milliseconds;
 	debugLog: boolean | {
 		tag?: string;
@@ -42,31 +68,7 @@ export interface IUIConfig {
 	defaultLanguage: InterfaceLanguage;
 	downloadVKLanguages: boolean;
 	updateBuiltinLanguages: boolean;
-	ads: {
-		enable: ForceOrRelay;
-		loadTimeout: Milliseconds;
-		initTimeout: Milliseconds;
-		runtimeTimeout: Milliseconds;
-		slot?: number;
-		/** @deprecated, Вместо этого используйте paramsOverride: { preview } */
-		preview?: number;
-		paramsOverride?: Record<string, unknown>;
-		isMobileGoToSiteButton: boolean;
-		useAdmanFromNPM: boolean;
-		volumeMultiplier: number;
-		isVsidOriginal: boolean;
-		/**
-		* Включает режим переиспользования видеоэлемента рекламы между инстансами плеера
-		* (нужно для передачи разрешений браузера от одного плеера другому, например: стартовать со звуком)
-		* (Врядли имеет смысл без такого же включенного флага в настройках ядра)
-		*/
-		reuseOwnVideoElement: boolean;
-		/**
-		* Бывает, что  баннер без звука или не смог с ним стартануть
-		* Этот флаг регулирует нужно ли передавать сомтояние мьюта в основной плеер
-		*/
-		preserveMutedState: boolean;
-	};
+	ads: IAdsConfig;
 	/**
 	* Если нет ранее сохранённого значения громкости будет использовано это
 	*/
@@ -218,6 +220,8 @@ export interface IUIConfig {
 		* При наведение на зону таймлайна таймлайн приподнимается от границ окна плеера.
 		*/
 		usePreviewTimelineWithHovering: boolean;
+		/** добавляет перехват кликов (`event.stopPropagation()`) на уровне Root компонента плеера */
+		rootStopPropagation: boolean;
 	};
 	/**
 	* Отключает вызов колбэка uiInfo.onPlayerSizeChanged при ресайзе обычного pip

package/types/index.d.ts

@@ -1,15 +1,14 @@
 import { VKVideoPlayer } from "./VKVideoPlayer/index.svelte";
-import type { IVKVideoPlayerConfig, IControlInfo, ITimelinePreviewThumbsData, IUpcomingLiveViewControlInfo, IVKVideoPlayerCallbacks, IVideoData, HotKeyMapData, HotKeyMapItem, HotKeyMapGroup, IVideoLive, IInteractiveData, AdditionalButtonDeprecated, IVideoEpisode, VideoPlayerView } from "./types";
+import type { AdsParams, IAdmanInitParamsExternalApi, IVKVideoPlayerConfig, IUpdatableVKVideoPlayerConfig, IControlInfo, ITimelinePreviewThumbsData, IUpcomingLiveViewControlInfo, IVKVideoPlayerCallbacks, IVideoData, HotKeyMapData, HotKeyMapItem, HotKeyMapGroup, IVideoLive, IInteractiveData, AdditionalButtonDeprecated, IVideoEpisode, VideoPlayerView } from "./types";
 import type { LanguagePack, LanguageConfig } from "./translation/types";
-import type { LogoType as VKLogoType, ISDKConfig, IDpipConfig } from "./config";
-import type { AdsParams, IAdmanInitParamsExternalApi } from "./components/Ads/types";
+import type { LogoType as VKLogoType, IAdsConfig, ISDKConfig, IDpipConfig } from "./config";
 import type { ISources, IDashSource, URLSource, RawSource, URLSourceWithSeek } from "@vkontakte/videoplayer-core";
 import type { Milliseconds, QualityLimits } from "@vkontakte/videoplayer-shared";
 export { VERSION } from "./env";
 export declare const registerPlayerWebComponent: () => void;
 export { type AdditionalSettingsMenuItem, MenuItemType, type AdditionalClickSettingsMenuItem, type AdditionalSwitchSettingsMenuItem, type AdditionalContextMenuItem } from "./components/Menus/subMenuTabs/types";
 export { type AdditionalButton, ControlButtonType } from "./components/Controls/types";
-export type { VKVideoPlayer, IVKVideoPlayerConfig, IControlInfo, ITimelinePreviewThumbsData, IUpcomingLiveViewControlInfo, IVKVideoPlayerCallbacks, IVideoData, AdsParams, HotKeyMapData, HotKeyMapItem, HotKeyMapGroup, ISources, IDashSource, URLSource, RawSource, URLSourceWithSeek, LanguagePack, LanguageConfig, Milliseconds, IVideoLive, IInteractiveData, AdditionalButtonDeprecated, QualityLimits, IVideoEpisode, IDpipConfig, ISDKConfig, VideoPlayerView, IAdmanInitParamsExternalApi, VKLogoType };
+export type { VKVideoPlayer, IVKVideoPlayerConfig, IUpdatableVKVideoPlayerConfig, IControlInfo, ITimelinePreviewThumbsData, IUpcomingLiveViewControlInfo, IVKVideoPlayerCallbacks, IVideoData, AdsParams, HotKeyMapData, HotKeyMapItem, HotKeyMapGroup, ISources, IDashSource, URLSource, RawSource, URLSourceWithSeek, LanguagePack, LanguageConfig, Milliseconds, IVideoLive, IInteractiveData, AdditionalButtonDeprecated, QualityLimits, IAdsConfig, IVideoEpisode, IDpipConfig, ISDKConfig, VideoPlayerView, IAdmanInitParamsExternalApi, VKLogoType };
 export { GridTypes } from "./constans";
 export { PlayerPhase } from "./types";
 export { isPiPSupported, isDpipSupported } from "./utils/webAPI/pictureInPictureApi";