@vkontakte/videoplayer 1.1.95 → 1.1.96-beta.1

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

@@ -0,0 +1,130 @@
+/**
+* Subtitles Store Module
+*
+* Управляет состоянием субтитров: выбор, отображение, скачивание и парсинг.
+*/
+import type { Readable, Writable } from "svelte/store";
+import type { IPlayer, ITextTrack } from "@vkontakte/videoplayer-core";
+import type { ISubscription, ITracer } from "@vkontakte/videoplayer-shared";
+import type { AppTracer } from "@vkontakte/videoplayer-shared";
+import { Subject } from "@vkontakte/videoplayer-shared";
+import type { VideoSubtitle, VideoSubtitleParsed, AvailableVideoSubtitle } from "../../../types";
+import type { IUIConfig } from "../../../config";
+import type { TSignature } from "../../../translation/types";
+/**
+* Зависимости модуля subtitles
+*/
+export interface Deps {
+	/** Плеер */
+	player: IPlayer;
+	/** UI конфиг */
+	uiConfig: IUIConfig;
+	/** Подписки */
+	subscription: ISubscription;
+	/** Функция перевода */
+	t: TSignature;
+	/** Стор языка интерфейса */
+	interfaceLanguage$: Readable<string>;
+	/** Стор точной позиции */
+	positionExact$: Readable<number>;
+	/** Стор скорости воспроизведения */
+	currentPlaybackRate$: Readable<number>;
+	/** Стор playing состояния */
+	isPlaying$: Readable<boolean>;
+	/** Стор minimal view */
+	isMinimalView$: Readable<boolean>;
+	/** Стор video id */
+	videoId$: Writable<number | undefined>;
+	/** Видео элемент */
+	getVideoElement: () => HTMLVideoElement | null;
+	/** Колбэки */
+	callbacks: {
+		onSubtitleOn?: (lang: string, id: string) => void;
+		onSubtitleOff?: () => void;
+		onAvailableSubtitlesChanged?: (subtitles: AvailableVideoSubtitle[]) => void;
+	};
+	/** Функция для получения сервиса статистики */
+	getStatisticsService?: () => {
+		oneStat?: {
+			logError: (params: {
+				errorType: string;
+				fatal: boolean;
+			}) => void;
+		};
+	} | undefined;
+	/** Функция для получения AppTracer для error reporting */
+	getAppTracer?: () => AppTracer | undefined;
+	/** Tracer для логирования */
+	tracer: ITracer;
+}
+/**
+* Состояние модуля subtitles
+*/
+export interface SubtitlesStoreState {
+	/** Текущие выбранные субтитры */
+	currentSubtitle$: Readable<Omit<VideoSubtitle, "selected">>;
+	/** Доступные текстовые треки */
+	availableTextTracks$: Readable<ITextTrack[]>;
+	/** Список доступных субтитров для UI */
+	availableSubtitlesList$: Readable<VideoSubtitle[]>;
+	/** Текущие субтитры для отображения */
+	currentSubtitleCaptions$: Readable<VideoSubtitleParsed["texts"]>;
+	/** Видимость авто-субтитров */
+	isAutoSubtitleCaptionVisible$: Writable<boolean>;
+}
+/**
+* Экшены модуля subtitles для внутреннего использования
+*/
+export interface SubtitlesStoreInternalActions {
+	/** Установить субтитры */
+	setSubtitle: (subtitle: VideoSubtitle | undefined, external: boolean) => void;
+	/** Переключить субтитры */
+	toggleSubtitle: (external: boolean) => void;
+	/** Включить субтитры */
+	subtitleOn: (external: boolean, id?: string) => void;
+	/** Выключить субтитры */
+	subtitleOff: (external: boolean) => void;
+	/** Установить форсированный язык субтитров */
+	setForcedSubtitlesLanguage: (language: string) => void;
+	/** Обновить доступные субтитры */
+	updateAvailableSubtitles: () => void;
+}
+/**
+* Экшены модуля subtitles для внешнего использования
+*/
+export interface SubtitlesStoreExternalActions {
+	/** Установить субтитры */
+	setSubtitle: (subtitle: VideoSubtitle | undefined) => void;
+	/** Переключить субтитры */
+	toggleSubtitle: () => void;
+	/**
+	* Изменить субтитры
+	*/
+	changeSubtitle: (enabled: boolean, id?: string) => void;
+}
+/**
+* Результат создания subtitles store
+*/
+export interface SubtitlesStore {
+	/** Состояние */
+	state: SubtitlesStoreState;
+	/** Экшены для внутреннего использования */
+	actions: SubtitlesStoreInternalActions;
+	/** Экшены для внешнего использования */
+	externalActions: SubtitlesStoreExternalActions;
+	/** События для статистики */
+	events: {
+		actionSetSubtitle$: Subject<string>;
+		actionSubtitlesSwitched$: Subject<{
+			enabled: boolean;
+			lang: string;
+			auto: boolean;
+		}>;
+	};
+	/** Очистка ресурсов */
+	destroy(): void;
+}
+/**
+* Создаёт subtitles store
+*/
+export declare const createSubtitlesStore: (deps: Deps) => SubtitlesStore;

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

@@ -0,0 +1,6 @@
+/**
+* Subtitles Store Token
+*/
+import { InjectionToken } from "@vkontakte/videoplayer-shared";
+import type { SubtitlesStore } from "./subtitlesStore.store";
+export declare const SUBTITLES_STORE_TOKEN: InjectionToken<SubtitlesStore>;

package/types/store/types.d.ts

@@ -1,11 +1,11 @@
 import type { ChromecastState, IAudioStream, IConfig as ICoreInitVideoConfig, IExternalTextTrack, IOptionalTuningConfig, IPlayer, ISources, ITextTrack, IVideoStream, PlaybackRate, PlaybackState, VideoFormat } from "@vkontakte/videoplayer-core";
 import type { InteractiveRange } from "@vkontakte/videoplayer-interactive";
-import type { AppTracer, IError, ILogger, InterfaceLanguage, InternalsExposure, IRectangle, IValueObservable, QualityLimits, VideoQuality } from "@vkontakte/videoplayer-shared";
+import type { AppTracer, IError, ILogger, InterfaceLanguage, InternalsExposure, IRectangle, ISubject, 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, PlaybackStateRealistic, 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, VideoPlaybackRate, VideoPlayerView, VideoQualityForRender, VideoQualityUI, VideoSubtitle, VideoSubtitleParsed } from "../types";
 import type { AdmanWrapper } from "../components/Ads/admanWrapper";
-import type { Key, LanguageConfig } from "../translation/types";
+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";
@@ -62,6 +62,7 @@ export interface IUIState {
 		fullscreen: Writable<IControlInfo | undefined>;
 		chromecast: Writable<IControlInfo | undefined>;
 		pip: Writable<IControlInfo | undefined>;
+		qoe: Writable<IControlInfo | undefined>;
 		"theater-mode-button": Writable<IControlInfo | undefined>;
 		vkLogo: Writable<IControlInfo | undefined>;
 		interactiveTimeIndicator: Writable<IControlInfo | undefined>;
@@ -153,7 +154,7 @@ export interface IPlayerState {
 	positionWithScrubbing$: Readable<number>;
 	duration$: Readable<number>;
 	playbackState$: Readable<PlaybackState | undefined>;
-	playbackStateRealistic$: Readable<PlaybackStateRealistic | undefined>;
+	isBuffering$: Readable<boolean>;
 	isPlaying$: Readable<boolean>;
 	isLoaderVisible: Readable<boolean>;
 	bufferedProgress$: Readable<number>;
@@ -272,8 +273,7 @@ export interface IStoreInternalActions {
 	holdCamera(): void;
 	releaseCamera(): void;
 	downloadVideo: () => void;
-	addLanguage: (config: LanguageConfig) => void;
-	setLanguage: (language: InterfaceLanguage | string) => void;
+	setLanguage: (language: InterfaceLanguage | string) => Promise<void>;
 	nextMovie: (movieId: number) => void;
 	correctSeekTimeToInteractive: (time: number) => number;
 	replayInteractive?: () => void;
@@ -334,18 +334,25 @@ export interface IStoreInitVideoConfig extends ICoreInitVideoConfig {
 	canDownload?: boolean;
 	previewThumbsData?: ITimelinePreviewThumbsData;
 	subtitles?: Omit<IExternalTextTrack, "type">[];
-	subtitlesForcedLanguage?: string;
 	unitedVideoId?: number;
 	videoEpisodes?: IVideoEpisode[];
 }
+export interface IStoreEvents {
+	actionRewind$: ISubject<void>;
+	actionSeek$: IValueSubject<SeekAction | ThinOneStat.ActionSeekType>;
+	actionQuality$: ISubject<ThinOneStat.ActionQualityType>;
+	nextMovie$: ISubject<number>;
+}
 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$: Readable<string | undefined>;
+	vsid$: Writable<string | undefined>;
+	events: IStoreEvents;
 	state: IPlayerState;
 	ui: IUIState;
 	ads: IAdsState;
@@ -360,7 +367,6 @@ export interface IStore {
 	initOnFinishedCallback: VoidFunction;
 	resetAdsState: VoidFunction;
 	updateAdmanWrapperSubscriptions: VoidFunction;
-	updateStatisticsSubscriptions: VoidFunction;
 	updateAppTracerSubscriptions: VoidFunction;
 	updateTracerSubscriptions: VoidFunction;
 	getLogger: () => ILogger;

package/types/translation/types.d.ts

@@ -6,3 +6,4 @@ export type LanguageConfig = {
 	fallback: InterfaceLanguage;
 	pack: LanguagePack;
 };
+export type TSignature = (key: Key, params?: Record<string, string>) => string;

package/types/types/index.d.ts

@@ -381,6 +381,7 @@ export interface IPlayerControlsRef {
 	interactiveTimeIndicator?: HTMLElement;
 	timeline?: HTMLElement;
 	autoplayNextToggle?: HTMLButtonElement;
+	qoe?: HTMLElement;
 }
 export interface IPlayerDesktopControlsWidth {
 	prevButton: number;
@@ -628,7 +629,3 @@ export interface Caption {
 	value: string;
 }
 export type NotificationId = "slow_video";
-export declare enum PlaybackStateExtended {
-	BUFFERING = "buffering"
-}
-export type PlaybackStateRealistic = PlaybackState | PlaybackStateExtended;

package/types/utils/sanitizeSvg.d.ts

@@ -0,0 +1,5 @@
+/**
+* Базовая санитизация SVG для защиты от XSS.
+* Удаляет опасные паттерны: script-теги, event handlers, javascript: URLs.
+*/
+export declare function sanitizeSvg(svg: string | undefined): string;