@vkontakte/videoplayer-core 2.0.123-dev.c995f51b.0 → 2.0.123-dev.d53feee8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.123-dev.c995f51b.0",
+  "version": "2.0.123-dev.d53feee8.0",
   "author": "vk.com",
   "description": "Videoplayer core library based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -49,7 +49,7 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-shared": "1.0.52-dev.7acf9a0b.0",
+    "@vkontakte/videoplayer-shared": "1.0.52-dev.7d7546b4.0",
     "hls.js": "~1.4.7"
   }
 }

package/types/player/Player.d.ts

@@ -88,7 +88,6 @@ export default class Player implements IPlayer {
         watchCoverageLive$: Subject<StartEnd<number>>;
         managedError$: Subject<IError>;
         fatalError$: Subject<IError>;
-        fetcherRecoverableError$: Subject<IError>;
         ended$: Subject<void>;
         looped$: Subject<number>;
         seeked$: Subject<void>;
@@ -99,13 +98,13 @@ export default class Player implements IPlayer {
         firstFrame$: Subject<number>;
         canplay$: Subject<number>;
         log$: Subject<ILogEntry>;
-        fetcherError$: Subject<IError>;
     };
     experimental: {
         element$: ValueSubject<HTMLVideoElement | undefined>;
         tuningConfigName$: ValueSubject<string[]>;
         enableDebugTelemetry$: ValueSubject<boolean>;
         dumpTelemetry: (receiver: (value: Record<string, any>) => void) => void;
+        getCurrentTime$: ValueSubject<null>;
     };
     constructor(tuning?: IOptionalTuningConfig, tracer?: ITracer);
     initVideo(config: IConfig): IPlayer;

package/types/player/types.d.ts

@@ -71,6 +71,8 @@ export interface IPlayer {
         tuningConfigName$: IValueSubject<string[]>;
         enableDebugTelemetry$: IValueSubject<boolean>;
         dumpTelemetry: (receiver: (value: Record<string, any>) => void) => void;
+        /** функция вычисления текущей позиции проигрывания из под провадера (если расчет нестандартный) */
+        getCurrentTime$: IValueSubject<(() => number) | null>;
     };
 }
 /**
@@ -187,10 +189,6 @@ export interface IPlayerEvents {
      * Логи для отладки
      */
     log$: IObservable<ILogEntry>;
-    /**
-     * Ошибки запроса данных, которые должны полечится перезапуском плеера
-     */
-    fetcherRecoverableError$: IObservable<IError>;
 }
 export interface IPlayerInfo {
     /**

package/types/providers/ChromecastProvider/ChromecastInitializer/index.d.ts

@@ -9,14 +9,15 @@ interface IParams {
     };
 }
 export declare class ChromecastInitializer implements IChromecastInitializer {
-    connection$: IValueSubject<IChromecastConnection | undefined>;
-    castState$: IValueSubject<ChromecastState>;
-    errorEvent$: ISubject<IError>;
+    readonly connection$: IValueSubject<IChromecastConnection | undefined>;
+    readonly castState$: IValueSubject<ChromecastState>;
+    readonly errorEvent$: ISubject<IError>;
     contentId?: string;
-    private realCastState$;
-    private subscription;
-    private log;
-    private params;
+    private readonly realCastState$;
+    private readonly subscription;
+    private readonly log;
+    private readonly params;
+    private isDestroyed;
     constructor(params: IParams);
     connect(): void;
     disconnect(): void;

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

@@ -15,6 +15,7 @@ export interface Gap extends IRange<Milliseconds> {
 }
 export declare class BufferManager {
     currentLiveSegmentServerLatency$: IValueSubject<number>;
+    currentLowLatencySegmentLength$: IValueSubject<number>;
     currentSegmentLength$: IValueSubject<number>;
     onLastSegment$: IValueSubject<boolean>;
     fullyBuffered$: IValueSubject<boolean>;
@@ -64,7 +65,8 @@ export declare class BufferManager {
     switchTo(newRepresentationId: Representation['id'], dropBuffer?: boolean): void | Promise<void | undefined>;
     switchToNew(newRepresentationId: Representation['id'], dropBuffer?: boolean): void;
     switchToOld: (param_0: string, param_1: boolean | undefined) => Promise<void | undefined>;
-    abort(): void;
+    warmUpMediaSource(): void;
+    abort(): Promise<boolean>;
     maintain(currentPosition?: Milliseconds | undefined): void;
     get lastDataObtainedTimestamp(): number;
     private searchGaps;

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

@@ -1,6 +1,6 @@
 import { HttpConnectionType } from '../../../player/types';
 import type ThroughputEstimator from '../../../utils/ThroughputEstimator';
-import { Byte, IValueSubject, Milliseconds, IRange, Subject, ITracer, IError } from '@vkontakte/videoplayer-shared';
+import { Byte, IValueSubject, Milliseconds, IRange, ITracer } from '@vkontakte/videoplayer-shared';
 import { CommonInit, GenericContainerParser, Segment, SegmentReference } from './types';
 export declare enum RangeMethod {
     HEADER = 0,
@@ -39,8 +39,6 @@ export declare class Fetcher {
     lastConnectionType$: IValueSubject<HttpConnectionType | undefined>;
     lastConnectionReused$: IValueSubject<boolean | undefined>;
     lastRequestFirstBytes$: IValueSubject<Milliseconds | undefined>;
-    recoverableError$: Subject<IError>;
-    error$: Subject<IError>;
     private abortAllController;
     private subscription;
     private compatibilityMode;
@@ -53,6 +51,5 @@ export declare class Fetcher {
     destroy(): void;
     private fetchByteRangeRepresentation;
     private fetchTemplateRepresentation;
-    private doFetch;
 }
 export declare const suppressAbort: (e: Error | unknown) => void | never;

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

@@ -3,7 +3,7 @@ import { CommonInit, Manifest, Representation, StreamKind, TextRepresentation }
 import StateMachine from '../../../utils/StateMachine/StateMachine';
 import type ThroughputEstimator from '../../../utils/ThroughputEstimator';
 import { ITuningConfig } from '../../../utils/tuningConfig';
-import { IError, ISubject, ITracer, IValueSubject, Milliseconds, Seconds, Subject } from '@vkontakte/videoplayer-shared';
+import { IError, ISubject, ITracer, IValueSubject, Milliseconds, Seconds } from '@vkontakte/videoplayer-shared';
 export declare enum State {
     NONE = "none",
     MANIFEST_READY = "manifest_ready",
@@ -53,8 +53,6 @@ export declare class Player {
     isActiveLowLatency$: IValueSubject<boolean>;
     currentStallDuration$: IValueSubject<Milliseconds>;
     videoLastDataObtainedTimestamp$: IValueSubject<Milliseconds>;
-    fetcherRecoverableError$: Subject<IError>;
-    fetcherError$: Subject<IError>;
     private liveBuffer;
     private isUpdatingLive;
     private isJumpGapAfterSeekLive;
@@ -71,7 +69,7 @@ export declare class Player {
     initRepresentations: (param_0: string, param_1: string | undefined, param_2: import("../../../player/types").URLSource | undefined) => Promise<void | undefined>;
     initBuffer(): void;
     switchRepresentation(kind: StreamKind, id: Representation['id'], dropBuffer?: boolean): Promise<void>;
-    seek(requestedPosition: Milliseconds, forcePrecise: boolean): void;
+    seek(requestedPosition: Milliseconds, forcePrecise: boolean): Promise<void>;
     stop(): void;
     setBufferTarget(time: Milliseconds): void;
     getStreams(): Manifest['streams'] | undefined;

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

@@ -6,6 +6,7 @@ declare class SourceBufferTaskQueue {
     private queue;
     private currentTask;
     private destroyed;
+    private abortRequested;
     constructor(buffer: SourceBuffer);
     append(data: BufferSource, signal?: AbortSignal): Promise<boolean>;
     remove(from: Milliseconds, to: Milliseconds, signal?: AbortSignal): Promise<boolean>;

package/types/providers/HlsLiveProvider/LiveTextManager.d.ts

@@ -0,0 +1,39 @@
+import { IInternalTextTrack } from '../../player/types';
+import { IValueSubject, Milliseconds, IError, ISubject } from '@vkontakte/videoplayer-shared';
+import { HLSManifestData } from '../HlsProvider/manifestDataExtractor';
+type FetchManifestData = (url: string, init?: RequestInit) => Promise<HLSManifestData>;
+export declare class LiveTextManager {
+    private readonly params;
+    private readonly subscription;
+    private readonly abortControllers;
+    /** в случае перемотки будет сохранена актуальная ссылка "наконечника" стрима */
+    private prepareUrl;
+    private currentTextTrackData;
+    availableTextTracks$: IValueSubject<IInternalTextTrack[] | null>;
+    getCurrentTime$: IValueSubject<(() => number) | null>;
+    error$: ISubject<IError>;
+    constructor(liveTime$: IValueSubject<Milliseconds | undefined>, video: HTMLVideoElement, fetchManifestData: FetchManifestData, sourceUrl: string, downloadThreshold: number);
+    destroy(): void;
+    /**
+     * одноименный метод из провайдера, который дергаем на перемотке,
+     * чтобы синхронизировать субтитры с видео\аудио дорожками
+     */
+    prepare(url: string): Promise<void>;
+    /** тут, на самом деле, мы получаем ссылку на плейлисты для текстовых треков */
+    processTextTracks(textTracks: IInternalTextTrack[], baseUrl: string): Promise<void>;
+    /**
+     * @todo - пока только с 1 стримом работает
+     */
+    private parseTextTracks;
+    /** парсим плейлист и получаем список треков */
+    private parsePlaylist;
+    /** забирает значение (value) строки в плейлисте */
+    private extractPlaylistRowValue;
+    /** обновляет ссылку на текущий сегмент субтитров для UI */
+    private processLiveTime;
+    /** догружает актуальные сабы */
+    private fetchNextManifestData;
+    private fetchManifestData;
+    private error;
+}
+export {};

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

@@ -13,6 +13,7 @@ export default class HlsLiveProvider implements IProvider {
     private video;
     private params;
     private textTracksManager;
+    private liveTextManager;
     private masterManifest;
     private manifests$;
     private maxSeekBackTime$;
@@ -26,5 +27,6 @@ export default class HlsLiveProvider implements IProvider {
     private playIfAllowed;
     private seek;
     private syncPlayback;
+    private generateLiveUrl;
 }
 export {};

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

@@ -17,5 +17,5 @@ type ExtractHLSManifestDataConfig = {
     manifestRetryInterval: number;
     manifestRetryMaxInterval: number;
 };
-declare const extractHLSManifestData: (masterManifestUrl: string, baseUrl: string | undefined, config: ExtractHLSManifestDataConfig) => Promise<HLSManifestData>;
+declare const extractHLSManifestData: (masterManifestUrl: string, baseUrl: string | undefined, config: ExtractHLSManifestDataConfig, init?: RequestInit) => Promise<HLSManifestData>;
 export default extractHLSManifestData;

package/types/providers/types.d.ts

@@ -80,8 +80,6 @@ export interface IProviderOutput {
     willSeekEvent$: ISubject<void>;
     seekedEvent$: ISubject<void>;
     error$: ISubject<IError>;
-    fetcherRecoverableError$: ISubject<IError>;
-    fetcherError$: ISubject<IError>;
     warning$: ISubject<IWarning>;
     endedEvent$: ISubject<void>;
     loopedEvent$: ISubject<Seconds>;
@@ -94,4 +92,5 @@ export interface IProviderOutput {
     inPiP$: IValueSubject<boolean>;
     inFullscreen$: IValueSubject<boolean>;
     playbackState$: IValueSubject<PlaybackState | string>;
+    getCurrentTime$: IValueSubject<(() => number) | null>;
 }

package/types/providers/utils/HTMLVideoElement/TextTrackManager.d.ts

@@ -14,6 +14,8 @@ declare class TextTrackManager {
     private subscription;
     private externalTracks;
     private internalTracks;
+    private baseURL?;
+    constructor(baseURL?: string);
     connect(video: HTMLVideoElement, desiredState: Pick<IDesiredState, 'externalTextTracks' | 'internalTextTracks' | 'currentTextTrack' | 'textTrackCuesSettings'>, providerOutput: Pick<IProviderOutput, 'availableTextTracks$' | 'currentTextTrack$' | 'error$'>): void;
     private subscribe;
     private applyCueSettings;

package/types/providers/utils/StallsManager.d.ts

@@ -25,6 +25,7 @@ declare class StallsManager {
     private predictedThroughputWithoutData;
     private qualityRestrictionTimer;
     private subscription;
+    severeStallOccurred$: IValueSubject<boolean>;
     connect(data: IConnectData): void;
     get videoMaxQualityLimit(): ExactVideoQuality | undefined;
     get predictedThroughput(): Kbps;

package/types/utils/buffer/isSourceBufferValid.d.ts

@@ -0,0 +1,3 @@
+import { Nullable } from '@vkontakte/videoplayer-shared';
+declare const _default: (mediaSource: Nullable<MediaSource>, sourceBuffer: Nullable<SourceBuffer>) => boolean;
+export default _default;

package/types/utils/tuningConfig.d.ts

@@ -1,7 +1,7 @@
 import { VideoFormat } from '../player/types';
 import { WebmCodecStrategy } from '../enums/WebmCodecStrategy';
 import { AndroidPreferredFormat } from '../enums/AndroidPreferredFormat';
-import { Byte, type ExactVideoQuality, Milliseconds, RecursivePartial, VideoQuality } from '@vkontakte/videoplayer-shared';
+import { Byte, type ExactVideoQuality, Milliseconds, RecursivePartial, Seconds, VideoQuality } from '@vkontakte/videoplayer-shared';
 export type ITuningConfig = {
     configName: string[];
     throughputEstimator: {
@@ -70,7 +70,6 @@ export type ITuningConfig = {
         bufferEmptinessTolerance: Milliseconds;
         useFetchPriorityHints: boolean;
         qualityLimitsOnStall: {
-            stallDurationBeforeQualityDecrease: Milliseconds;
             stallDurationNoDataBeforeQualityDecrease: Milliseconds;
             stallCountBeforeQualityDecrease: Milliseconds;
             resetQualityRestrictionTimeout: Milliseconds;
@@ -84,6 +83,7 @@ export type ITuningConfig = {
         normalizedLiveMinBufferSize: Milliseconds;
         normalizedActualBufferOffset: Milliseconds;
         offsetCalculationError: Milliseconds;
+        maxLiveDuration: Seconds;
         lowLatency: {
             maxTargetOffset: Milliseconds;
             maxTargetOffsetDeviation: Milliseconds;
@@ -184,7 +184,13 @@ export type ITuningConfig = {
     ignoreAudioRendererError: boolean;
     useEnableSubtitlesParam: boolean;
     useOldMSEDetection: boolean;
+    useHlsLiveNewTextManager: boolean;
     exposeInternalsToGlobal: boolean;
+    /**
+     * за какое время до конца текущих скачанных субтитров
+     * попробуем получить следующий сегмент субтитров
+     */
+    hlsLiveNewTextManagerDownloadThreshold: Milliseconds;
 };
 export type IOptionalTuningConfig = RecursivePartial<ITuningConfig> & {
     configName: ITuningConfig['configName'];