@vkontakte/videoplayer 1.1.100-dev.2cfd41de6.0 → 1.1.100-dev.adb464b3a.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer",
-  "version": "1.1.100-dev.2cfd41de6.0",
+  "version": "1.1.100-dev.adb464b3a.0",
   "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.169-dev.2cfd41de6.0",
-    "@vkontakte/videoplayer-interactive": "1.0.75-dev.2cfd41de6.0",
-    "@vkontakte/videoplayer-shared": "1.0.98-dev.2cfd41de6.0",
-    "@vkontakte/videoplayer-statistics": "1.0.115-dev.2cfd41de6.0"
+    "@vkontakte/videoplayer-core": "2.0.169-dev.adb464b3a.0",
+    "@vkontakte/videoplayer-interactive": "1.0.75-dev.adb464b3a.0",
+    "@vkontakte/videoplayer-shared": "1.0.98-dev.adb464b3a.0",
+    "@vkontakte/videoplayer-statistics": "1.0.115-dev.adb464b3a.0"
   }
 }

package/types/store/composition.d.ts

@@ -2,7 +2,7 @@ import type { IUIConfig } from "../config";
 import type { IVKVideoPlayerConfig } from "../types";
 import type { IUIStatistics } from "../services/statistics";
 import type { IStore } from "./index";
-import type { FakeIsPlayingStore, GraphIsOpenedStore, HighlightedMenuItemsStore, InteractiveControlsOpacityStore, LanguageStore, NotificationsStore, PictureInPictureStore, IQoeStore, SeekToInteractiveDisabledTooltipStore, ShowInteractiveTimeIndicatorTooltipStore, SubtitlesStore, QualityStore, PlaybackRateStore } from "./modules";
+import type { FakeIsPlayingStore, GraphIsOpenedStore, HighlightedMenuItemsStore, InteractiveControlsOpacityStore, LanguageStore, NotificationsStore, PictureInPictureStore, IQoeStore, SeekToInteractiveDisabledTooltipStore, ShowInteractiveTimeIndicatorTooltipStore, SubtitlesStore, QualityStore, PlaybackRateStore, AudioVideoStreamsStore } from "./modules";
 import type { AppTracer, ITracer } from "@vkontakte/videoplayer-shared";
 import type { Interactives } from "@vkontakte/videoplayer-interactive";
 export interface ICompositionParams {
@@ -29,6 +29,7 @@ export interface ICompositionResult {
 		subtitlesStore: SubtitlesStore;
 		qualityStore: QualityStore;
 		playbackRateStore: PlaybackRateStore;
+		audioVideoStreamsStore: AudioVideoStreamsStore;
 	};
 	/** Очистка ресурсов */
 	destroy(): void;

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

@@ -0,0 +1,3 @@
+import type { Module } from "../utils";
+import { type AudioVideoStreamsStore } from "./audioVideoStreamsStore.store";
+export declare const audioVideoStreamsModule: Module<AudioVideoStreamsStore>;

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

@@ -0,0 +1,43 @@
+import type { Readable } from "svelte/store";
+import type { IAudioStream, IPlayer, IVideoStream } from "@vkontakte/videoplayer-core";
+import type { ISubscription, ITracer } from "@vkontakte/videoplayer-shared";
+import type { IVKVideoPlayerCallbacks } from "../../../types";
+export interface AudioVideoStreamsStoreDeps {
+	/** Плеер */
+	player: IPlayer;
+	/** Трассировщик */
+	tracer: ITracer;
+	/** Общий subscription для rxjs-подписок */
+	subscription: ISubscription;
+	/** ID текущего видео */
+	videoId$: Readable<number | undefined>;
+	/** Коллбэки плеера */
+	callbacks?: IVKVideoPlayerCallbacks;
+	/** Включены ли аудио-языки */
+	audioLanguagesEnabled: boolean;
+	chooseFirstAudioStreamFromAdaptationSet: boolean;
+	/** Включено ли сохранение пользовательских предпочтений для видео */
+	userVideoPrefsEnabled: boolean;
+	/** Соль для пользовательских предпочтений */
+	userSalt: string;
+	canSavePreferredState: (external: boolean) => boolean;
+}
+export interface AudioVideoStreamsStoreState {
+	availableVideoStreams$: Readable<IVideoStream[]>;
+	availableAudioStreams$: Readable<IAudioStream[]>;
+	videoStream$: Readable<IVideoStream | undefined>;
+	audioStream$: Readable<IAudioStream | undefined>;
+}
+export interface AudioVideoStreamsStoreActions {
+	setVideoStream: (stream: IVideoStream) => void;
+	setAudioStream: (stream: IAudioStream) => void;
+}
+export interface AudioVideoStreamsStoreExternalActions {
+	changeAudioStream: (id: string) => void;
+}
+export interface AudioVideoStreamsStore {
+	state: AudioVideoStreamsStoreState;
+	actions: AudioVideoStreamsStoreActions;
+	externalActions: AudioVideoStreamsStoreExternalActions;
+}
+export declare const createAudioVideoStreamsStore: (deps: AudioVideoStreamsStoreDeps) => AudioVideoStreamsStore;

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

@@ -0,0 +1,3 @@
+import { InjectionToken } from "@vkontakte/videoplayer-shared";
+import type { AudioVideoStreamsStore } from "./audioVideoStreamsStore.store";
+export declare const AUDIO_VIDEO_STREAMS_STORE_TOKEN: InjectionToken<AudioVideoStreamsStore>;

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

@@ -0,0 +1,3 @@
+export { createAudioVideoStreamsStore, type AudioVideoStreamsStoreDeps, type AudioVideoStreamsStoreState, type AudioVideoStreamsStoreActions, type AudioVideoStreamsStoreExternalActions, type AudioVideoStreamsStore } from "./audioVideoStreamsStore.store";
+export { audioVideoStreamsModule } from "./audioVideoStreamsStore.module";
+export { AUDIO_VIDEO_STREAMS_STORE_TOKEN } from "./audioVideoStreamsStore.token";

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

@@ -27,3 +27,5 @@ export type { QualityStoreDeps, QualityStoreState, QualityStore } from "./qualit
 export { qualityModule, QUALITY_STORE_TOKEN } from "./qualityStore";
 export type { PlaybackRateStoreDeps, PlaybackRateStoreState, PlaybackRateStoreActions, PlaybackRateStore } from "./playbackRateStore";
 export { playbackRateModule, PLAYBACK_RATE_STORE_TOKEN } from "./playbackRateStore";
+export type { AudioVideoStreamsStoreDeps, AudioVideoStreamsStoreState, AudioVideoStreamsStoreActions, AudioVideoStreamsStoreExternalActions, AudioVideoStreamsStore } from "./audioVideoStreamsStore";
+export { audioVideoStreamsModule, AUDIO_VIDEO_STREAMS_STORE_TOKEN } from "./audioVideoStreamsStore";

package/types/store/types.d.ts

@@ -1,4 +1,4 @@
-import type { ChromecastState, IAudioStream, IConfig as ICoreInitVideoConfig, IExternalTextTrack, IOptionalTuningConfig, IPlayer, ISources, IVideoStream, PlaybackState, VideoFormat } from "@vkontakte/videoplayer-core";
+import type { ChromecastState, IConfig as ICoreInitVideoConfig, IExternalTextTrack, IOptionalTuningConfig, IPlayer, ISources, 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 } from "@vkontakte/videoplayer-shared";
 import type { SeekAction, ThinOneStat } from "@vkontakte/videoplayer-statistics";
@@ -153,10 +153,6 @@ export interface IPlayerState {
 	isEnded$: Readable<boolean>;
 	volume$: Readable<number>;
 	muted$: Readable<boolean>;
-	availableVideoStreams$: Readable<IVideoStream[]>;
-	availableAudioStreams$: Readable<IAudioStream[]>;
-	videoStream$: Readable<IVideoStream | undefined>;
-	audioStream$: Readable<IAudioStream | undefined>;
 	currentPlaybackRate$: Readable<number>;
 	previewThumbsData$: Writable<ITimelinePreviewThumbsData | undefined>;
 	chromecastState$: Readable<ChromecastState>;
@@ -198,8 +194,6 @@ export interface IStoreInternalActions {
 	closeSettingsMenu: (fromSubMenu?: boolean) => void;
 	openSettingsSubMenu: (name: string, ref: HTMLElement) => void;
 	closeSettingsSubMenu: (ref: HTMLElement, isClosing?: boolean) => void;
-	setAudioStream: (stream: IAudioStream) => void;
-	setVideoStream: (stream: IVideoStream) => void;
 	setVolume: (volume: number) => void;
 	setMuted: (muted: boolean) => void;
 	startVolumeChanging: () => void;
@@ -274,7 +268,6 @@ export interface IStoreExternalActions {
 	setLiveLowLatency: (isLowLatency: boolean) => void;
 	hideControls: () => void;
 	showControls: () => void;
-	changeAudioStream: (id: string) => void;
 	setMinimalView: (enabled: boolean) => void;
 	toggleFullscreen: () => void;
 }