@vkontakte/videoplayer-core 2.0.161-dev.0b04a4c87.0 → 2.0.161-dev.34e0711e0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.161-dev.0b04a4c87.0",
+  "version": "2.0.161-dev.34e0711e0.0",
   "author": "vk.com",
   "description": "Videoplayer core library based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -42,6 +42,6 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-shared": "1.0.90-dev.0b04a4c87.0"
+    "@vkontakte/videoplayer-shared": "1.0.90-dev.34e0711e0.0"
   }
 }

package/types/providers/DashProvider/baseDashProvider.d.ts

@@ -6,7 +6,7 @@ import type { IProvider, IProviderParams } from "../types";
 import type { IObservableVideo } from "../utils/HTMLVideoElement/observable";
 import { TrackHistory } from "../../utils/autoSelectTrack";
 import type { IStateMachine } from "../../utils/StateMachine/types";
-import type { ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
+import type { ExactVideoQuality, ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
 import { Player } from "./lib/player";
 import { Scene3D } from "../../utils/3d/Scene3D";
 import DroppedFramesManager from "../utils/HTMLVideoElement/DroppedFramesManager";
@@ -19,6 +19,7 @@ type IParams = IProviderParams<IDashURLSource> & {
 	forceVideoCodec?: VideoCodec;
 	failedVideoTrack?: Nullable<IVideoTrack>;
 	isOnDemand?: boolean;
+	dashMaxTvVideoQuality?: Nullable<ExactVideoQuality>;
 };
 export default abstract class BaseDashProvider implements IProvider {
 	scene3D: Scene3D | undefined;

package/types/providers/DashProvider/lib/player.d.ts

@@ -5,7 +5,7 @@ import { StreamKind } from "../../utils/parsers/types";
 import StateMachine from "../../../utils/StateMachine/StateMachine";
 import type ThroughputEstimator from "../../../utils/ThroughputEstimator";
 import type { ITuningConfig } from "../../../utils/tuningConfig";
-import type { IError, ISubject, ITracer, IValueSubject, Milliseconds } from "@vkontakte/videoplayer-shared";
+import type { ExactVideoQuality, IError, ISubject, ITracer, IValueSubject, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
 import { abortable, Subject } from "@vkontakte/videoplayer-shared";
 export declare enum State {
 	NONE = "none",
@@ -20,6 +20,7 @@ export interface Params {
 	forceVideoCodec?: VideoCodec;
 	tracer: ITracer;
 	isOnDemand: boolean;
+	dashMaxTvVideoQuality: Nullable<ExactVideoQuality>;
 }
 export declare class Player {
 	private element;
@@ -83,6 +84,7 @@ export declare class Player {
 	private livePauseWatchdogSubscription;
 	private liveWasInterrupted;
 	private isOnDemand;
+	private dashMaxTvVideoQuality;
 	private destroyController;
 	constructor(params: Params);
 	initManifest: ReturnType<typeof abortable<[HTMLVideoElement, string, number]>>;

package/types/providers/DashProviderVirtual/baseDashProvider.d.ts

@@ -6,7 +6,7 @@ import type { IProvider, IProviderParams } from "../types";
 import type { IObservableVideo } from "../utils/HTMLVideoElement/observable";
 import { TrackHistory } from "../../utils/autoSelectTrack";
 import type { IStateMachine } from "../../utils/StateMachine/types";
-import type { ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
+import type { ExactVideoQuality, ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
 import { Scene3D } from "../../utils/3d/Scene3D";
 import DroppedFramesManager from "../utils/HTMLVideoElement/DroppedFramesManager";
 import TextTrackManager from "../utils/HTMLVideoElement/TextTrackManager";
@@ -19,6 +19,7 @@ type IParams = IProviderParams<IDashURLSource> & {
 	forceVideoCodec?: VideoCodec;
 	failedVideoTrack?: Nullable<IVideoTrack>;
 	isOnDemand?: boolean;
+	dashMaxTvVideoQuality?: Nullable<ExactVideoQuality>;
 };
 export default abstract class BaseDashProvider implements IProvider {
 	scene3D: Scene3D | undefined;

package/types/providers/DashProviderVirtual/lib/player/basePlayer.d.ts

@@ -71,6 +71,7 @@ export declare abstract class BasePlayer {
 	fetcherRecoverableError$: Subject<IError>;
 	fetcherError$: Subject<IError>;
 	private isOnDemand;
+	private dashMaxTvVideoQuality;
 	protected constructor(params: Params);
 	protected abstract prepareManifestUrlString(manifestBaseUrlString: string, offset: number): string;
 	protected abstract setSourceDuration(): void;

package/types/providers/DashProviderVirtual/lib/player/types.d.ts

@@ -1,7 +1,7 @@
 import type ThroughputEstimator from "../../../../utils/ThroughputEstimator";
 import type { ITuningConfig } from "../../../../utils/tuningConfig";
 import type { VideoCodec } from "../../../../player/types";
-import type { ITracer } from "@vkontakte/videoplayer-shared";
+import type { ExactVideoQuality, ITracer, Nullable } from "@vkontakte/videoplayer-shared";
 export declare enum State {
 	NONE = "none",
 	MANIFEST_READY = "manifest_ready",
@@ -15,4 +15,5 @@ export interface Params {
 	forceVideoCodec?: VideoCodec;
 	tracer: ITracer;
 	isOnDemand?: boolean;
+	dashMaxTvVideoQuality?: Nullable<ExactVideoQuality>;
 }

package/types/providers/DashProviderVirtual/lib/utils.d.ts

@@ -1,6 +1,6 @@
 import type { Representation, Segment, SegmentReference, Stream, TemplateSegment, TemplateSegmentReference, TextRepresentation } from "../../utils/parsers/types";
 import type { IAudioStream, IAudioTrack, IInternalTextTrack, IVideoStream, IVideoTrack } from "../../../player/types";
-export declare const representationToVideoTrack: ({ id, width, height, bitrate, fps, quality: qualityString, streamId }: Representation) => IVideoTrack | undefined;
+export declare const representationToVideoTrack: ({ id, width, height, bitrate, fps, quality: qualityString, streamId, tvDisabled }: Representation) => IVideoTrack | undefined;
 export declare const representationToAudioTrack: ({ id, bitrate }: Representation) => IAudioTrack;
 export declare const representationToTextTrack: ({ language, label }: Stream, { id, url, isAuto }: Representation & {
 	url: string;

package/types/providers/HlsProvider/index.d.ts

@@ -18,7 +18,7 @@ export default class HlsProvider implements IProvider {
 	private subscribe;
 	destroy(): void;
 	private prepare;
-	private playIfAllowed;
+	protected playIfAllowed(): void;
 	private seek;
 	private syncPlayback;
 }

package/types/providers/MpegProvider/index.d.ts

@@ -13,7 +13,7 @@ export default class MpegProvider implements IProvider {
 	private subscribe;
 	destroy(): void;
 	private prepare;
-	private playIfAllowed;
+	protected playIfAllowed(): void;
 	private seek;
 	private syncPlayback;
 	private handleQualityLimitTransition;

package/types/providers/ProviderContainer/index.d.ts

@@ -36,6 +36,7 @@ export default class ProviderContainer implements IProviderContainer {
 	private failoverIndex;
 	private currentFailedVideoTrack;
 	private volumeMultiplierManager;
+	private dashMaxTvVideoQuality;
 	constructor(params: IParams);
 	init(): void;
 	destroy(): void;

package/types/providers/utils/Abr/rules/video/upperLimitRule.d.ts

@@ -3,10 +3,67 @@ import type { IVideoTrack } from "../../../../../player/types";
 import type { Nullable, QualityLimits, VideoQuality } from "@vkontakte/videoplayer-shared";
 import { type ExactVideoQuality } from "@vkontakte/videoplayer-shared";
 import { LimitAboveRule } from "../limitAboveRule";
-type UpperLimitsLogsArgs = [limitsAreInvalid: boolean, lowestAvailableQuality: Nullable<ExactVideoQuality>, highestAvailableQuality: Nullable<ExactVideoQuality>, visible: boolean, limits: QualityLimits, backgroundVideoQualityLimit: VideoQuality];
+type UpperLimitsLogsArgs = [limitsAreInvalid: boolean, lowestAvailableQuality: Nullable<ExactVideoQuality>, highestAvailableQuality: Nullable<ExactVideoQuality>, visible: boolean, limits: QualityLimits, backgroundVideoQualityLimit: VideoQuality, effectiveType: string | undefined, connectionDataQualityLimit: ExactVideoQuality | undefined];
+/**
+* Правило верхнего ограничения качества в авто-ABR. Из списка `videoTracksDesc`
+* (отсортирован от высшего к низшему) выбирает самый высокий трек, который
+* одновременно удовлетворяет ВСЕМ активным лимитам сверху. Если подходящего
+* нет — возвращает минимально доступный трек (graceful fallback).
+*
+* Источники лимитов сверху (действуют совместно, победитель — самый строгий):
+*
+* 1. `context.limits.max` — явный пользовательский/интеграционный лимит.
+*    Приходит из публичного API `Player.setAutoQualityLimits({ max, min })`
+*    (см. `packages/core/src/player/Player.ts`). Слой UI/интеграция пробрасывает
+*    его в `desiredState.autoVideoTrackLimits` → `AbrManager.updateContext({ limits })`
+*    → `IVideoAbrContext.limits`. `undefined` в `limits` или `limits.max` снимает
+*    лимит. Значение типа `ExactVideoQuality` (например, '720p'), трактуется
+*    включительно (`<=`). Если лимиты невалидны (min > max, либо min выше
+*    highestAvailable, либо max ниже lowestAvailable) — см. `areLimitsInvalid` —
+*    лимит игнорируется целиком, чтобы не заблокировать воспроизведение.
+*
+*    Реальные кейсы:
+*    - Пользователь в настройках плеера выбрал пресет «Экономия трафика»
+*      (`PredefinedQualityLimits.TRAFFIC_SAVING`) — хост передаёт
+*      `{ max: tuning.autoTrackSelection.trafficSavingLimit }` (Q_480P).
+*    - Хост-приложение (мини-апп ВК, лента) ограничивает качество для
+*      превью/фонового воспроизведения.
+*    - A/B-эксперимент или бизнес-правило режет качество для конкретной
+*      категории видео / региона / тарифа.
+*
+* 2. `tuning.autoTrackSelection.backgroundVideoQualityLimit` — применяется
+*    только когда `context.visible === false` (плеер вне viewport, по данным
+*    `elementVisible$` из `observeElementVisibility`, порог — `activeVideoAreaThreshold`).
+*
+*    Реальные кейсы: автовоспроизведение в ленте при прокрутке мимо плеера,
+*    PiP/мини-плеер в фоне, неактивная вкладка.
+*
+* 3. `effectiveType` из Network Information API (`navigator.connection`).
+*    Активируется `tuning.dash.useConnectionDataUpperLimit`.
+*    Приоритет разрешения в `connectionDataQualityLimit`:
+*      a. `effectiveType ∈ {'2g', 'slow-2g'}` → `tuning.dash.saveData2gQualityLimit`
+*         (Q_360P) — жёсткий лимит на очень слабой сети.
+*      b. `effectiveType === '3g'` → `tuning.dash.saveData3gQualityLimit` (Q_480P).
+*      c. Иначе — без ограничения.
+*
+*    Network Information API доступен только в Chromium (Android, десктоп Chrome/Edge/
+*    Opera/Samsung Internet, Android WebView). В Firefox, Safari и Chrome iOS
+*    (WebKit) `navigator.connection === undefined` — этот источник лимита
+*    неактивен, правило работает только по п.1 и п.2.
+*
+*    Реальные кейсы: пользователь в метро / зоне слабого сигнала, пользователь
+*    на edge/3G-тарифе.
+*
+* Все три источника комбинируются операцией AND: трек проходит, если
+* `fitsLimits && fitsBackgroundVideoQualityLimit && fitsSaveDataLimit`. Поэтому
+* итоговый потолок = минимум из активных. Нижнюю границу закрывает
+* `LowerLimitRule` (поле `limits.min` здесь не используется).
+*/
 export declare class UpperLimitsRule extends LimitAboveRule<IVideoTrack, IVideoAbrContext, UpperLimitsLogsArgs> implements IAbrRule<IVideoTrack, IVideoAbrContext> {
 	constructor(confidence: RuleConfidence);
 	execute(context: IVideoAbrContext): IAbrRuleResolution<IVideoTrack>;
-	protected createLogMessage(selectedTrack: IVideoTrack, limitsAreInvalid: boolean, lowestAvailableQuality: Nullable<ExactVideoQuality>, highestAvailableQuality: Nullable<ExactVideoQuality>, visible: boolean, limits: QualityLimits, backgroundVideoQualityLimit: VideoQuality): string;
+	protected createLogMessage(selectedTrack: IVideoTrack, limitsAreInvalid: boolean, lowestAvailableQuality: Nullable<ExactVideoQuality>, highestAvailableQuality: Nullable<ExactVideoQuality>, visible: boolean, limits: QualityLimits, backgroundVideoQualityLimit: VideoQuality, effectiveType: string | undefined, connectionDataQualityLimit: ExactVideoQuality | undefined): string;
+	private getConnection;
+	private resolveConnectionDataQualityLimit;
 }
 export {};

package/types/utils/dashMaxTvVideoQuality.d.ts

@@ -0,0 +1,7 @@
+import { VideoFormat } from "../player/types";
+import type { Manifest } from "../providers/utils/parsers/types";
+import type { ExactVideoQuality, IError } from "@vkontakte/videoplayer-shared";
+import { VideoQuality } from "@vkontakte/videoplayer-shared";
+export declare const getDashMaxTvVideoQuality: (e: IError, videoFormat?: VideoFormat, currentQuality?: VideoQuality) => ExactVideoQuality | null;
+/** @mutates streams.video */
+export declare const markDashMaxTvVideoQuality: (streams: Manifest["streams"], dashMaxTvVideoQuality: ExactVideoQuality) => void;

package/types/utils/tuningConfig.d.ts

@@ -160,8 +160,12 @@ export type ITuningConfig = {
 		useNewFailoverLogic: boolean;
 		useFailoverHostsOnAllProviderCrash: boolean;
 		videoTrackBanAfterProviderFail: Milliseconds;
+		saveData3gQualityLimit: ExactVideoQuality;
+		saveData2gQualityLimit: ExactVideoQuality;
+		useConnectionDataUpperLimit: boolean;
 		videoStreamRepresentaionsFilter: [VideoQuality, number, VideoCodec][];
 		filterOnDemandQualityList: boolean;
+		dashMaxTvVideoQuality: boolean;
 	};
 	dashCmafLive: {
 		externalStopControl: boolean;
@@ -340,6 +344,10 @@ export type ITuningConfig = {
 	* Очищаем кэш урлов при падение провайдера.
 	*/
 	dropUrlCacheWhenProviderCrashed?: boolean;
+	/**
+	* При смене/реините провайдера игнорируем результат того, смогло видео заиграть или нет.
+	*/
+	ignoreForcePlayResultWhenProviderChanged?: boolean;
 	hls: {
 		filterOnDemandQualityList: boolean;
 	};