@vkontakte/videoplayer 1.1.74-dev.7dc0bee9.0 → 1.1.74-dev.e771e267.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer",
-  "version": "1.1.74-dev.7dc0bee9.0",
+  "version": "1.1.74-dev.e771e267.0",
   "author": "vk.com",
   "description": "Videoplayer based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -55,9 +55,9 @@
   ],
   "dependencies": {
     "@adtech/rbadman": "2.2.57",
-    "@vkontakte/videoplayer-core": "2.0.143-dev.7dc0bee9.0",
-    "@vkontakte/videoplayer-interactive": "1.0.49-dev.7dc0bee9.0",
-    "@vkontakte/videoplayer-shared": "1.0.71-dev.7dc0bee9.0",
-    "@vkontakte/videoplayer-statistics": "1.0.89-dev.7dc0bee9.0"
+    "@vkontakte/videoplayer-core": "2.0.143-dev.e771e267.0",
+    "@vkontakte/videoplayer-interactive": "1.0.49-dev.e771e267.0",
+    "@vkontakte/videoplayer-shared": "1.0.71-dev.e771e267.0",
+    "@vkontakte/videoplayer-statistics": "1.0.89-dev.e771e267.0"
   }
 }

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

@@ -13,6 +13,10 @@ import { SlotsApi } from '../utils/webAPI/slotsApi';
 export declare class VKVideoPlayer extends HTMLElement {
     private svelteStubComponent?;
     private svelteRootComponent?;
+    /**
+     * Слой, который живет на протяжении жизни плеера, не уничтожается между переключениями видео.
+     */
+    private sveltePersistentLayerComponent?;
     private svelteErrorComponent?;
     private store?;
     private microStoresRoot?;
@@ -49,6 +53,7 @@ export declare class VKVideoPlayer extends HTMLElement {
     private readonly fatalError$;
     constructor();
     private connectedCallback;
+    private updatePersistentLayerProps;
     private disconnectedCallback;
     private initPlayerRootContainers;
     private needToShowNextPrevButtons;

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

@@ -1,9 +1,39 @@
+import type { Readable } from 'svelte/store';
 import type { AdsTimeRemained } from '../../types';
 import { AdsSection } from '../../types';
-import { type ILogger } from '@vkontakte/videoplayer-shared';
+import type { AdsParams } from '../../types';
+import { type ILogger, type Milliseconds } from '@vkontakte/videoplayer-shared';
 import { Subject } from '@vkontakte/videoplayer-shared';
 import type { IAdsState } from '../../store';
-import type { AdmanInitParams, ExternalActions, IConfig, IPlayerState } from './types';
+type ExternalActions = {
+    switchFromAdsToVideo: (callPlay?: boolean) => void;
+    switchFromVideoToAds: () => void;
+    setMuted: (muted: boolean) => void;
+};
+export type AdmanInitParams = {
+    width: number;
+    height: number;
+    isFullscreen: boolean;
+    isAutoplay: boolean;
+    slotId: number;
+    params?: AdsParams;
+    paramsOverride?: AdsParams;
+    duration: number;
+    adsContainer: HTMLElement;
+    adsVideoElement: HTMLVideoElement;
+};
+type IPlayerState = {
+    vsid: Readable<string | undefined>;
+};
+interface IConfig {
+    loadTimeout: Milliseconds;
+    initTimeout: Milliseconds;
+    runtimeTimeout: Milliseconds;
+    useAdmanFromNPM: boolean;
+    volumeMultiplier: number;
+    isVsidOriginal: boolean;
+    usePuid: boolean;
+}
 export declare class AdmanWrapper {
     private adman;
     private initialVolume;
@@ -21,9 +51,7 @@ export declare class AdmanWrapper {
     private useAdmanFromNPM;
     private isVsidOriginal;
     private usePuid;
-    private debug;
     private watchDogTimeout;
-    private externalApi?;
     events: {
         init$: Subject<number>;
         loadStarted$: Subject<void>;
@@ -48,7 +76,7 @@ export declare class AdmanWrapper {
     loadAdmanMailRu: (abortSignal: AbortSignal) => Promise<void>;
     private loadAdmanNPM;
     onAdmanLoadingError(): void;
-    initAdman(initParams: AdmanInitParams): Promise<void>;
+    initAdman(initParams: AdmanInitParams): void;
     private switchToVideo;
     private setPostrollPassed;
     togglePlay(): void;
@@ -75,5 +103,5 @@ export declare class AdmanWrapper {
     skip(): void;
     setPosition(position: number, duration: number): void;
     destroy(): void;
-    private safeExternalCall;
 }
+export {};

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

@@ -1,11 +1,10 @@
 import type { IExternalTextTrack, ISources, PlaybackRate } from '@vkontakte/videoplayer-core';
 import type { IStore } from '../../store';
-import type { IMicroStoresRoot, IVideoLive, IVKVideoPlayerConfig } from '../../types';
+import type { AdsParams, IMicroStoresRoot, IVideoLive, IVKVideoPlayerConfig } from '../../types';
 import type { IUIConfig } from '../../config';
 import type { Interactives } from '@vkontakte/videoplayer-interactive';
 import KeyboardControls from '../KeyboardControls.svelte';
 import type { QualityLimits } from '@vkontakte/videoplayer-shared';
-import type { AdmanInitParams } from '../Ads/types';
 export interface RootProps {
     sources: ISources | undefined;
     store: IStore;
@@ -27,9 +26,8 @@ export interface RootProps {
     canRewindLive: boolean;
     showAds: boolean;
     adsSlotId?: number | undefined;
-    adsParams?: AdmanInitParams['params'];
+    adsParams?: AdsParams | undefined;
     adsAutoplayParam?: boolean;
-    adsExternalApi?: AdmanInitParams['externalApi'];
     duration?: number | undefined;
     logoClickable: boolean;
     logoHidden: boolean;
@@ -78,3 +76,6 @@ export interface RootExports {
     toggleTrafficSaving: (value: boolean) => void;
     toggleHighQuality: (value: boolean) => void;
 }
+export interface PersistentLayerExports {
+    startVideoChangedAnimation: (prev: boolean) => void;
+}

package/types/config.d.ts

@@ -41,7 +41,6 @@ export interface IUIConfig {
         volumeMultiplier: number;
         isVsidOriginal: boolean;
         usePuid: boolean;
-        debug: boolean;
     };
     /**
      * Если нет ранее сохранённого значения громкости будет использовано это
@@ -159,18 +158,10 @@ export interface IUIConfig {
          * Отображать ли анимацию смены статуса проигрывания.
          */
         playbackStatusShow: boolean;
-        /**
-         * Продолжительность анимации.
-         */
-        playbackStatusAnimationDuration: number;
         /**
          * Отображать ли анимацию при переключении видео на следующее или предыдущее.
          */
         playbackStatusNextVideoShow: boolean;
-        /**
-         * Продолжительность анимации для переключения видео.
-         */
-        playbackStatusNextVideoAnimationDuration: number;
         /**
          * Включает ранее выбранный язык субтитров при запуске видео
          */
@@ -197,6 +188,7 @@ export interface IUIConfig {
          * Если включен то за зацикливание одного видео будет отвечать флаг loop
          */
         useLoopSetting: boolean;
+        doubleForwardAvailable: boolean;
     };
     interactive: {
         historyMaxLength: number;
@@ -227,6 +219,15 @@ export interface IUIConfig {
     };
     /** уникальный идентификатор пользователя для сохранения настроек */
     userSalt: string;
+    /**
+     * Время, которое нужно зажимать горячую клавишу, чтобы включилось х2 ускорение.
+     */
+    doubleForwardActivationTime: number;
+    playbackStatusAnimationDuration: number;
+    /**
+     * Продолжительность анимации для переключения видео.
+     */
+    playbackStatusNextVideoAnimationDuration: number;
 }
 export declare const defaultConfig: IUIConfig;
 export type IOptionalUIConfig = RecursivePartial<IUIConfig>;

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 { IVKVideoPlayerConfig, IControlInfo, ITimelinePreviewThumbsData, IUpcomingLiveViewControlInfo, IVKVideoPlayerCallbacks, IVideoData, AdsParams, HotKeyMapData, HotKeyMapItem, HotKeyMapGroup, IVideoLive, IInteractiveData, AdditionalButtonDeprecated, IVideoEpisode, VideoPlayerView } from './types';
 import type { LanguagePack, LanguageConfig } from './translation/types';
 import type { ISDKConfig } from './config';
-import type { AdsParams, IAdmanInitParamsExternalApi } from './components/Ads/types';
 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, ISDKConfig, VideoPlayerView, IAdmanInitParamsExternalApi, };
+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, ISDKConfig, VideoPlayerView, };
 export { GridTypes, } from './constans';
 export { PlayerPhase, } from './types';
 export { InterfaceLanguage, VKNumericLanguage, loadVKLangPack, } from '@vkontakte/videoplayer-shared';

package/types/store/index.d.ts

@@ -122,7 +122,6 @@ export interface IUIState {
         ref$: Writable<HTMLElement | undefined>;
         name$: Writable<string | undefined>;
     };
-    aboutToGoNextVideo: Writable<'next' | 'prev' | undefined>;
     /**
      * Отключаем любое действие пользователя.
      */
@@ -131,6 +130,14 @@ export interface IUIState {
      * Положение заголовка названия видео.
      */
     videoTitleInfo: Writable<IControlInfo | undefined>;
+    /**
+     * Ускорение видео х2.
+     */
+    doubleForwardOn$: Writable<boolean>;
+    /**
+     * Определяет, что двойное ускорение видео доступно.
+     */
+    doubleForwardAvailable$: Readable<false>;
 }
 export interface IWebApi {
     pictureInPictureApi?: IPictureInPictureApi;
@@ -294,6 +301,7 @@ export interface IStore {
             nextVideoAnnouncementAuto: () => void;
             nextVideoAnnouncementCancel: () => void;
             checkFullscreenSupport: () => boolean;
+            changeDoubleForwardOn: (enabled: boolean) => void;
         };
         external: {
             firstStart: (showAds: boolean) => void;
@@ -363,6 +371,11 @@ interface IStoreParams {
     additionalContextMenuItems: AdditionalContextMenuItem[];
     playPrevVideo: () => void;
     playNextVideo: () => void;
+    /**
+     * playPrevVideo или playNextVideo могут не вызваться, если обработка следующего видео находится на стороне интегарции,
+     * поэтому используем данный колбэк.
+     */
+    onVideoChanged: (prev: boolean) => void;
     looped?: boolean;
     statistics?: UIOneStat;
     saveRate: boolean;
@@ -374,5 +387,5 @@ interface IStoreParams {
  * Store приложения.
  * Если будет слишком большим - можно разделить его на модули
  */
-export declare const createStore: ({ interfaceLanguage, isCyrillicRelatedInterface, videoId, isClip, isLiveCatchUpMode, statAuthToken, isAudioDisabled, canDownload, callbacks, webApi, videoEpisodes, previewThumbsData, uiConfig, coreConfig, player: playerInstance, disabledControls, isInteractive, interactiveRanges$, isInteractiveTime$, replayInteractive, stopPlayer, hasInteractiveBranches, playPrevChapterDisabledTooltip, additionalButtons, additionalSettingsMenuItems, additionalContextMenuItems, playPrevVideo, playNextVideo, looped, statistics: uiStatistics, saveRate, internalsExposure, playerView, playerId, }: IStoreParams) => IStore;
+export declare const createStore: ({ interfaceLanguage, isCyrillicRelatedInterface, videoId, isClip, isLiveCatchUpMode, statAuthToken, isAudioDisabled, canDownload, callbacks, webApi, videoEpisodes, previewThumbsData, uiConfig, coreConfig, player: playerInstance, disabledControls, isInteractive, interactiveRanges$, isInteractiveTime$, replayInteractive, stopPlayer, hasInteractiveBranches, playPrevChapterDisabledTooltip, additionalButtons, additionalSettingsMenuItems, additionalContextMenuItems, playPrevVideo, playNextVideo, onVideoChanged, looped, statistics: uiStatistics, saveRate, internalsExposure, playerView, playerId, }: IStoreParams) => IStore;
 export {};

package/types/translation/types.d.ts

@@ -1,5 +1,5 @@
 import { InterfaceLanguage } from '@vkontakte/videoplayer-shared';
-export type Key = 'auto_quality_invariant' | 'auto_quality' | 'menu_quality' | 'menu_playback_rate' | 'menu_traffic_saving' | 'menu_report' | 'menu_pip' | 'menu_pip_close' | 'menu_copy_video_link' | 'menu_copy_video_link_with_timestamp' | 'menu_video_rotate' | 'menu_video_loop_on' | 'menu_video_loop_off' | 'menu_chromecast' | 'menu_copy_debug' | 'menu_save_debug' | 'menu_debug_overlay' | 'menu_copy_embed_code' | 'pip_dummy_title' | 'submenu_traffic_saving' | 'submenu_quality' | 'submenu_playback_rate' | 'submenu_settings' | 'submenu_audio_languages' | 'auto_quality_option' | 'playing_ads' | 'skip_ads_now' | 'skip_ads_after' | 'visit_advertiser' | 'aria_timeline' | 'aria_timeline_value' | 'doubletap_seek_step' | 'playback_rate_1' | 'playback_rate' | 'video360' | 'subtitles_caption' | 'subtitles_auto' | 'subtitles_off' | 'subtitles_auto_caption' | 'subtitles_turn_on' | 'subtitles_turn_off' | 'traffic_saving_off' | 'traffic_saving_on' | 'traffic_saving_helper_text' | 'tooltip_previous' | 'tooltip_restart' | 'tooltip_play' | 'tooltip_pause' | 'tooltip_next' | 'tooltip_button_disabled' | 'tooltip_interactive_go_back' | 'tooltip_interactive_go_back_disabled' | 'tooltip_interactive_go_back_disabled_first' | 'tooltip_interactive_go_back_disabled_limit' | 'tooltip_chapter_without_interactive' | 'tooltip_interactive_of_chapter_completed' | 'tooltip_interactive_seek' | 'tooltip_interactive_graph_off' | 'tooltip_interactive_graph_on' | 'tooltip_live' | 'tooltip_episodes' | 'tooltip_volume' | 'tooltip_volume_muted' | 'tooltip_sound_unavailable' | 'tooltip_settings_on' | 'tooltip_subtitles_off' | 'tooltip_settings_off' | 'tooltip_subtitles_on' | 'tooltip_fullscreen_off' | 'tooltip_fullscreen_on' | 'tooltip_chromecast_off' | 'tooltip_chromecast_on' | 'tooltip_episode_finished' | 'tooltip_episode_unfinished' | 'tooltip_disabled_when_interactive' | 'tooltip_disabled_when_graph_on' | 'tooltip_interactive_interaction_time_indicator' | 'tooltip_vk_logo' | 'tooltip_vk_video_logo' | 'tooltip_autoplay_off' | 'tooltip_autoplay_on' | 'tooltip_context_menu_open' | 'tooltip_context_menu_close' | 'download_video_caption' | 'hotkey_helper_current_volume' | 'hotkey_map_modal_title' | 'hotkey_map_modal_close_btn_text' | 'hotkey_map_group_title_common' | 'hotkey_map_group_title_playback' | 'hotkey_map_group_title_subtitles' | 'hotkey_map_group_title_episodes' | 'hotkey_map_item_mute_description' | 'hotkey_map_item_mute_value' | 'hotkey_map_item_volume_down_description' | 'hotkey_map_item_volume_down_value' | 'hotkey_map_item_volume_up_description' | 'hotkey_map_item_volume_up_value' | 'hotkey_map_item_pip_description' | 'hotkey_map_item_pip_value' | 'hotkey_map_item_full_screen_description' | 'hotkey_map_item_full_screen_value' | 'hotkey_map_item_show_context_menu_description' | 'hotkey_map_item_show_context_menu_value' | 'hotkey_map_item_show_hotkey_map_description' | 'hotkey_map_item_show_hotkey_map_value' | 'hotkey_map_item_play_toggle_description' | 'hotkey_map_item_play_toggle_value' | 'hotkey_map_item_seek_backward_description' | 'hotkey_map_item_seek_backward_value' | 'hotkey_map_item_seek_forward_description' | 'hotkey_map_item_seek_forward_value' | 'hotkey_map_item_fast_seek_backward_description' | 'hotkey_map_item_fast_seek_backward_value' | 'hotkey_map_item_fast_seek_forward_description' | 'hotkey_map_item_fast_seek_forward_value' | 'hotkey_map_item_rate_down_description' | 'hotkey_map_item_rate_down_value' | 'hotkey_map_item_rate_up_description' | 'hotkey_map_item_rate_up_value' | 'hotkey_map_item_prev_frame_description' | 'hotkey_map_item_prev_frame_value' | 'hotkey_map_item_next_frame_description' | 'hotkey_map_item_next_frame_value' | 'hotkey_map_item_jump_seek_description' | 'hotkey_map_item_jump_seek_value' | 'hotkey_map_item_subtitles_toggle_description' | 'hotkey_map_item_subtitles_toggle_value' | 'hotkey_map_item_prev_episode_description' | 'hotkey_map_item_prev_episode_pc_value' | 'hotkey_map_item_prev_episode_mac_value' | 'hotkey_map_item_next_episode_description' | 'hotkey_map_item_next_episode_pc_value' | 'hotkey_map_item_next_episode_mac_value' | 'hotkey_map_item_next_video_description' | 'hotkey_map_item_next_video_value' | 'hotkey_map_item_prev_video_description' | 'hotkey_map_item_prev_video_value' | 'waiting_live_day_value' | 'waiting_live_hour_value' | 'waiting_live_minute_value' | 'waiting_live_second_value' | 'waiting_live_colon' | 'waiting_live_upcoming_title' | 'waiting_live_timer_title' | 'waiting_live_recover_title' | 'waiting_record_title' | 'aria_label_submenu_traffic_saving' | 'aria_label_submenu_back' | 'aria_label_menu_quality' | 'aria_label_menu_rate' | 'aria_label_menu_subtitle' | 'aria_label_menu_download' | 'aria_label_new_tab_alert' | 'aria_label_menu_debug_overlay' | 'aria_label_menu_rotate' | 'aria_label_menu_loop' | 'aria_label_debug_panel' | 'aria_label_context_menu' | 'aria_label_video_player' | 'aria_label_spherical_control' | 'aria_label_menu_audio_languages' | 'aria_label_settings' | 'aria_label_autoplay' | 'menu_audio_languages' | 'audio_stream_display_language_label' | 'audio_stream_display_language_label_index' | 'audio_stream_display_label_index' | 'audio_stream_display_language_index' | 'audio_stream_display_unknown' | 'end_screen_next_video' | 'end_screen_recommended_video' | 'other_quality' | 'high_quality' | 'high_quality_description' | 'auto_quality_limit' | 'traffic_saving_quality' | 'traffic_saving_quality_description' | 'quality_applience' | 'quality_applience_action' | 'default_quality_for_any_video' | 'slow_video_notification_button' | 'slow_video_notification_force_description' | 'slow_video_notification_suggest_description';
+export type Key = 'auto_quality_invariant' | 'auto_quality' | 'menu_quality' | 'menu_playback_rate' | 'menu_traffic_saving' | 'menu_report' | 'menu_pip' | 'menu_pip_close' | 'menu_copy_video_link' | 'menu_copy_video_link_with_timestamp' | 'menu_video_rotate' | 'menu_video_loop_on' | 'menu_video_loop_off' | 'menu_chromecast' | 'menu_copy_debug' | 'menu_save_debug' | 'menu_debug_overlay' | 'menu_copy_embed_code' | 'pip_dummy_title' | 'submenu_traffic_saving' | 'submenu_quality' | 'submenu_playback_rate' | 'submenu_settings' | 'submenu_audio_languages' | 'auto_quality_option' | 'playing_ads' | 'skip_ads_now' | 'skip_ads_after' | 'visit_advertiser' | 'aria_timeline' | 'aria_timeline_value' | 'doubletap_seek_step' | 'playback_rate_1' | 'playback_rate' | 'video360' | 'subtitles_caption' | 'subtitles_auto' | 'subtitles_off' | 'subtitles_auto_caption' | 'subtitles_turn_on' | 'subtitles_turn_off' | 'traffic_saving_off' | 'traffic_saving_on' | 'traffic_saving_helper_text' | 'tooltip_previous' | 'tooltip_restart' | 'tooltip_play' | 'tooltip_pause' | 'tooltip_next' | 'tooltip_button_disabled' | 'tooltip_interactive_go_back' | 'tooltip_interactive_go_back_disabled' | 'tooltip_interactive_go_back_disabled_first' | 'tooltip_interactive_go_back_disabled_limit' | 'tooltip_chapter_without_interactive' | 'tooltip_interactive_of_chapter_completed' | 'tooltip_interactive_seek' | 'tooltip_interactive_graph_off' | 'tooltip_interactive_graph_on' | 'tooltip_live' | 'tooltip_episodes' | 'tooltip_volume' | 'tooltip_volume_muted' | 'tooltip_sound_unavailable' | 'tooltip_settings_on' | 'tooltip_subtitles_off' | 'tooltip_settings_off' | 'tooltip_subtitles_on' | 'tooltip_fullscreen_off' | 'tooltip_fullscreen_on' | 'tooltip_chromecast_off' | 'tooltip_chromecast_on' | 'tooltip_episode_finished' | 'tooltip_episode_unfinished' | 'tooltip_disabled_when_interactive' | 'tooltip_disabled_when_graph_on' | 'tooltip_interactive_interaction_time_indicator' | 'tooltip_vk_logo' | 'tooltip_vk_video_logo' | 'tooltip_autoplay_off' | 'tooltip_autoplay_on' | 'tooltip_context_menu_open' | 'tooltip_context_menu_close' | 'download_video_caption' | 'hotkey_helper_current_volume' | 'hotkey_map_modal_title' | 'hotkey_map_modal_close_btn_text' | 'hotkey_map_group_title_common' | 'hotkey_map_group_title_playback' | 'hotkey_map_group_title_subtitles' | 'hotkey_map_group_title_episodes' | 'hotkey_map_item_mute_description' | 'hotkey_map_item_mute_value' | 'hotkey_map_item_volume_down_description' | 'hotkey_map_item_volume_down_value' | 'hotkey_map_item_volume_up_description' | 'hotkey_map_item_volume_up_value' | 'hotkey_map_item_pip_description' | 'hotkey_map_item_pip_value' | 'hotkey_map_item_full_screen_description' | 'hotkey_map_item_full_screen_value' | 'hotkey_map_item_show_context_menu_description' | 'hotkey_map_item_show_context_menu_value' | 'hotkey_map_item_show_hotkey_map_description' | 'hotkey_map_item_show_hotkey_map_value' | 'hotkey_map_item_play_toggle_description' | 'hotkey_map_item_play_toggle_value' | 'hotkey_map_item_seek_backward_description' | 'hotkey_map_item_seek_backward_value' | 'hotkey_map_item_seek_forward_description' | 'hotkey_map_item_seek_forward_value' | 'hotkey_map_item_fast_seek_backward_description' | 'hotkey_map_item_fast_seek_backward_value' | 'hotkey_map_item_fast_seek_forward_description' | 'hotkey_map_item_fast_seek_forward_value' | 'hotkey_map_item_rate_down_description' | 'hotkey_map_item_rate_down_value' | 'hotkey_map_item_rate_up_description' | 'hotkey_map_item_rate_up_value' | 'hotkey_map_item_prev_frame_description' | 'hotkey_map_item_prev_frame_value' | 'hotkey_map_item_next_frame_description' | 'hotkey_map_item_next_frame_value' | 'hotkey_map_item_jump_seek_description' | 'hotkey_map_item_jump_seek_value' | 'hotkey_map_item_subtitles_toggle_description' | 'hotkey_map_item_subtitles_toggle_value' | 'hotkey_map_item_prev_episode_description' | 'hotkey_map_item_prev_episode_pc_value' | 'hotkey_map_item_prev_episode_mac_value' | 'hotkey_map_item_next_episode_description' | 'hotkey_map_item_next_episode_pc_value' | 'hotkey_map_item_next_episode_mac_value' | 'hotkey_map_item_next_video_description' | 'hotkey_map_item_next_video_value' | 'hotkey_map_item_prev_video_description' | 'hotkey_map_item_prev_video_value' | 'waiting_live_day_value' | 'waiting_live_hour_value' | 'waiting_live_minute_value' | 'waiting_live_second_value' | 'waiting_live_colon' | 'waiting_live_upcoming_title' | 'waiting_live_timer_title' | 'waiting_live_recover_title' | 'waiting_record_title' | 'aria_label_submenu_traffic_saving' | 'aria_label_submenu_back' | 'aria_label_menu_quality' | 'aria_label_menu_rate' | 'aria_label_menu_subtitle' | 'aria_label_menu_download' | 'aria_label_new_tab_alert' | 'aria_label_menu_debug_overlay' | 'aria_label_menu_rotate' | 'aria_label_menu_loop' | 'aria_label_debug_panel' | 'aria_label_context_menu' | 'aria_label_video_player' | 'aria_label_spherical_control' | 'aria_label_menu_audio_languages' | 'aria_label_settings' | 'aria_label_autoplay' | 'menu_audio_languages' | 'audio_stream_display_language_label' | 'audio_stream_display_language_label_index' | 'audio_stream_display_label_index' | 'audio_stream_display_language_index' | 'audio_stream_display_unknown' | 'end_screen_next_video' | 'end_screen_recommended_video' | 'other_quality' | 'high_quality' | 'high_quality_description' | 'auto_quality_limit' | 'traffic_saving_quality' | 'traffic_saving_quality_description' | 'quality_applience' | 'quality_applience_action' | 'default_quality_for_any_video' | 'slow_video_notification_button' | 'slow_video_notification_force_description' | 'slow_video_notification_suggest_description' | 'double_forward_label';
 export type LanguagePack = Record<Key, string>;
 export type LanguageConfig = {
     language: string;

package/types/types/index.d.ts

@@ -12,7 +12,6 @@ import type { IUIStatistics } from '../services/statistics';
 import { UISentry } from '../services/sentry';
 import type { AdditionalContextMenuItem, AdditionalSettingsMenuItem } from '../components/Menus/subMenuTabs/types';
 import type { AdditionalDesktopControlPanelButton } from '../components/Controls/types';
-import type { AdmanInitParams } from '../components/Ads/types';
 export declare const enum UIType {
     DESKTOP = "desktop",
     MOBILE = "mobile"
@@ -166,6 +165,7 @@ export interface IVKVideoPlayerStatistics extends Partial<IUIStatistics> {
 export interface IVKVideoPlayerSentry extends Partial<UISentry> {
     config: ISDKConfig['ui']['sentry'];
 }
+export type AdsParams = Record<string, unknown>;
 export interface IVideoEpisodesNormalizedTimeline {
     from: number;
     width: number;
@@ -202,9 +202,8 @@ export interface IVideoDataBase {
     /**
      * duration используется только для инициализации адмана.
      */
-    duration?: AdmanInitParams['duration'];
-    adsParams?: AdmanInitParams['params'];
-    adsExternalApi?: AdmanInitParams['externalApi'];
+    duration?: number;
+    adsParams?: AdsParams;
     videoEpisodes?: IVideoEpisode[];
     previewThumbsData?: ITimelinePreviewThumbsData;
     isClip?: boolean;
@@ -269,7 +268,7 @@ export interface IVKVideoPlayerConfig {
     supportLink?: string;
     showAds?: boolean;
     adsSlotId?: number;
-    adsParams?: AdmanInitParams['params'];
+    adsParams?: AdsParams;
     /** @deprecated */
     adsPreviewParam?: number;
     adsAutoplayParam?: boolean;

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

@@ -1,39 +0,0 @@
-import type { Milliseconds } from '@vkontakte/videoplayer-shared';
-import type { Readable } from 'svelte/store';
-export type ExternalActions = {
-    switchFromAdsToVideo: (callPlay?: boolean) => void;
-    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;
-};
-export type IPlayerState = {
-    vsid: Readable<string | undefined>;
-};
-export interface IConfig {
-    loadTimeout: Milliseconds;
-    initTimeout: Milliseconds;
-    runtimeTimeout: Milliseconds;
-    useAdmanFromNPM: boolean;
-    volumeMultiplier: number;
-    isVsidOriginal: boolean;
-    usePuid: boolean;
-    debug: boolean;
-}