@vkontakte/videoplayer 1.1.94-dev.eb086bcd9.0 → 1.1.95-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer",
-  "version": "1.1.94-dev.eb086bcd9.0",
+  "version": "1.1.95-beta.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.163-dev.eb086bcd9.0",
-    "@vkontakte/videoplayer-interactive": "1.0.69-dev.eb086bcd9.0",
-    "@vkontakte/videoplayer-shared": "1.0.92-dev.eb086bcd9.0",
-    "@vkontakte/videoplayer-statistics": "1.0.109-dev.eb086bcd9.0"
+    "@vkontakte/videoplayer-core": "2.0.164-beta.0",
+    "@vkontakte/videoplayer-interactive": "1.0.70-beta.0",
+    "@vkontakte/videoplayer-shared": "1.0.93-beta.0",
+    "@vkontakte/videoplayer-statistics": "1.0.110-beta.0"
   }
 }

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

@@ -23,6 +23,8 @@ export declare class AdmanWrapper {
 	private useAdmanFromNPM;
 	private isVsidOriginal;
 	private preserveMutedState;
+	private stopAdmanOnSwitch;
+	private skipNoFillAds;
 	private watchDogTimeout;
 	private externalApi?;
 	events: {

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

@@ -16,4 +16,6 @@ export interface IConfig {
 	volumeMultiplier: number;
 	isVsidOriginal: boolean;
 	preserveMutedState: boolean;
+	stopAdmanOnSwitch: boolean;
+	skipNoFillAds: boolean;
 }

package/types/components/Controls/contants/desktopButtonsLeftWeights.d.ts

@@ -1,2 +1,2 @@
 import { DesktopButtonsLeftIds } from "./desktopButtonsLeftIds";
-export declare const desktopButtonsLeftWeights: { [key in DesktopButtonsLeftIds] : number };
+export declare const desktopButtonsLeftWeights: { [key in DesktopButtonsLeftIds]: number };

package/types/components/Controls/contants/desktopButtonsRightIds.d.ts

@@ -6,5 +6,6 @@ export declare enum DesktopButtonsRightIds {
 	SETTINGS = "settings",
 	CONTEXT = "context",
 	FULLSCREEN = "fullscreen",
-	CHROMECAST = "chromecast"
+	CHROMECAST = "chromecast",
+	QOE = "qoe"
 }

package/types/components/Controls/contants/desktopButtonsRightWeights.d.ts

@@ -1,2 +1,2 @@
 import { DesktopButtonsRightIds } from "./desktopButtonsRightIds";
-export declare const desktopButtonsRightWeights: { [key in DesktopButtonsRightIds] : number };
+export declare const desktopButtonsRightWeights: { [key in DesktopButtonsRightIds]: number };

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

@@ -1,2 +1,2 @@
 import { ContextMenuItemIds } from "./contextMenuItemIds";
-export declare const contextMenuItemWeights: { [key in ContextMenuItemIds] : number };
+export declare const contextMenuItemWeights: { [key in ContextMenuItemIds]: number };

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

@@ -1,2 +1,2 @@
 import { SettingsMenuItemIds } from "./settingsMenuItemIds";
-export declare const settingsMenuItemWeights: { [key in SettingsMenuItemIds] : number };
+export declare const settingsMenuItemWeights: { [key in SettingsMenuItemIds]: number };

package/types/components/Qoe/constants.d.ts

@@ -0,0 +1,9 @@
+/**
+* Отступ снизу для контейнера опроса от нижнего края плеера.
+* Включает высоту контролов и дополнительный отступ.
+*/
+export declare const QOE_POLL_BOTTOM_OFFSET: number;
+/**
+* Верхний отступ для расчёта максимальной высоты опроса.
+*/
+export declare const QOE_POLL_TOP_OFFSET: number;

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

@@ -0,0 +1 @@
+export declare const stopPropagation: (e: Event) => void;

package/types/config.d.ts

@@ -51,6 +51,12 @@ export interface IAdsConfig {
 	* Этот флаг регулирует нужно ли передавать сомтояние мьюта в основной плеер
 	*/
 	preserveMutedState: boolean;
+	stopAdmanOnSwitch: boolean;
+	/**
+	* Пропускать no-fill рекламу (баннер с нулевой длительностью).
+	* Если true — started$ не стреляется, видео сразу продолжает воспроизведение.
+	*/
+	skipNoFillAds: boolean;
 }
 export interface IUIConfig {
 	isMobile: ForceOrRelay;

package/types/index.d.ts

@@ -1,5 +1,5 @@
 import { VKVideoPlayer } from "./VKVideoPlayer/index.svelte";
-import type { AdsParams, IAdmanInitParamsExternalApi, IVKVideoPlayerConfig, IUpdatableVKVideoPlayerConfig, 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, IQoeConfig, IQoePoll, IQoeResult, IQoeQuestion, IQoeCallbacks, QoePollTranslations, VideoPlayerView } from "./types";
 import type { LanguagePack, LanguageConfig } from "./translation/types";
 import type { LogoType as VKLogoType, IAdsConfig, ISDKConfig, IDpipConfig } from "./config";
 import type { ISources, IDashSource, URLSource, RawSource, URLSourceWithSeek } from "@vkontakte/videoplayer-core";
@@ -8,7 +8,7 @@ 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, 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 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, IQoeConfig, IQoePoll, IQoeResult, IQoeQuestion, IQoeCallbacks, QoePollTranslations, ISDKConfig, VideoPlayerView, IAdmanInitParamsExternalApi, VKLogoType };
 export { GridTypes } from "./constans";
 export { PlayerPhase } from "./types";
 export { isPiPSupported, isDpipSupported } from "./utils/webAPI/pictureInPictureApi";

package/types/store/composition.d.ts

@@ -1,7 +1,7 @@
 import type { IUIConfig } from "../config";
 import type { IVKVideoPlayerConfig } from "../types";
 import type { IStore } from "./index";
-import type { FakeIsPlayingStore, GraphIsOpenedStore, InteractiveControlsOpacityStore, NotificationsStore, PictureInPictureStore, SeekToInteractiveDisabledTooltipStore, ShowInteractiveTimeIndicatorTooltipStore } from "./modules";
+import type { FakeIsPlayingStore, GraphIsOpenedStore, InteractiveControlsOpacityStore, NotificationsStore, PictureInPictureStore, IQoeStore, SeekToInteractiveDisabledTooltipStore, ShowInteractiveTimeIndicatorTooltipStore } from "./modules";
 import type { Interactives } from "@vkontakte/videoplayer-interactive";
 export interface ICompositionParams {
 	legacyStore: IStore;
@@ -11,13 +11,14 @@ export interface ICompositionParams {
 }
 export interface ICompositionResult {
 	stores: {
+		fakeIsPlayingStore: FakeIsPlayingStore;
+		graphIsOpenedStore: GraphIsOpenedStore;
+		interactiveControlsOpacityStore: InteractiveControlsOpacityStore;
 		notificationsStore: NotificationsStore;
 		pictureInPictureStore: PictureInPictureStore;
-		fakeIsPlayingStore: FakeIsPlayingStore;
+		qoeStore: IQoeStore;
 		seekToInteractiveDisabledTooltipStore: SeekToInteractiveDisabledTooltipStore;
 		showInteractiveTimeIndicatorTooltipStore: ShowInteractiveTimeIndicatorTooltipStore;
-		graphIsOpenedStore: GraphIsOpenedStore;
-		interactiveControlsOpacityStore: InteractiveControlsOpacityStore;
 	};
 	/** Очистка ресурсов */
 	destroy(): void;

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

@@ -12,6 +12,8 @@ export type { NotificationsStoreState, NotificationsStore, NotificationsStoreAct
 export { notificationsModule, NOTIFICATIONS_STORE_TOKEN } from "./notificationsStore";
 export type { PictureInPictureStoreState, PictureInPictureStore, PictureInPictureStoreDeps } from "./pictureInPictureStore";
 export { pictureInPictureModule, PICTURE_IN_PICTURE_STORE_TOKEN } from "./pictureInPictureStore";
+export type { QoeStoreActions, QoeStoreState, IQoeStore } from "./qoeStore";
+export { qoeModule, QOE_STORE_TOKEN } from "./qoeStore";
 export type { SeekToInteractiveDisabledTooltipStoreState, SeekToInteractiveDisabledTooltipStore, SeekToInteractiveDisabledTooltipStoreDeps } from "./seekToInteractiveDisabledTooltipStore";
 export { seekToInteractiveDisabledTooltipModule, SEEK_TO_INTERACTIVE_DISABLED_TOOLTIP_STORE_TOKEN } from "./seekToInteractiveDisabledTooltipStore";
 export type { ShowInteractiveTimeIndicatorTooltipStoreState, ShowInteractiveTimeIndicatorTooltipStore, ShowInteractiveTimeIndicatorTooltipStoreActions, ShowInteractiveTimeIndicatorTooltipStoreDeps } from "./showInteractiveTimeIndicatorTooltipStore";

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

@@ -0,0 +1,3 @@
+export type { QoeStoreActions, QoeStoreState, IQoeStore } from "./types";
+export { qoeModule } from "./qoeStore.module";
+export { QOE_STORE_TOKEN } from "./qoeStore.token";

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

@@ -0,0 +1,3 @@
+import type { Module } from "../utils";
+import type { IQoeStore } from "./types";
+export declare const qoeModule: Module<IQoeStore>;

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

@@ -0,0 +1,4 @@
+import type { QoeStoreFactoryDeps } from "../../../types";
+import type { IQoeStore } from "./types";
+export declare const CLOSE_DELAY = 3e3;
+export declare const createQoeStore: (deps: QoeStoreFactoryDeps) => IQoeStore;

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

@@ -0,0 +1,3 @@
+import { InjectionToken } from "@vkontakte/videoplayer-shared";
+import type { IQoeStore } from "./types";
+export declare const QOE_STORE_TOKEN: InjectionToken<IQoeStore>;

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

@@ -0,0 +1,24 @@
+import type { Readable } from "svelte/store";
+import type { IQoePoll, IQoeAnswer, IQoeQuestion, QoePollTranslationKeys, IQoeResult } from "../../../types";
+export interface QoeStoreState {
+	complete$: Readable<boolean>;
+	active$: Readable<boolean>;
+	poll$: Readable<IQoePoll | undefined>;
+	pollResult$: Readable<IQoeResult | undefined>;
+	questionIndex$: Readable<number | undefined>;
+}
+export type QoeClosePollReason = "manual" | "auto" | "final";
+export interface QoeStoreActions {
+	closePoll: (reason?: QoeClosePollReason) => void;
+	completePoll: VoidFunction;
+	answerQuestion: (answer: Pick<IQoeAnswer, "numeric" | "text">) => void;
+	switchQuestion: (step: 1 | -1) => void;
+	startPoll: VoidFunction;
+}
+export interface IQoeStore {
+	actions: QoeStoreActions;
+	enabled: boolean;
+	getTranslation(key: QoePollTranslationKeys): string;
+	isQuestionAnswerEditable(question: IQoeQuestion): boolean;
+	state: QoeStoreState;
+}

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

@@ -3,4 +3,4 @@ export type Module<T> = {
 	token: InjectionToken<T>;
 	factory: (container: IDIContainer) => T;
 };
-export declare const registerModules: <T extends any[]>(container: IDIContainer, modules: { [K in keyof T] : Module<T[K]> }) => void;
+export declare const registerModules: <T extends any[]>(container: IDIContainer, modules: { [K in keyof T]: Module<T[K]> }) => void;

package/types/store/types.d.ts

@@ -29,7 +29,7 @@ export interface IAdsStateValues {
 	secondsToWatchBeforeSkip: number;
 	postrollPassed: boolean;
 }
-export type IAdsState = { [K in keyof IAdsStateValues] : Writable<IAdsStateValues[K]> };
+export type IAdsState = { [K in keyof IAdsStateValues]: Writable<IAdsStateValues[K]> };
 export interface IUIState {
 	t: (key: Key, params?: Record<string, string>) => string;
 	isMinimalView$: Writable<boolean>;
@@ -42,7 +42,7 @@ export interface IUIState {
 	* Определяет, могут ли вообще контролы быть показаны.
 	*/
 	isControlsAvailable: Writable<boolean>;
-	controlBlocks: { [key in keyof Required<ControlBlocksRefs>] : Writable<IControlInfo | undefined> };
+	controlBlocks: { [key in keyof Required<ControlBlocksRefs>]: Writable<IControlInfo | undefined> };
 	touched: Writable<boolean>;
 	controls: {
 		prevButton: Writable<IControlInfo | undefined>;

package/types/types/index.d.ts

@@ -1,5 +1,5 @@
 import type { VideoQuality, VideoFormat, ISources, IExternalTextTrack, IAudioStream } from "@vkontakte/videoplayer-core";
-import type { IValueObservable, InterfaceLanguage, IRectangle, DevNullEntry } from "@vkontakte/videoplayer-shared";
+import type { IValueObservable, InterfaceLanguage, IRectangle, DevNullEntry, RecursivePartial } from "@vkontakte/videoplayer-shared";
 import type { Chapter, Manifest, ManifestVideo, VideoInfo, IInteractiveOptions } from "@vkontakte/videoplayer-interactive";
 import type { PlaybackState } from "@vkontakte/videoplayer-core";
 import type { MediascopePixelTypes, SeekAction, ThinOneStat } from "@vkontakte/videoplayer-statistics";
@@ -11,7 +11,9 @@ import type { IUIStatistics } from "../services/statistics";
 import type { AdditionalContextMenuItem, AdditionalSettingsMenuItem } from "../components/Menus/subMenuTabs/types";
 import type { AdditionalDesktopControlPanelButton } from "../components/Controls/types";
 import type { AdmanInitParams } from "./ads";
+import type { IQoeCallbacks, IQoeConfig } from "./qoe";
 export type { AdmanInitParams, AdsParams, IAdmanInitParamsExternalApi } from "./ads";
+export * from "./qoe";
 export declare const enum UIType {
 	DESKTOP = "desktop",
 	MOBILE = "mobile"
@@ -179,6 +181,7 @@ export interface IVKVideoPlayerCallbacks {
 		onClosed?: (adsSection: AdsSection) => void;
 		onError?: (message: string) => void;
 	};
+	qoe?: IQoeCallbacks;
 }
 export interface IVKVideoPlayerUICallbacks {
 	onStarted?: (isMuted: boolean) => void;
@@ -331,6 +334,7 @@ export interface IVKVideoPlayerConfig {
 	mediascopePixels?: MediascopePixelTypes.Pixel[];
 	getVideoDeeplink?: (timestamp: number) => string;
 	apptracerUserId?: string | number;
+	qoe?: RecursivePartial<IQoeConfig>;
 }
 /**
 * Поля, которые можно обновить, сохранив итстанс плеера

package/types/types/qoe.d.ts

@@ -0,0 +1,64 @@
+import type { RecursivePartial, SafeAny } from "@vkontakte/videoplayer-shared";
+import type { QoeClosePollReason } from "../store/modules/qoeStore/types";
+export type QoeQuestionType = "star_rating" | "checkboxes_open";
+export interface IQoeQuestionBase {
+	id: number;
+	statement: string;
+	type: QoeQuestionType;
+}
+export interface IQoeQuestionStarRating extends IQoeQuestionBase {
+	type: "star_rating";
+	rating_max: number;
+}
+export interface IQoeQuestionOption {
+	index: number;
+	text: string;
+	is_open?: boolean;
+}
+export interface IQoeQuestionCheckboxesOpen extends IQoeQuestionBase {
+	type: "checkboxes_open";
+	options: IQoeQuestionOption[];
+}
+export type IQoeQuestion = IQoeQuestionStarRating | IQoeQuestionCheckboxesOpen;
+export type QoePollTranslationKeys = "button_back" | "button_continue" | "button_send" | "poll_step_caption" | "text_answer_placeholder" | "player_button_tooltip" | "star_labels";
+export type QoePollTranslations = Record<QoePollTranslationKeys, string>;
+export interface IQoePoll {
+	questions: IQoeQuestion[];
+	completionMessage?: string;
+	translations: QoePollTranslations;
+}
+export interface IQoeAnswer {
+	questionId: number;
+	numeric: number[];
+	text?: string;
+}
+export interface IQoeResult {
+	answers: IQoeAnswer[];
+}
+export type QoeStartedHandler = VoidFunction;
+export type QoeClosedHandler = (reason: QoeClosePollReason, result?: IQoeResult) => void;
+export type QoeCompleteHandler = (result: IQoeResult) => void;
+export interface IQoeCallbacks {
+	onStarted?: QoeStartedHandler;
+	onClosed?: QoeClosedHandler;
+	onComplete?: QoeCompleteHandler;
+}
+export interface IQoeConfig {
+	poll: IQoePoll;
+	/**
+	* Таймаут автоматического закрытия в конце
+	* @default 3000
+	*/
+	closeDelay?: number;
+}
+export interface IQoeButtonOnlyConfig {
+	buttonOnly: true;
+	translations: RecursivePartial<QoePollTranslations>;
+}
+export declare const isQoeButtonOnlyConfig: (candidate: SafeAny) => candidate is IQoeButtonOnlyConfig;
+export declare const isStarRatingQuestion: (candidate: SafeAny) => candidate is IQoeQuestionStarRating;
+export declare const isCheckboxesOpenQuestion: (candidate: SafeAny) => candidate is IQoeQuestionCheckboxesOpen;
+export interface QoeStoreFactoryDeps {
+	config: RecursivePartial<IQoeConfig>;
+	callbacks: IQoeCallbacks;
+}