@vkontakte/videoplayer 1.1.74-dev.2444f53a.0 → 1.1.74-dev.d2cefd48.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer",
-  "version": "1.1.74-dev.2444f53a.0",
+  "version": "1.1.74-dev.d2cefd48.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.2444f53a.0",
-    "@vkontakte/videoplayer-interactive": "1.0.49-dev.2444f53a.0",
-    "@vkontakte/videoplayer-shared": "1.0.71-dev.2444f53a.0",
-    "@vkontakte/videoplayer-statistics": "1.0.89-dev.2444f53a.0"
+    "@vkontakte/videoplayer-core": "2.0.143-dev.d2cefd48.0",
+    "@vkontakte/videoplayer-interactive": "1.0.49-dev.d2cefd48.0",
+    "@vkontakte/videoplayer-shared": "1.0.71-dev.d2cefd48.0",
+    "@vkontakte/videoplayer-statistics": "1.0.89-dev.d2cefd48.0"
   }
 }

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

@@ -1,39 +1,9 @@
-import type { Readable } from 'svelte/store';
 import type { AdsTimeRemained } from '../../types';
 import { AdsSection } from '../../types';
-import type { AdsParams } from '../../types';
-import { type ILogger, type Milliseconds } from '@vkontakte/videoplayer-shared';
+import { type ILogger } from '@vkontakte/videoplayer-shared';
 import { Subject } from '@vkontakte/videoplayer-shared';
 import type { IAdsState } from '../../store';
-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;
-}
+import type { AdmanInitParams, ExternalActions, IConfig, IPlayerState } from './types';
 export declare class AdmanWrapper {
     private adman;
     private initialVolume;
@@ -50,8 +20,8 @@ export declare class AdmanWrapper {
     private runtimeTimeout;
     private useAdmanFromNPM;
     private isVsidOriginal;
-    private usePuid;
     private watchDogTimeout;
+    private externalApi?;
     events: {
         init$: Subject<number>;
         loadStarted$: Subject<void>;
@@ -76,7 +46,7 @@ export declare class AdmanWrapper {
     loadAdmanMailRu: (abortSignal: AbortSignal) => Promise<void>;
     private loadAdmanNPM;
     onAdmanLoadingError(): void;
-    initAdman(initParams: AdmanInitParams): void;
+    initAdman(initParams: AdmanInitParams): Promise<void>;
     private switchToVideo;
     private setPostrollPassed;
     togglePlay(): void;
@@ -103,5 +73,5 @@ export declare class AdmanWrapper {
     skip(): void;
     setPosition(position: number, duration: number): void;
     destroy(): void;
+    private safeExternalCall;
 }
-export {};

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

@@ -0,0 +1,37 @@
+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;
+}

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

@@ -1,10 +1,11 @@
 import type { IExternalTextTrack, ISources, PlaybackRate } from '@vkontakte/videoplayer-core';
 import type { IStore } from '../../store';
-import type { AdsParams, IMicroStoresRoot, IVideoLive, IVKVideoPlayerConfig } from '../../types';
+import type { 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;
@@ -26,8 +27,9 @@ export interface RootProps {
     canRewindLive: boolean;
     showAds: boolean;
     adsSlotId?: number | undefined;
-    adsParams?: AdsParams | undefined;
+    adsParams?: AdmanInitParams['params'];
     adsAutoplayParam?: boolean;
+    adsExternalApi?: AdmanInitParams['externalApi'];
     duration?: number | undefined;
     logoClickable: boolean;
     logoHidden: boolean;

package/types/config.d.ts

@@ -8,6 +8,8 @@ type ForceOrRelay = boolean | undefined;
 export declare enum LogoType {
     VK = "vk",
     VK_VIDEO = "vk_video",
+    APP_STORE = "app_store",
+    PLAY_MARKET = "play_market",
     VK_VIDEO_MOBILE = "vk_video_mobile"
 }
 export interface IUIConfig {
@@ -40,7 +42,6 @@ export interface IUIConfig {
         useAdmanFromNPM: boolean;
         volumeMultiplier: number;
         isVsidOriginal: boolean;
-        usePuid: boolean;
     };
     /**
      * Если нет ранее сохранённого значения громкости будет использовано это
@@ -77,6 +78,7 @@ export interface IUIConfig {
     };
     hideThumbTimerAfterTouch: boolean;
     preventPauseOnVideoClick: boolean;
+    returnFocusOnControlsHide: boolean;
     sentry: {
         dsn: string;
         sampleRate: number;

package/types/index.d.ts

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

package/types/store/utils.d.ts

@@ -12,7 +12,7 @@ export declare const getMicroStores: () => IMicroStores;
  */
 export declare const storeFromObservable: <T>(observable$: IValueObservable<T>, onNewValueEmitted?: (value: T) => void) => Readable<T>;
 export declare const storeFromObservableWithInitValue: <T>(observable$: IObservable<T>, initValue: T, onNewValueEmitted?: (value: T) => void) => Readable<T>;
-export declare const constructDebugTextData: (player: IPlayer, config: IConfig | undefined, store: IStore, traceId: string) => string;
+export declare const constructDebugTextData: (player: IPlayer, config: IConfig, store: IStore, traceId: string) => string;
 export type DebugData = {
     version: string;
     viewport: string;

package/types/types/index.d.ts

@@ -12,6 +12,7 @@ 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"
@@ -165,7 +166,6 @@ 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,8 +202,9 @@ export interface IVideoDataBase {
     /**
      * duration используется только для инициализации адмана.
      */
-    duration?: number;
-    adsParams?: AdsParams;
+    duration?: AdmanInitParams['duration'];
+    adsParams?: AdmanInitParams['params'];
+    adsExternalApi?: AdmanInitParams['externalApi'];
     videoEpisodes?: IVideoEpisode[];
     previewThumbsData?: ITimelinePreviewThumbsData;
     isClip?: boolean;
@@ -268,7 +269,7 @@ export interface IVKVideoPlayerConfig {
     supportLink?: string;
     showAds?: boolean;
     adsSlotId?: number;
-    adsParams?: AdsParams;
+    adsParams?: AdmanInitParams['params'];
     /** @deprecated */
     adsPreviewParam?: number;
     adsAutoplayParam?: boolean;

package/types/utils/dom.d.ts

@@ -1,2 +1,3 @@
 export declare function matchesSelector(el: HTMLElement, selector: string): boolean;
 export declare function isHover(el: HTMLElement): boolean;
+export declare function getShadowActiveElement(): Element | null;

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

@@ -1 +0,0 @@
-export declare const getPuid10Val: (width: number, height: number) => number;