@vkontakte/videoplayer 1.1.98 → 1.1.99-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer",
-  "version": "1.1.98",
+  "version": "1.1.99-beta.1",
   "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.167",
-    "@vkontakte/videoplayer-interactive": "1.0.73",
-    "@vkontakte/videoplayer-shared": "1.0.96",
-    "@vkontakte/videoplayer-statistics": "1.0.113"
+    "@vkontakte/videoplayer-core": "2.0.168-beta.1",
+    "@vkontakte/videoplayer-interactive": "1.0.74-beta.1",
+    "@vkontakte/videoplayer-shared": "1.0.97-beta.1",
+    "@vkontakte/videoplayer-statistics": "1.0.114-beta.1"
   }
 }

package/types/components/Menus/constants/settingsMenuItemIds.d.ts

@@ -3,7 +3,6 @@ export declare enum SettingsMenuItemIds {
 	AUDIO_TRACKS = "audio-language-settings",
 	PLAYBACK_RATE = "playback-rate-settings",
 	SUBTITLES = "subtitles-settings",
-	TRAFFIC_SAVING = "traffic-saving-settings",
 	DOWNLOAD = "download",
 	REPORT = "report",
 	COPY_DATA = "copy-data",

package/types/components/Menus/subMenuTabs/rootMenuItems.d.ts

@@ -1,19 +1,15 @@
 import { RootMenuId, type SettingsMenuItem } from "./types";
 import { type VideoPlaybackRate, type VideoSubtitle } from "../../../types";
 import type { IAudioStream, PlaybackRate, VideoQuality } from "@vkontakte/videoplayer-core";
-import type { QualitySettingsAppliesTo } from "../../../utils/userSettings";
 export type Context = {
 	currentPlaybackRate: number;
 	availablePlaybackRates: VideoPlaybackRate[];
 	selectPlaybackRate: (playbackRate: PlaybackRate) => void;
-	trafficSavingEnabled: boolean;
-	toggleTrafficSaving: (value: boolean, appliesTo: QualitySettingsAppliesTo) => void;
 	currentQuality: VideoQuality;
 	isAutoQualityEnabled: boolean;
 	isMobile: boolean;
 	currentAudioStream: IAudioStream | undefined;
 	availableAudioStreams: IAudioStream[];
-	qualityDetailsSubMenuEnabled: boolean;
 	currentSubtitle: Omit<VideoSubtitle, "selected">;
 	onDownloadClick: () => void;
 	onReportProblemClick: () => void;

package/types/components/Menus/subMenuTabs/types.d.ts

@@ -19,7 +19,6 @@ export declare enum SubMenuId {
 }
 export declare enum RootMenuId {
 	QUALITY_SETTINGS = "quality-settings",
-	TRAFFIC_SAVING_SWITCH = "traffic-saving-switch",
 	AUDIO_TRACKS = "audio-tracks-settings",
 	PLAYBACK_RATE = "playback-rate-settings",
 	SUBTITLES = "subtitles-settings",

package/types/config.d.ts

@@ -157,6 +157,7 @@ export interface IUIConfig {
 		*/
 		tracer: boolean;
 		tracerType: TracerType;
+		tracerPausedAtInit: boolean;
 		/** Размер буфера для событий трейсера. 0 — буфер не используется */
 		tracerEventsBufferSize: number;
 		apptracer: IAppTracerConfig;
@@ -192,7 +193,6 @@ export interface IUIConfig {
 		nextPrevButtons: boolean;
 		previewNoEmptySpace: boolean;
 		exposeInternalsToGlobal: boolean;
-		qualityDetailsSubMenuEnabled: boolean;
 		forceAutoQualityWhenSevereStallHappens: boolean;
 		showSlowVideoNotification: boolean;
 		maxCountShowSlowVideoNotification: number;

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

@@ -2,6 +2,8 @@
 * Quality Store Module
 *
 * Композиция модуля через Dependency Injection.
+* Создаёт qualityStore, разрешая зависимости из DI-контейнера,
+* и устанавливает функцию перевода из languageStore.
 */
 import { type QualityStore } from "./qualityStore.store";
 import type { Module } from "../utils";

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

@@ -1,20 +1,33 @@
 /**
 * Quality Store Module
 *
-* Управляет состоянием качества видео: доступные качества, авто-качество.
+* Управляет состоянием качества видео: доступные качества, авто-качество,
+* установка качества, режим экономии трафика, высокое качество.
 */
 import type { Readable } from "svelte/store";
 import type { IPlayer } from "@vkontakte/videoplayer-core";
-import type { Key } from "../../../translation/types";
-import type { VideoQualityForRender } from "../../../types";
+import { type IComponentLogger, type ITracer, type QualityLimits, type VideoQuality, Subject } from "@vkontakte/videoplayer-shared";
+import type { ThinOneStat } from "@vkontakte/videoplayer-statistics";
+import type { TSignature } from "../../../translation/types";
+import type { VideoQualityForRender, VideoQualityUI } from "../../../types";
+import { type QualitySettingsAppliesTo } from "../../../utils/userSettings";
+import type { SetQualityInfo } from "../../types";
 /**
 * Зависимости модуля quality
 */
 export interface QualityStoreDeps {
 	/** Плеер */
 	player: IPlayer;
+	/** Логгер */
+	log: IComponentLogger;
+	/** Трассировщик */
+	tracer: ITracer;
+	/** ID текущего видео */
+	videoId$: Readable<number | undefined>;
 	/** Функция перевода */
-	t: (key: Key, params?: Record<string, string>) => string;
+	t: TSignature;
+	/** Проверка возможности сохранения предпочтений */
+	canSavePreferredState: (external: boolean) => boolean;
 }
 /**
 * Состояние модуля quality
@@ -24,12 +37,45 @@ export interface QualityStoreState {
 	availableQualities$: Readable<VideoQualityForRender[]>;
 	/** Признак доступности авто-качества */
 	isAutoQualityAvailable$: Readable<boolean>;
+	/** Текущее качество видео */
+	currentQuality$: Readable<VideoQuality | undefined>;
+	/** Признак включённого авто-качества */
+	isAutoQualityEnabled$: Readable<boolean | undefined>;
+	/** Признак включённого режима экономии трафика */
+	trafficSavingEnabled$: Readable<boolean>;
+	/** Признак включённого режима высокого качества */
+	highQualityEnabled$: Readable<boolean>;
+	/** Признак доступности авто-лимитирования качества */
+	autoQualityLimitingAvailable$: Readable<boolean>;
+}
+/**
+* Внутренние экшены качества
+*/
+export interface QualityStoreActions {
+	setQuality: (quality: VideoQualityUI, info?: SetQualityInfo) => void;
+	setTrafficSavingEnabled: (enabled: boolean, appliesTo?: QualitySettingsAppliesTo) => void;
+	setHighQualityEnabled: (enabled: boolean, appliesTo?: QualitySettingsAppliesTo) => void;
+}
+/**
+* Внешние экшены качества
+*/
+export interface QualityStoreExternalActions {
+	setQuality: (quality: VideoQualityUI) => void;
+	setTrafficSavingEnabled: (enabled: boolean) => void;
+	setHighQualityEnabled: (enabled: boolean) => void;
+	setAutoQualityLimits: (limits: QualityLimits) => void;
 }
 /**
 * Результат создания quality store
 */
+export interface QualityStoreEvents {
+	actionQuality$: Subject<ThinOneStat.ActionQualityType>;
+}
 export interface QualityStore {
 	state: QualityStoreState;
+	actions: QualityStoreActions;
+	externalActions: QualityStoreExternalActions;
+	events: QualityStoreEvents;
 }
 /**
 * Создаёт quality store

package/types/store/types.d.ts

@@ -1,9 +1,9 @@
 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, InternalsExposure, IRectangle, IRootTracer, ISubject, ITracer, IValueObservable, IValueSubject, QualityLimits, VideoQuality } from "@vkontakte/videoplayer-shared";
+import type { AppTracer, IError, ILogger, InternalsExposure, IRectangle, IRootTracer, ISubject, ITracer, IValueObservable, IValueSubject } 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, VideoPlayerView, VideoQualityUI } from "../types";
+import type { AdditionalButtonDeprecated, AdsPlaybackState, ControlBlocksRefs, ControlsKeys, HotKeyMapData, IAnnotationsApi, IControlInfo, IDisabledControls, IInteractiveData, IPictureInPictureApi, IPlayerControlsRef, IPlayerPhase, ITimelinePreviewThumbsData, IVideoEpisode, IVKVideoPlayerCallbacks, IVKVideoPlayerUICallbacks, Position, Size, VideoPlayerView } from "../types";
 import type { AdmanWrapper } from "../components/Ads/admanWrapper";
 import type { QualitySettingsAppliesTo } from "../utils/userSettings";
 import type { GridTypes, PlayPrevChapterDisabledTooltipKey } from "../constans";
@@ -153,15 +153,10 @@ export interface IPlayerState {
 	isEnded$: Readable<boolean>;
 	volume$: Readable<number>;
 	muted$: Readable<boolean>;
-	trafficSavingEnabled$: Readable<boolean>;
-	highQualityEnabled$: Readable<boolean>;
 	availableVideoStreams$: Readable<IVideoStream[]>;
 	availableAudioStreams$: Readable<IAudioStream[]>;
 	videoStream$: Readable<IVideoStream | undefined>;
 	audioStream$: Readable<IAudioStream | undefined>;
-	currentQuality$: Readable<VideoQuality | undefined>;
-	autoQualityLimitingAvailable$: Readable<boolean>;
-	isAutoQualityEnabled$: Readable<boolean | undefined>;
 	currentPlaybackRate$: Readable<number>;
 	previewThumbsData$: Writable<ITimelinePreviewThumbsData | undefined>;
 	chromecastState$: Readable<ChromecastState>;
@@ -203,15 +198,12 @@ export interface IStoreInternalActions {
 	closeSettingsMenu: (fromSubMenu?: boolean) => void;
 	openSettingsSubMenu: (name: string, ref: HTMLElement) => void;
 	closeSettingsSubMenu: (ref: HTMLElement, isClosing?: boolean) => void;
-	setTrafficSavingEnabled: (trafficSavingEnabled: boolean, appliesTo?: QualitySettingsAppliesTo) => void;
-	setHighQualityEnabled: (highQualityEnabled: boolean, appliesTo?: QualitySettingsAppliesTo) => void;
+	setAudioStream: (stream: IAudioStream) => void;
+	setVideoStream: (stream: IVideoStream) => void;
 	setVolume: (volume: number) => void;
 	setMuted: (muted: boolean) => void;
 	startVolumeChanging: () => void;
 	stopVolumeChanging: () => void;
-	setAudioStream: (stream: IAudioStream) => void;
-	setVideoStream: (stream: IVideoStream) => void;
-	setQuality: (quality: VideoQualityUI, info?: SetQualityInfo) => void;
 	togglePictureInPicture: () => void;
 	startScrubbing: (progress: number) => void;
 	progressScrubbing: (progress: number) => void;
@@ -267,7 +259,6 @@ export interface IStoreExternalActions {
 	stop: () => void;
 	seekTime: (time: number) => void;
 	seekEpisodeStartTime: (time: number) => void;
-	setAutoQualityLimits: (limits: QualityLimits) => void;
 	setMuted: (muted: boolean) => void;
 	setVolume: (volume: number) => void;
 	returnFocusToEpisodes: () => void;
@@ -283,9 +274,6 @@ export interface IStoreExternalActions {
 	setLiveLowLatency: (isLowLatency: boolean) => void;
 	hideControls: () => void;
 	showControls: () => void;
-	setQuality: (quality: VideoQualityUI) => void;
-	setTrafficSavingEnabled: (trafficSavingEnabled: boolean) => void;
-	setHighQualityEnabled: (highQualityEnabled: boolean) => void;
 	changeAudioStream: (id: string) => void;
 	setMinimalView: (enabled: boolean) => void;
 	toggleFullscreen: () => void;
@@ -301,7 +289,6 @@ export interface IStoreInitVideoConfig extends ICoreInitVideoConfig {
 export interface IStoreEvents {
 	actionRewind$: ISubject<void>;
 	actionSeek$: IValueSubject<SeekAction | ThinOneStat.ActionSeekType>;
-	actionQuality$: ISubject<ThinOneStat.ActionQualityType>;
 	nextMovie$: ISubject<number>;
 }
 export interface IStore {

package/types/store/utils.d.ts

@@ -50,4 +50,5 @@ export declare class SubtitlesDownloader {
 	destroy(): void;
 	isDestroyed(): boolean;
 }
+export declare const canSavePreferredState: (external: boolean, saveOnUserActionOnly: boolean) => boolean;
 export declare const getAdsDefaultStateValues: () => IAdsStateValues;

package/types/types/qoe.d.ts

@@ -1,4 +1,4 @@
-import type { RecursivePartial, SafeAny } from "@vkontakte/videoplayer-shared";
+import type { ITracer, RecursivePartial, SafeAny } from "@vkontakte/videoplayer-shared";
 import type { QoeClosePollReason } from "../store/modules/qoeStore/types";
 export type QoeQuestionType = "star_rating" | "checkboxes_open";
 export interface IQoeQuestionBase {
@@ -62,4 +62,5 @@ export declare const isCheckboxesOpenQuestion: (candidate: SafeAny) => candidate
 export interface QoeStoreFactoryDeps {
 	config?: IQoeConfig | IQoeButtonOnlyConfig;
 	callbacks?: IQoeCallbacks;
+	tracer?: ITracer;
 }

package/types/utils/userSettings.d.ts

@@ -2,13 +2,8 @@ import type { VideoQuality } from "@vkontakte/videoplayer-shared";
 import { type PlaybackRate } from "@vkontakte/videoplayer-core";
 export declare const savePreferredVolume: (volume: number) => void;
 export declare const getPreferredVolume: () => number | undefined;
-export declare const savePreferredQuality: (videoId: number | undefined, value: VideoQuality) => void;
-export declare const deletePreferredQuality: () => void;
-export declare const getPreferredQuality: (currentVideoId: number | undefined) => VideoQuality | undefined;
 export declare const savePreferMute: (preferMute: boolean) => void;
 export declare const getPreferMute: () => boolean;
-export declare const savePreferTrafficSavingEnabled: (trafficSavingEnabled: boolean) => void;
-export declare const getPreferTrafficSavingEnabled: () => boolean;
 export declare const getPreferredStreamLanguage: () => string | null;
 export declare const savePreferredStreamLanguage: (language: string) => void;
 export declare const getPreferredSubtitlesLanguage: () => string | null;
@@ -33,7 +28,6 @@ export type QualitySettingsAppliesTo = "as-default" | "to-video";
 export declare const getPreferredQualitySettings: (videoId: number | undefined) => (PreferredQualitySettingsValue & {
 	appliesTo: QualitySettingsAppliesTo;
 }) | null;
-export declare const migrateSettingsToLegacyWay: (videoId?: number) => void;
 export declare const savePreferredQualitySettings: (value: PreferredQualitySettingsValue, appliesTo?: QualitySettingsAppliesTo) => void;
 export declare const savePreferredDefaultQualitySettings: (value: DefaultPreferredQualitySettingsValue) => void;
 export declare const removePreferredQualitySettingsByVideo: () => void;