Merge pull request #114 from DiceTechnology/patch/v1.6.11-doris

upgrade master-doris branch to [email protected]

Author: hongfeih-es

.eslintrc.js

@@ -1,3 +1,12 @@
+const asyncKeywordConstraintMsg =
+  'The async keyword adds a `regenerator` dependency in the hls.js ES5 output not allowed in v1 due to bundle size constraints.';
+const selfVsWindowGlobalMsg =
+  'Use `self` instead of `window` to access the global context everywhere (including workers).';
+const arrayFindCompatibilityMsg =
+  'Usage of Array find methods is restricted for compatibility.';
+const arrayFindIndexCompatibilityMsg =
+  'Usage of Array findIndex methods is restricted for compatibility.';
+
 module.exports = {
   env: { browser: true, commonjs: true, es6: true },
   globals: {
@@ -27,20 +36,13 @@ module.exports = {
       2,
       {
         name: 'window',
-        message:
-          'Use `self` instead of `window` to access the global context everywhere (including workers).',
+        message: selfVsWindowGlobalMsg,
       },
       { name: 'SourceBuffer', message: 'Use `self.SourceBuffer`' },
       { name: 'setTimeout', message: 'Use `self.setTimeout`' },
       { name: 'setInterval', message: 'Use `self.setInterval`' },
     ],
 
-    'no-restricted-properties': [
-      2,
-      { property: 'findIndex' }, // Intended to block usage of Array.prototype.findIndex
-      { property: 'find' }, // Intended to block usage of Array.prototype.find
-    ],
-
     'import/first': 1,
     'no-var': 1,
     'no-empty': 1,
@@ -67,6 +69,31 @@ module.exports = {
         'no-unused-vars': 0,
         'no-undef': 0,
         'no-use-before-define': 'off',
+        'no-restricted-syntax': [
+          'error',
+          {
+            selector: 'FunctionDeclaration[async=true]',
+            message: asyncKeywordConstraintMsg,
+          },
+          {
+            selector: 'ArrowFunctionExpression[async=true]',
+            message: asyncKeywordConstraintMsg,
+          },
+          {
+            selector: 'MethodDefinition[value.async=true]',
+            message: asyncKeywordConstraintMsg,
+          },
+          {
+            selector:
+              'MemberExpression[property.name="find"][object.type="Identifier"]',
+            message: arrayFindCompatibilityMsg,
+          },
+          {
+            selector:
+              'MemberExpression[property.name="findIndex"][object.type="Identifier"]',
+            message: arrayFindIndexCompatibilityMsg,
+          },
+        ],
         'import/order': [
           'warn',
           {
@@ -98,6 +125,8 @@ module.exports = {
         '@typescript-eslint/consistent-type-imports': 'error',
         '@typescript-eslint/no-import-type-side-effects': 'error',
         '@typescript-eslint/no-restricted-imports': 'error',
+        '@typescript-eslint/no-floating-promises': 'error',
+        '@typescript-eslint/no-misused-promises': 'error',
       },
     },
   ],

.node-version

@@ -1 +1 @@
-22.16.0
+22.17.1

api-extractor/report/hls.js.api.md

@@ -197,7 +197,7 @@ export class AudioStreamController extends BaseStreamController implements Netwo
     // (undocumented)
     protected onHandlerDestroying(): void;
     // (undocumented)
-    onInitPtsFound(event: Events.INIT_PTS_FOUND, { frag, id, initPTS, timescale }: InitPTSFoundData): void;
+    onInitPtsFound(event: Events.INIT_PTS_FOUND, { frag, id, initPTS, timescale, trackId }: InitPTSFoundData): void;
     // (undocumented)
     protected onManifestLoading(): void;
     // (undocumented)
@@ -392,6 +392,8 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
     // (undocumented)
     protected checkLiveUpdate(details: LevelDetails): void;
     // (undocumented)
+    protected checkRetryDate(): void;
+    // (undocumented)
     protected clearTrackerIfNeeded(frag: Fragment): void;
     // (undocumented)
     protected config: HlsConfig;
@@ -458,7 +460,7 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
     // (undocumented)
     get inFlightFrag(): InFlightData;
     // (undocumented)
-    protected initPTS: RationalTimestamp[];
+    protected initPTS: TimestampOffset[];
     // (undocumented)
     protected isLoopLoading(frag: Fragment, targetBufferTime: number): boolean;
     // (undocumented)
@@ -528,8 +530,6 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
     // (undocumented)
     protected resetLoadingState(): void;
     // (undocumented)
-    protected resetStartWhenNotLoaded(level: Level | null): void;
-    // (undocumented)
     protected resetTransmuxer(): void;
     // (undocumented)
     protected resetWhenMissingContext(chunkMeta: ChunkMetadata | Fragment): void;
@@ -563,6 +563,8 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
     // (undocumented)
     protected transmuxer: TransmuxerInterface | null;
     // (undocumented)
+    protected unhandledEncryptionError(initSegment: InitSegmentData, frag: Fragment): boolean;
+    // (undocumented)
     protected unregisterListeners(): void;
     // (undocumented)
     protected waitForCdnTuneIn(details: LevelDetails): boolean | 0;
@@ -579,6 +581,8 @@ export interface BaseTrack {
     // (undocumented)
     container: string;
     // (undocumented)
+    encrypted?: boolean;
+    // (undocumented)
     id: 'audio' | 'main';
     // (undocumented)
     levelCodec?: string;
@@ -631,7 +635,7 @@ export interface BufferAppendingData {
     // (undocumented)
     chunkMeta: ChunkMetadata;
     // (undocumented)
-    data: Uint8Array;
+    data: Uint8Array<ArrayBuffer>;
     // (undocumented)
     frag: Fragment;
     // (undocumented)
@@ -1185,8 +1189,8 @@ export type EMEControllerConfig = {
     licenseResponseCallback?: (this: Hls, xhr: XMLHttpRequest, url: string, keyContext: MediaKeySessionContext) => ArrayBuffer;
     emeEnabled: boolean;
     widevineLicenseUrl?: string;
-    drmSystems: DRMSystemsConfiguration;
-    drmSystemOptions: DRMSystemOptions;
+    drmSystems: DRMSystemsConfiguration | undefined;
+    drmSystemOptions: DRMSystemOptions | undefined;
     requestMediaKeySystemAccessFunc: MediaKeyFunc | null;
     requireKeySystemAccessOnStart: boolean;
 };
@@ -1200,9 +1204,11 @@ export const enum ErrorActionFlags {
     // (undocumented)
     MoveAllAlternatesMatchingHost = 1,
     // (undocumented)
+    MoveAllAlternatesMatchingKey = 4,
+    // (undocumented)
     None = 0,
     // (undocumented)
-    SwitchToSDR = 4
+    SwitchToSDR = 8
 }
 
 // Warning: (ae-missing-release-tag) "ErrorController" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -1235,6 +1241,8 @@ export interface ErrorData {
     // (undocumented)
     context?: PlaylistLoaderContext;
     // (undocumented)
+    decryptdata?: LevelKey;
+    // (undocumented)
     details: ErrorDetails;
     // @deprecated (undocumented)
     err?: {
@@ -1503,8 +1511,6 @@ export enum Events {
     // (undocumented)
     KEY_LOADING = "hlsKeyLoading",
     // (undocumented)
-    KEY_STATUSES_CHANGED = "hlsKeyStatusesChanged",
-    // (undocumented)
     LEVEL_LOADED = "hlsLevelLoaded",
     // (undocumented)
     LEVEL_LOADING = "hlsLevelLoading",
@@ -1809,7 +1815,7 @@ export class Fragment extends BaseSegment {
     level: number;
     // (undocumented)
     levelkeys?: {
-        [key: string]: LevelKey;
+        [key: string]: LevelKey | undefined;
     };
     // (undocumented)
     loader: Loader<FragmentLoaderContext> | null;
@@ -1927,7 +1933,7 @@ export class FragmentTracker implements ComponentAPI {
     detectPartialFragments(data: FragBufferedData): void;
     // (undocumented)
     fragBuffered(frag: MediaFragment, force?: true): void;
-    getAppendedFrag(position: number, levelType: PlaylistLevelType): Fragment | Part | null;
+    getAppendedFrag(position: number, levelType: PlaylistLevelType): MediaFragment | Part | null;
     getBufferedFrag(position: number, levelType: PlaylistLevelType): MediaFragment | null;
     // (undocumented)
     getFragAtPos(position: number, levelType: PlaylistLevelType, buffered?: boolean): MediaFragment | null;
@@ -2190,12 +2196,14 @@ export class HlsAssetPlayer {
     // (undocumented)
     get duration(): number;
     // (undocumented)
-    readonly hls: Hls;
+    hls: Hls | null;
     // (undocumented)
-    readonly interstitial: InterstitialEvent;
+    interstitial: InterstitialEvent;
     // (undocumented)
     get interstitialId(): InterstitialId;
     // (undocumented)
+    loadSource(): void;
+    // (undocumented)
     get media(): HTMLMediaElement | null;
     // (undocumented)
     off<E extends keyof HlsListeners, Context = undefined>(event: E, listener: HlsListeners[E], context?: Context): void;
@@ -2403,8 +2411,6 @@ export interface HlsListeners {
     // (undocumented)
     [Events.KEY_LOADING]: (event: Events.KEY_LOADING, data: KeyLoadingData) => void;
     // (undocumented)
-    [Events.KEY_STATUSES_CHANGED]: (event: Events.KEY_STATUSES_CHANGED, data: KeyStatusesChangedData) => void;
-    // (undocumented)
     [Events.LEVEL_LOADED]: (event: Events.LEVEL_LOADED, data: LevelLoadedData) => void;
     // (undocumented)
     [Events.LEVEL_LOADING]: (event: Events.LEVEL_LOADING, data: LevelLoadingData) => void;
@@ -2588,6 +2594,8 @@ export interface InitPTSFoundData {
     initPTS: number;
     // (undocumented)
     timescale: number;
+    // (undocumented)
+    trackId: number;
 }
 
 // Warning: (ae-missing-release-tag) "InitSegmentData" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -2802,6 +2810,8 @@ export interface InterstitialPlayer {
     // (undocumented)
     assetPlayers: (HlsAssetPlayer | null)[];
     // (undocumented)
+    bufferedEnd: number;
+    // (undocumented)
     currentTime: number;
     // (undocumented)
     duration: number;
@@ -2975,8 +2985,8 @@ export interface KeyLoadedData {
 // Warning: (ae-missing-release-tag) "KeyLoader" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export class KeyLoader implements ComponentAPI {
-    constructor(config: HlsConfig);
+export class KeyLoader extends Logger implements ComponentAPI {
+    constructor(config: HlsConfig, logger: ILogger);
     // (undocumented)
     abort(type?: PlaylistLevelType): void;
     // (undocumented)
@@ -2993,10 +3003,6 @@ export class KeyLoader implements ComponentAPI {
     // (undocumented)
     emeController: EMEController | null;
     // (undocumented)
-    keyUriToKeyInfo: {
-        [keyuri: string]: KeyLoaderInfo;
-    };
-    // (undocumented)
     load(frag: Fragment): Promise<KeyLoadedData>;
     // (undocumented)
     loadClear(loadingFrag: Fragment, encryptedFragments: Fragment[], startFragRequested: boolean): null | Promise<void>;
@@ -3040,16 +3046,6 @@ export interface KeyLoadingData {
     frag: Fragment;
 }
 
-// Warning: (ae-missing-release-tag) "KeyStatusesChangedData" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export interface KeyStatusesChangedData {
-    // (undocumented)
-    keyStatuses: MediaKeyStatusMap;
-    // (undocumented)
-    keySystem: string;
-}
-
 // Warning: (ae-missing-release-tag) "KeySystemFormats" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -3248,7 +3244,7 @@ export class LevelDetails {
     // (undocumented)
     canSkipUntil: number;
     // (undocumented)
-    dateRanges: Record<string, DateRange>;
+    dateRanges: Record<string, DateRange | undefined>;
     // (undocumented)
     dateRangeTagCount: number;
     // (undocumented)
@@ -3282,6 +3278,8 @@ export class LevelDetails {
     // (undocumented)
     get fragmentStart(): number;
     // (undocumented)
+    hasKey(levelKey: LevelKey): boolean;
+    // (undocumented)
     get hasProgramDateTime(): boolean;
     // (undocumented)
     hasVariableRefs: boolean;
@@ -4366,6 +4364,8 @@ export interface RemuxedTrack {
     // (undocumented)
     dropped?: number;
     // (undocumented)
+    encrypted?: boolean;
+    // (undocumented)
     endDTS: number;
     // (undocumented)
     endPTS: number;
@@ -4810,6 +4810,13 @@ export enum TimelineOccupancy {
     Range = 1
 }
 
+// Warning: (ae-missing-release-tag) "TimestampOffset" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type TimestampOffset = RationalTimestamp & {
+    trackId: number;
+};
+
 // Warning: (ae-missing-release-tag) "Track" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -4880,7 +4887,7 @@ export class TransmuxerInterface {
     // (undocumented)
     flush(chunkMeta: ChunkMetadata): void;
     // (undocumented)
-    push(data: ArrayBuffer, initSegmentData: Uint8Array | undefined, audioCodec: string | undefined, videoCodec: string | undefined, frag: MediaFragment, part: Part | null, duration: number, accurateTimeOffset: boolean, chunkMeta: ChunkMetadata, defaultInitPTS?: RationalTimestamp): void;
+    push(data: ArrayBuffer, initSegmentData: Uint8Array | undefined, audioCodec: string | undefined, videoCodec: string | undefined, frag: MediaFragment, part: Part | null, duration: number, accurateTimeOffset: boolean, chunkMeta: ChunkMetadata, defaultInitPTS?: TimestampOffset): void;
     // (undocumented)
     reset(): void;
 }

build-config.js

@@ -136,12 +136,12 @@ const babelTsWithPresetEnvTargets = ({ targets, stripConsole }) =>
     ],
     plugins: [
       [
-        '@babel/plugin-proposal-class-properties',
+        '@babel/plugin-transform-class-properties',
         {
           loose: true,
         },
       ],
-      '@babel/plugin-proposal-object-rest-spread',
+      '@babel/plugin-transform-object-rest-spread',
       {
         visitor: {
           CallExpression: function (espath) {
@@ -172,7 +172,7 @@ const babelTsWithPresetEnvTargets = ({ targets, stripConsole }) =>
         },
       },
       ['@babel/plugin-transform-object-assign'],
-      ['@babel/plugin-proposal-optional-chaining'],
+      ['@babel/plugin-transform-optional-chaining'],
 
       ...(stripConsole
         ? [