@vkontakte/videoplayer-core 2.0.63 → 2.0.66

package/index.d.ts

@@ -2,8 +2,7 @@ import { VideoFormat, IMpegSource, IDashSource, IHLSSource, IDashURLSource, IHLS
 import Player from "./player/Player";
 import { IPlayer, PlaybackState, IPlayerInfo, IPlayerEvents, IConfig, ISources, ICueSettings, ChromecastState, HttpConnectionType, IExternalTextTrack, ITextTrack } from "./player/types";
 import { VideoQuality, ExactVideoQuality } from "./utils/quality/types";
-import { IRange } from "./utils/range";
-import type { ISubscription, IUnsubscriber, IEmitter, IObservable, IValueObservable, IValue, IOperator, IListener, ILogEntry } from '@vkontakte/videoplayer-shared';
+import type { ISubscription, IUnsubscriber, IEmitter, IObservable, IValueObservable, IValue, IOperator, IListener, ILogEntry, IRange } from '@vkontakte/videoplayer-shared';
 import { Subscription, Observable, Subject, ValueSubject } from '@vkontakte/videoplayer-shared';
 /**
  * Версия sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.63",
+  "version": "2.0.66",
   "author": "vk.com",
   "description": "Videoplayer core library based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -14,7 +14,7 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-shared": "^1.0.14",
+    "@vkontakte/videoplayer-shared": "^1.0.15",
     "dashjs": "4.4.0",
     "hls.js": "1.1.5",
     "lodash": "4.17.21"

package/packages/sdk/src/providers/DashVKProvider/lib/buffer.d.ts

@@ -1,13 +1,13 @@
 import { ITuningConfig } from "../../../utils/tuningConfig";
-import { IError, ISubject, IValueSubject, Milliseconds } from '@vkontakte/videoplayer-shared';
+import { IError, IRange, ISubject, IValueSubject, Milliseconds } from '@vkontakte/videoplayer-shared';
 import type { Fetcher } from './fetcher';
-import { Container, Range, Representation, RepresentationKind } from './types';
+import { Container, Representation, RepresentationKind } from './types';
 export interface Dependencies {
     fetcher: Fetcher;
     tuning: ITuningConfig;
     getCurrentPosition: () => Milliseconds | undefined;
 }
-export interface Gap extends Range<Milliseconds> {
+export interface Gap extends IRange<Milliseconds> {
     representation: Representation['id'];
 }
 export declare class BufferManager {

package/packages/sdk/src/providers/DashVKProvider/lib/fetcher.d.ts

@@ -1,7 +1,7 @@
 import { HttpConnectionType } from "../../../player/types";
-import { GenericContainerParser, Representation, Segment } from './types';
 import type ThroughputEstimator from "../../../utils/ThroughputEstimator";
-import { Byte, IValueSubject, Milliseconds } from '@vkontakte/videoplayer-shared';
+import { Byte, IValueSubject, Milliseconds, IRange } from '@vkontakte/videoplayer-shared';
+import { GenericContainerParser, Segment, SegmentReference } from './types';
 export declare enum RangeMethod {
     HEADER = 0,
     PARAM = 1
@@ -12,12 +12,17 @@ export interface IParams {
 }
 export declare type Priority = 'high' | 'low' | 'auto';
 export interface FetchParams {
-    method?: RangeMethod;
+    range?: IRange<Byte>;
+    rangeMethod?: RangeMethod;
     onProgress?: (view: DataView, loaded: Byte) => void;
     signal?: AbortSignal;
     priority?: Priority;
     measureThroughput?: boolean;
 }
+export declare type RepresentationFetchResult = {
+    segments: Segment[];
+    dataView: DataView;
+};
 export declare class Fetcher {
     private throughputEstimator;
     private requestQuic;
@@ -29,11 +34,10 @@ export declare class Fetcher {
     constructor({ throughputEstimator, requestQuic }: IParams);
     private onHeadersReceived;
     fetchManifest: (param_0: string) => Promise<string | null | undefined>;
-    fetchRange: (param_0: string, param_1: number, param_2: number, param_3: FetchParams) => Promise<ArrayBuffer | null | undefined>;
-    fetchRepresentation: (param_0: Representation, param_1: GenericContainerParser<unknown>, param_2?: Priority | undefined, param_3?: number | undefined) => Promise<{
-        segments: Segment[];
-        dataView: DataView;
-    } | null | undefined>;
+    fetch: (param_0: string, param_1: FetchParams) => Promise<ArrayBuffer | null | undefined>;
+    fetchRepresentation(segmentReference: SegmentReference, parser: GenericContainerParser<unknown>, priority?: Priority): Promise<RepresentationFetchResult | null>;
     destroy(): void;
+    private fetchByteRangeRepresentation;
+    private fetchTemplateRepresentation;
 }
 export declare const suppressAbort: (e: Error | unknown) => void;

package/packages/sdk/src/providers/DashVKProvider/lib/mpd.d.ts

@@ -1,2 +1,2 @@
 import { Manifest } from './types';
-export declare const parse: (text: string, url: string) => Manifest;
+export declare const parse: (text: string, manifestUrl: string) => Manifest;

package/packages/sdk/src/providers/DashVKProvider/lib/sourceBufferTaskQueue.d.ts

@@ -9,7 +9,7 @@ declare class SourceBufferTaskQueue {
     constructor(buffer: SourceBuffer);
     append(data: BufferSource, signal?: AbortSignal): Promise<boolean>;
     remove(from: Milliseconds, to: Milliseconds, signal?: AbortSignal): Promise<boolean>;
-    abort(): Promise<boolean>;
+    abort(init?: BufferSource): Promise<boolean>;
     destroy(): void;
     private completeTask;
     private pull;

package/packages/sdk/src/providers/types.d.ts

@@ -1,10 +1,9 @@
 import { QualityLimits } from "../utils/quality/types";
 import { ITuningConfig } from "../utils/tuningConfig";
-import { ILogger, ISubject, IValueSubject, Milliseconds, Seconds, IError } from '@vkontakte/videoplayer-shared';
+import { ILogger, ISubject, IValueSubject, Milliseconds, Seconds, IRange, IError } from '@vkontakte/videoplayer-shared';
 import { IChromecastInitializer } from "./ChromecastProvider/ChromecastInitializer/types";
 import { HttpConnectionType, ICueSettings, SeekState } from "../player/types";
 import { IExternalTextTrack, ITextTrack, IVideoTrack, IVolumeState, PlaybackState } from "../player/types";
-import { IRange } from "../utils/range";
 import { IStateMachine } from "../utils/StateMachine/types";
 import ThroughputEstimator from "../utils/ThroughputEstimator";
 export interface IProvider {

package/packages/sdk/src/utils/buffer/types.d.ts

@@ -1,5 +1,4 @@
-import { Seconds } from '@vkontakte/videoplayer-shared';
-import { IRange } from "../range";
+import { Seconds, IRange } from '@vkontakte/videoplayer-shared';
 export interface IVideoBuffer extends IRange<Seconds> {
     i: number;
 }

package/player/Player.d.ts

@@ -1,6 +1,5 @@
-import { HttpConnectionType, ICueSettings } from "./types";
+import { HttpConnectionType, ICueSettings, StartEnd } from "./types";
 import { QualityLimits, VideoQuality } from "../utils/quality/types";
-import { IRange } from "../utils/range";
 import { IOptionalTuningConfig } from "../utils/tuningConfig";
 import { IError, ILogEntry, Seconds, Subject, ValueSubject } from '@vkontakte/videoplayer-shared';
 import { ChromecastState, IConfig, IExternalTextTrack, IPlayer, ISeekRequest, ITextTrack, PlaybackState, StartStatus, VideoFormat } from './types';
@@ -29,7 +28,7 @@ export default class Player implements IPlayer {
         isAutoQualityEnabled$: ValueSubject<boolean>;
         autoQualityLimitingAvailable$: ValueSubject<boolean>;
         autoQualityLimits$: ValueSubject<QualityLimits>;
-        currentBuffer$: ValueSubject<IRange<number> | undefined>;
+        currentBuffer$: ValueSubject<StartEnd<number> | undefined>;
         isBuffering$: ValueSubject<boolean>;
         isStalled$: ValueSubject<boolean>;
         isEnded$: ValueSubject<boolean>;
@@ -59,8 +58,8 @@ export default class Player implements IPlayer {
         willPause$: Subject<void>;
         willResume$: Subject<void>;
         willDestruct$: Subject<void>;
-        watchCoverageRecord$: Subject<IRange<number>>;
-        watchCoverageLive$: Subject<IRange<number>>;
+        watchCoverageRecord$: Subject<StartEnd<number>>;
+        watchCoverageLive$: Subject<StartEnd<number>>;
         managedError$: Subject<IError>;
         fatalError$: Subject<IError>;
         ended$: Subject<void>;

package/player/types.d.ts

@@ -1,7 +1,9 @@
-import { IObservable, IValueObservable, IValueSubject, ILogEntry, Kbps, Milliseconds, Seconds, IError } from '@vkontakte/videoplayer-shared';
+import { IObservable, IValueObservable, IValueSubject, ILogEntry, Kbps, Milliseconds, Seconds, IRectangle, IError } from '@vkontakte/videoplayer-shared';
 import { QualityLimits, VideoQuality } from "../utils/quality/types";
-import { IRange } from "../utils/range";
-import { IRectangle } from "../utils/rectangle";
+export interface StartEnd<Unit extends number> {
+    start: Unit;
+    end: Unit;
+}
 export interface IPlayer {
     info: IPlayerInfo;
     events: IPlayerEvents;
@@ -96,12 +98,12 @@ export interface IPlayerEvents {
      * Просмотрен промежуток видео.
      * Параметр содержит диапазон: начальная и конечная позиция просмотра (в секундах от начала ролика).
      */
-    watchCoverageRecord$: IObservable<IRange<Seconds>>;
+    watchCoverageRecord$: IObservable<StartEnd<Seconds>>;
     /**
      * Просмотрен промежуток видео. Промежуток видео, которые были просмотрены пользователем.
      * Параметр содержит диапазон: начальный и конечный UTC tipestamp?
      */
-    watchCoverageLive$: IObservable<IRange<Milliseconds>>;
+    watchCoverageLive$: IObservable<StartEnd<Milliseconds>>;
     /**
      * Ошибка в работе после которой воспроизведение было восстановлено
      */
@@ -209,7 +211,7 @@ export interface IPlayerInfo {
      *
      * default value: `undefined`
      */
-    currentBuffer$: IValueObservable<IRange | undefined>;
+    currentBuffer$: IValueObservable<StartEnd<Seconds> | undefined>;
     /**
      * Статус буферизации видео. true если буфер пустой и воспроизведение прервано
      * В отличии от isStalled показывает и буферизации на старте и после перемотки
@@ -314,6 +316,7 @@ export interface ISources {
     [VideoFormat.DASH_WEBM_VK]?: IDashURLSource;
     [VideoFormat.DASH_WEBM]?: IDashURLSource;
     [VideoFormat.DASH_ONDEMAND]?: IDashURLSource;
+    [VideoFormat.DASH_ONDEMAND_VK]?: IDashURLSource;
     [VideoFormat.DASH_LIVE]?: IDashURLSource;
     [VideoFormat.DASH_LIVE_WEBM]?: IDashURLSource;
     [VideoFormat.HLS]?: IHLSSource;
@@ -351,6 +354,7 @@ export declare enum VideoFormat {
     DASH_WEBM = "DASH_WEBM",
     DASH_WEBM_VK = "DASH_WEBM_VK",
     DASH_ONDEMAND = "DASH_ONDEMAND",
+    DASH_ONDEMAND_VK = "DASH_ONDEMAND_VK",
     DASH_LIVE = "DASH_LIVE",
     DASH_LIVE_WEBM = "DASH_LIVE_WEBM",
     HLS = "HLS",

package/player/utils/watchCoverage.d.ts

@@ -1,5 +1,4 @@
-import { IObservable, IValueObservable, Seconds } from '@vkontakte/videoplayer-shared';
-import { IRange } from "../../utils/range";
+import { IObservable, IValueObservable, Seconds, IRange } from '@vkontakte/videoplayer-shared';
 import { IStateMachine } from "../../utils/StateMachine/types";
 import { PlaybackState, SeekState } from "../types";
 interface IParams {

package/providers/DashVKProvider/lib/types.d.ts

@@ -1,4 +1,4 @@
-import { Byte, Kbps, Milliseconds } from '@vkontakte/videoplayer-shared';
+import { Byte, Kbps, Milliseconds, IRange } from '@vkontakte/videoplayer-shared';
 export declare enum RepresentationKind {
     VIDEO = "video",
     AUDIO = "audio",
@@ -8,31 +8,52 @@ export declare enum Profile {
     WEBM_AS_IN_SPEC = "urn:mpeg:dash:profile:webm-on-demand:2012",
     WEBM_AS_IN_FFMPEG = "urn:webm:dash:profile:webm-on-demand:2012"
 }
-export interface Range<Unit extends number> {
-    from: Unit;
-    to: Unit;
-}
 export interface Representation {
     id: string;
     kind: RepresentationKind;
+    segmentReference: SegmentReference;
     profiles: Array<Profile | string>;
-    initRange: Range<Byte>;
-    indexRange?: Range<Byte>;
     duration?: Milliseconds;
     bitrate: Kbps;
     mime: string;
     codecs: string;
     width: number;
     height: number;
-    url: string;
     fps?: number;
     quality?: string;
 }
-export interface Segment {
+export declare enum SegmentReferencingType {
+    BYTE_RANGE = "byteRange",
+    TEMPLATE = "template"
+}
+export declare type ByteRangeSegmentReference = {
+    type: SegmentReferencingType.BYTE_RANGE;
+    url: string;
+    initRange: IRange<Byte>;
+    indexRange?: IRange<Byte>;
+};
+export declare type TemplateSegmentReference = {
+    type: SegmentReferencingType.TEMPLATE;
+    baseUrl: string;
+    initUrl: string;
+    segments: {
+        url: string;
+        time: IRange<Milliseconds>;
+    }[];
+};
+export declare type SegmentReference = ByteRangeSegmentReference | TemplateSegmentReference;
+export interface ByteRangeSegment {
     status: SegmentStatus;
-    time: Range<Milliseconds>;
-    byte: Range<Byte>;
+    time: IRange<Milliseconds>;
+    byte: IRange<Byte>;
+}
+export interface TemplateSegment {
+    status: SegmentStatus;
+    time: IRange<Milliseconds>;
+    size: Byte | undefined;
+    url: string;
 }
+export declare type Segment = ByteRangeSegment | TemplateSegment;
 export declare enum SegmentStatus {
     NONE = "none",
     DOWNLOADING = "downloading",
@@ -41,6 +62,7 @@ export declare enum SegmentStatus {
     FED = "fed"
 }
 export interface Manifest {
+    duration: Milliseconds | undefined;
     container: Container;
     representations: {
         [key in RepresentationKind]: Representation[];
@@ -52,7 +74,7 @@ export declare enum Container {
 }
 export interface GenericContainerParser<InitData> {
     validateData(data: DataView): boolean;
-    getIndexRange(init: InitData): Range<Byte> | undefined;
+    getIndexRange(init: InitData): IRange<Byte> | undefined;
     parseInit(data: DataView): InitData;
     parseSegments(data: DataView, init: InitData): Segment[];
     parseFeedableSegmentChunk(data: DataView): DataView | null;

package/providers/HlsProvider/qualityExtractor.d.ts

@@ -1,6 +1,5 @@
-import { Kbps } from '@vkontakte/videoplayer-shared';
+import { Kbps, IRectangle } from '@vkontakte/videoplayer-shared';
 import { VideoQuality } from "../../utils/quality/types";
-import { IRectangle } from "../../utils/rectangle";
 export declare type ManifestUrl = {
     id: string;
     quality: VideoQuality;

package/providers/ProviderContainer/index.d.ts

@@ -1,7 +1,6 @@
 import { IMetadata, ISources, IVideoTrack, IVolumeState, VideoFormat } from "../../player/types";
-import { IRange } from "../../utils/range";
 import { ITuningConfig } from "../../utils/tuningConfig";
-import { IError, ISubject, IValueSubject, Subject, ValueSubject } from '@vkontakte/videoplayer-shared';
+import { IError, ISubject, IValueSubject, Subject, ValueSubject, IRange } from '@vkontakte/videoplayer-shared';
 import { IDesiredState, IProviderDependencies } from '../types';
 import { IProviderContainer, IProviderEntry } from './types';
 interface IParams extends IProviderDependencies {

package/providers/utils/observableVideo.d.ts

@@ -1,6 +1,5 @@
-import { Seconds, IObservable, IError } from '@vkontakte/videoplayer-shared';
+import { Seconds, IRange, IObservable, IError } from '@vkontakte/videoplayer-shared';
 import { IVolumeState } from "../../player/types";
-import { IRange } from "../../utils/range";
 interface IObservableVideo {
     playing$: IObservable<undefined>;
     pause$: IObservable<undefined>;

package/utils/autoSelectVideoTrack.d.ts

@@ -1,8 +1,7 @@
 import { ITuningConfig } from "./tuningConfig";
-import { Kbps, Milliseconds } from '@vkontakte/videoplayer-shared';
+import { Kbps, Milliseconds, IRectangle } from '@vkontakte/videoplayer-shared';
 import { IVideoTrack } from "../player/types";
 import { QualityLimits } from "./quality/types";
-import { IRectangle } from "./rectangle";
 export interface Constraints {
     container?: IRectangle;
     throughput?: Kbps;

package/utils/buffer/getBufferedRangeForPosition.d.ts

@@ -1,4 +1,3 @@
-import { Seconds } from '@vkontakte/videoplayer-shared';
-import { IRange } from "../range";
+import { Seconds, IRange } from '@vkontakte/videoplayer-shared';
 declare const _default: (timeRanges: TimeRanges, position: Seconds, gapTolerance?: number) => IRange<Seconds>;
 export default _default;

package/utils/observeElementSize.d.ts

@@ -1,4 +1,3 @@
-import { IObservable, Milliseconds } from '@vkontakte/videoplayer-shared';
-import { IRectangle } from "./rectangle";
+import { IObservable, Milliseconds, IRectangle } from '@vkontakte/videoplayer-shared';
 declare const observeElementSize: (element: Element, debounceTime?: Milliseconds) => IObservable<IRectangle>;
 export default observeElementSize;

package/utils/quality/utils.d.ts

@@ -1,4 +1,4 @@
-import { IRectangle } from '../rectangle';
+import { IRectangle } from '@vkontakte/videoplayer-shared';
 import { ExactVideoQuality, VideoQuality } from './types';
 export declare const isHigher: (a: ExactVideoQuality, b: ExactVideoQuality) => boolean;
 export declare const isHigherOrEqual: (a: ExactVideoQuality, b: ExactVideoQuality) => boolean;

package/packages/sdk/src/utils/range.d.ts

@@ -1,4 +0,0 @@
-export interface IRange<Unit extends number = number> {
-    start: Unit;
-    end: Unit;
-}

package/packages/sdk/src/utils/rectangle.d.ts

@@ -1,4 +0,0 @@
-export interface IRectangle {
-    width: number;
-    height: number;
-}