@vkontakte/videoplayer 1.1.96 → 1.1.97-dev.0bf203cc7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer",
-  "version": "1.1.96",
+  "version": "1.1.97-dev.0bf203cc7.0",
   "author": "vk.com",
   "description": "Videoplayer based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -43,9 +43,9 @@
   ],
   "dependencies": {
     "@adtech/rbadman": "2.2.57",
-    "@vkontakte/videoplayer-core": "2.0.165",
-    "@vkontakte/videoplayer-interactive": "1.0.71",
-    "@vkontakte/videoplayer-shared": "1.0.94",
-    "@vkontakte/videoplayer-statistics": "1.0.111"
+    "@vkontakte/videoplayer-core": "2.0.166-dev.0bf203cc7.0",
+    "@vkontakte/videoplayer-interactive": "1.0.72-dev.0bf203cc7.0",
+    "@vkontakte/videoplayer-shared": "1.0.95-dev.0bf203cc7.0",
+    "@vkontakte/videoplayer-statistics": "1.0.112-dev.0bf203cc7.0"
   }
 }

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

@@ -215,4 +215,5 @@ export declare class VKVideoPlayer extends HTMLElement {
 	setAutoplayNext(autoplayNext: boolean): void;
 	getTotalViewTime(): Seconds | undefined;
 	private unmountComponent;
+	private createTracer;
 }

package/types/store/composition.d.ts

@@ -3,7 +3,7 @@ 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 } from "./modules";
-import type { AppTracer } from "@vkontakte/videoplayer-shared";
+import type { AppTracer, ITracer } from "@vkontakte/videoplayer-shared";
 import type { Interactives } from "@vkontakte/videoplayer-interactive";
 export interface ICompositionParams {
 	legacyStore: IStore;
@@ -12,6 +12,7 @@ export interface ICompositionParams {
 	interactiveController: Interactives | undefined;
 	getStatisticsService: () => IUIStatistics | undefined;
 	getAppTracer: () => AppTracer | undefined;
+	tracer: ITracer;
 }
 export interface ICompositionResult {
 	stores: {

package/types/store/index.d.ts

@@ -4,4 +4,4 @@ export type { IStore, IAdsState, IUIState, EnrichedStore } from "./types";
 * Store приложения.
 * Если будет слишком большим - можно разделить его на модули
 */
-export declare const createStore: ({ interfaceLanguage, isCyrillicRelatedInterface, 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 }: 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/playbackRateStore/index.d.ts

@@ -1,6 +1,6 @@
 /**
 * Playback Rate Store Module
 */
-export { createPlaybackRateStore, type PlaybackRateStoreDeps, type PlaybackRateStoreState, type PlaybackRateStoreActions, type PlaybackRateStore } from "./playbackRateStore.store";
+export { createPlaybackRateStore, type PlaybackRateStoreDeps, type PlaybackRateStoreState, type PlaybackRateStoreActions, type PlaybackRateStoreExternalActions, type PlaybackRateStore } from "./playbackRateStore.store";
 export { playbackRateModule } from "./playbackRateStore.module";
 export { PLAYBACK_RATE_STORE_TOKEN } from "./playbackRateStore.token";

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

@@ -51,9 +51,13 @@ export interface PlaybackRateStoreActions {
 	decrementPlaybackRate: () => VideoPlaybackRate;
 	changeDoubleForwardOn: (enabled: boolean) => void;
 }
+export interface PlaybackRateStoreExternalActions {
+	setPlaybackRate: (playbackRate: PlaybackRate) => void;
+}
 export interface PlaybackRateStore {
 	state: PlaybackRateStoreState;
 	actions: PlaybackRateStoreActions;
+	externalActions: PlaybackRateStoreExternalActions;
 }
 /**
 * Создаёт playback rate store

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

@@ -77,9 +77,9 @@ export interface SubtitlesStoreState {
 */
 export interface SubtitlesStoreInternalActions {
 	/** Установить субтитры */
-	setSubtitle: (subtitle: VideoSubtitle | undefined, external: boolean) => void;
+	setSubtitle: (subtitle: VideoSubtitle | undefined) => void;
 	/** Переключить субтитры */
-	toggleSubtitle: (external: boolean) => void;
+	toggleSubtitle: () => void;
 	/** Включить субтитры */
 	subtitleOn: (external: boolean, id?: string) => void;
 	/** Выключить субтитры */

package/types/store/types.d.ts

@@ -1,11 +1,10 @@
-import type { ChromecastState, IAudioStream, IConfig as ICoreInitVideoConfig, IExternalTextTrack, IOptionalTuningConfig, IPlayer, ISources, ITextTrack, IVideoStream, PlaybackRate, PlaybackState, VideoFormat } from "@vkontakte/videoplayer-core";
+import type { ChromecastState, IAudioStream, IConfig as ICoreInitVideoConfig, IExternalTextTrack, IOptionalTuningConfig, IPlayer, ISources, IVideoStream, PlaybackState, VideoFormat } from "@vkontakte/videoplayer-core";
 import type { InteractiveRange } from "@vkontakte/videoplayer-interactive";
-import type { AppTracer, IError, ILogger, InterfaceLanguage, InternalsExposure, IRectangle, ISubject, IValueObservable, IValueSubject, QualityLimits, VideoQuality } from "@vkontakte/videoplayer-shared";
+import type { AppTracer, IError, ILogger, InternalsExposure, IRectangle, IRootTracer, ISubject, ITracer, IValueObservable, IValueSubject, QualityLimits, VideoQuality } from "@vkontakte/videoplayer-shared";
 import type { SeekAction, ThinOneStat } from "@vkontakte/videoplayer-statistics";
 import type { Readable, Writable } from "svelte/store";
-import type { AdditionalButtonDeprecated, AdsPlaybackState, ControlBlocksRefs, ControlsKeys, HotKeyMapData, IAnnotationsApi, IControlInfo, IDisabledControls, IInteractiveData, IPictureInPictureApi, IPlayerControlsRef, IPlayerPhase, ITimelinePreviewThumbsData, IVideoEpisode, IVKVideoPlayerCallbacks, IVKVideoPlayerUICallbacks, Position, Size, VideoPlaybackRate, VideoPlayerView, VideoQualityForRender, VideoQualityUI, VideoSubtitle, VideoSubtitleParsed } from "../types";
+import type { AdditionalButtonDeprecated, AdsPlaybackState, ControlBlocksRefs, ControlsKeys, HotKeyMapData, IAnnotationsApi, IControlInfo, IDisabledControls, IInteractiveData, IPictureInPictureApi, IPlayerControlsRef, IPlayerPhase, ITimelinePreviewThumbsData, IVideoEpisode, IVKVideoPlayerCallbacks, IVKVideoPlayerUICallbacks, Position, Size, VideoPlayerView, VideoQualityUI } from "../types";
 import type { AdmanWrapper } from "../components/Ads/admanWrapper";
-import type { Key } from "../translation/types";
 import type { QualitySettingsAppliesTo } from "../utils/userSettings";
 import type { GridTypes, PlayPrevChapterDisabledTooltipKey } from "../constans";
 import type { AdditionalButton, AdditionalDesktopControlPanelButton } from "../components/Controls/types";
@@ -31,7 +30,6 @@ export interface IAdsStateValues {
 }
 export type IAdsState = { [K in keyof IAdsStateValues]: Writable<IAdsStateValues[K]> };
 export interface IUIState {
-	t: (key: Key, params?: Record<string, string>) => string;
 	isMinimalView$: Writable<boolean>;
 	controlsVisible: Writable<boolean>;
 	/**
@@ -130,14 +128,6 @@ export interface IUIState {
 	* Положение заголовка названия видео.
 	*/
 	videoTitleInfo: Writable<IControlInfo | undefined>;
-	/**
-	* Ускорение видео х2.
-	*/
-	doubleForwardOn$: Writable<boolean>;
-	/**
-	* Определяет, что двойное ускорение видео доступно.
-	*/
-	doubleForwardAvailable$: Readable<boolean>;
 	previewTrackActive: Writable<boolean>;
 	previewTrackDragInProgress: Writable<boolean>;
 	previewTrackAvailable: Readable<boolean>;
@@ -159,7 +149,6 @@ export interface IPlayerState {
 	isLoaderVisible: Readable<boolean>;
 	bufferedProgress$: Readable<number>;
 	isLive$: Readable<boolean | undefined>;
-	canChangePlaybackSpeed$: Readable<boolean | undefined>;
 	isActiveLive$: Readable<boolean | undefined>;
 	isOldestAvailableLive$: Readable<boolean | undefined>;
 	isRewindableLive$: Readable<boolean>;
@@ -175,15 +164,8 @@ export interface IPlayerState {
 	currentQuality$: Readable<VideoQuality | undefined>;
 	autoQualityLimitingAvailable$: Readable<boolean>;
 	isAutoQualityEnabled$: Readable<boolean | undefined>;
-	availableQualities$: Readable<VideoQualityForRender[]>;
 	currentPlaybackRate$: Readable<number>;
-	availablePlaybackRates$: Readable<VideoPlaybackRate[]>;
-	currentSubtitle$: Readable<Omit<VideoSubtitle, "selected">>;
-	availableTextTracks$: Readable<ITextTrack[]>;
-	availableSubtitlesList$: Readable<VideoSubtitle[]>;
-	currentSubtitleCaptions$: Readable<VideoSubtitleParsed["texts"]>;
 	previewThumbsData$: Writable<ITimelinePreviewThumbsData | undefined>;
-	isAutoSubtitleCaptionVisible$: Writable<boolean>;
 	chromecastState$: Readable<ChromecastState>;
 	chromecastDeviceName$: Readable<string | undefined>;
 	chromecastConnected$: Readable<boolean>;
@@ -211,10 +193,6 @@ export interface IPlayerState {
 	playPrevChapterDisabledTooltip: PlayPrevChapterDisabledTooltipKey;
 	looped$: Writable<boolean>;
 	loadedMetadata$: Writable<boolean>;
-	/**
-	* Определяет, можно ли в целом увидеть/выбрать Авто режим выбора качества.
-	*/
-	isAutoQualityAvailable$: Readable<boolean>;
 }
 export interface IStoreInternalActions {
 	preload: () => void;
@@ -236,11 +214,6 @@ export interface IStoreInternalActions {
 	setAudioStream: (stream: IAudioStream) => void;
 	setVideoStream: (stream: IVideoStream) => void;
 	setQuality: (quality: VideoQualityUI, info?: SetQualityInfo) => void;
-	setPlaybackRate: (playbackRate: PlaybackRate) => void;
-	incrementPlaybackRate: () => VideoPlaybackRate;
-	decrementPlaybackRate: () => VideoPlaybackRate;
-	setSubtitle: (subtitle?: VideoSubtitle) => void;
-	toggleSubtitle: () => void;
 	togglePictureInPicture: () => void;
 	startScrubbing: (progress: number) => void;
 	progressScrubbing: (progress: number) => void;
@@ -273,7 +246,6 @@ export interface IStoreInternalActions {
 	holdCamera(): void;
 	releaseCamera(): void;
 	downloadVideo: () => void;
-	setLanguage: (language: InterfaceLanguage | string) => Promise<void>;
 	nextMovie: (movieId: number) => void;
 	correctSeekTimeToInteractive: (time: number) => number;
 	replayInteractive?: () => void;
@@ -289,7 +261,6 @@ export interface IStoreInternalActions {
 	nextVideoAnnouncementAuto: () => void;
 	nextVideoAnnouncementCancel: () => void;
 	checkFullscreenSupport: () => boolean;
-	changeDoubleForwardOn: (enabled: boolean) => void;
 	closePreviewTrack: () => void;
 	previewTrackOpened: () => void;
 	previewTrackDragStarted: () => void;
@@ -303,11 +274,8 @@ export interface IStoreExternalActions {
 	stop: () => void;
 	seekTime: (time: number) => void;
 	seekEpisodeStartTime: (time: number) => void;
-	setPlaybackRate: (playbackRate: PlaybackRate) => void;
 	setAutoQualityLimits: (limits: QualityLimits) => void;
 	setMuted: (muted: boolean) => void;
-	toggleSubtitle: () => void;
-	changeSubtitle: (enabled: boolean, id?: string) => void;
 	setVolume: (volume: number) => void;
 	returnFocusToEpisodes: () => void;
 	updateAdditionalSettingsItem: (itemId: string, fields: Partial<Omit<AdditionalSettingsMenuItem, "id" | "type">>) => void;
@@ -347,9 +315,6 @@ export interface IStore {
 	initVideo: (config: IStoreInitVideoConfig) => void;
 	videoId$: Writable<number | undefined>;
 	playerPhase: IPlayerPhase;
-	interfaceLanguage$: Readable<InterfaceLanguage | string>;
-	interfaceLanguageUpdated$: ISubject<void>;
-	isCyrillicRelatedInterface$: Readable<boolean>;
 	interactiveData?: IInteractiveData;
 	vsid$: Writable<string | undefined>;
 	events: IStoreEvents;
@@ -376,10 +341,9 @@ export interface IStore {
 export type EnrichedStore = IStore & {
 	stores: ICompositionResult["stores"];
 	destroyComposedStore: () => void;
+	t: ICompositionResult["stores"]["languageStore"]["actions"]["t"];
 };
 export interface IStoreParams {
-	interfaceLanguage: InterfaceLanguage | string;
-	isCyrillicRelatedInterface: boolean;
 	initialVideoId?: number;
 	isTouch: boolean;
 	isLiveCatchUpMode?: boolean;
@@ -422,4 +386,6 @@ export interface IStoreParams {
 	getAdmanWrapper: () => AdmanWrapper | undefined;
 	logger: ILogger;
 	adsEnabled: boolean;
+	tracer: ITracer;
+	rootTracer: IRootTracer;
 }

package/types/utils/hooks/useIosSafariFullscreenSubtitles.d.ts

@@ -1,6 +1,6 @@
-import type { IStore } from "../../store";
+import type { EnrichedStore } from "../../store/types";
 interface Params {
-	store: IStore;
+	store: EnrichedStore;
 	getFullscreenTarget: () => HTMLElement;
 }
 export declare const useIosSafariFullscreenSubtitles: ({ store, getFullscreenTarget }: Params) => void;

package/types/utils/parseExperiment.d.ts

@@ -0,0 +1,8 @@
+/**
+* @docs https://confluence.vk.team/pages/viewpage.action?pageId=1405044928
+*
+* в поле `meta` ключи экспериментов придут в 2-х возможных форматах
+* 1. `feature.<feature_name>.experiment`
+* 2. `feature.<feature_name>.experiment.<config_name>`
+*/
+export declare const parseExperiment: (experiment: string, index: number) => Record<string, string | true>;