@gcorevideo/player 2.3.1 → 2.4.1

package/lib/plugins/dash-playback/DashPlayback.js

@@ -1,13 +1,13 @@
 // Copyright 2014 Globo.com Player authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-import { Events, HTML5Video, Log, Playback, /* PlayerError, */ Utils } from '@clappr/core';
+import { Events, HTML5Video, Log, Playback, Utils, } from '@clappr/core';
 import assert from 'assert'; // uses Node.js's assert types
 import DASHJS from 'dashjs';
 import { trace } from '../../trace/index.js';
 const AUTO = -1;
 const { now } = Utils;
-const T = "DashPlayback";
+const T = 'DashPlayback';
 export default class DashPlayback extends HTML5Video {
     _levels = null;
     _currentLevel = null;
@@ -59,8 +59,8 @@ export default class DashPlayback extends HTML5Video {
                     autoSwitchBitrate: {
                         video: id === -1,
                     },
-                    ABRStrategy: 'abrL2A'
-                }
+                    ABRStrategy: 'abrL2A',
+                },
             },
         };
         assert.ok(this._dash, 'An instance of dashjs MediaPlayer is required to switch levels');
@@ -81,7 +81,8 @@ export default class DashPlayback extends HTML5Video {
         }
     }
     get _startTime() {
-        if (this._playbackType === Playback.LIVE && this._playlistType !== 'EVENT') {
+        if (this._playbackType === Playback.LIVE &&
+            this._playlistType !== 'EVENT') {
             return this._extrapolatedStartTime;
         }
         return this._playableRegionStartTime;
@@ -127,7 +128,8 @@ export default class DashPlayback extends HTML5Video {
         // Should be 2 or higher, or 0 to disable. Should only need to be increased above 2 if more than one segment is
         // removed from the start of the playlist at a time. E.g if the playlist is cached for 10 seconds and new chunks are
         // added/removed every 5.
-        this._extrapolatedWindowNumSegments = this.options.playback?.extrapolatedWindowNumSegments ?? 2;
+        this._extrapolatedWindowNumSegments =
+            this.options.playback?.extrapolatedWindowNumSegments ?? 2;
         if (this.options.playbackType) {
             this._playbackType = this.options.playbackType;
         }
@@ -192,7 +194,8 @@ export default class DashPlayback extends HTML5Video {
         });
         this._dash.on(DASHJS.MediaPlayer.events.METRIC_ADDED, (e) => {
             // Listen for the first manifest request in order to update player UI
-            if (e.metric === 'DVRInfo') { // TODO fix typings
+            if (e.metric === 'DVRInfo') {
+                // TODO fix typings
                 assert.ok(this._dash, 'An instance of dashjs MediaPlayer is required to get metrics');
                 const dvrInfo = this._dash.getDashMetrics().getCurrentDVRInfo('video');
                 if (dvrInfo) {
@@ -297,7 +300,7 @@ export default class DashPlayback extends HTML5Video {
     }
     _updateDvr(status) {
         this.trigger(Events.PLAYBACK_DVR, status);
-        this.trigger(Events.PLAYBACK_STATS_ADD, { 'dvr': status });
+        this.trigger(Events.PLAYBACK_STATS_ADD, { dvr: status });
     }
     _updateSettings() {
         if (this._playbackType === Playback.VOD) {
@@ -328,19 +331,19 @@ export default class DashPlayback extends HTML5Video {
             Log.error('The media cannot be played because it requires a feature ' +
                 'that your browser does not support.');
         }
-        else if (event.error === 'manifestError' && (
-        // Manifest type not supported
-        (event.event.id === 'createParser') ||
-            // Codec(s) not supported
-            (event.event.id === 'codec') ||
-            // No streams available to stream
-            (event.event.id === 'nostreams') ||
-            // Error creating Stream object
-            (event.event.id === 'nostreamscomposed') ||
-            // syntax error parsing the manifest
-            (event.event.id === 'parse') ||
-            // a stream has multiplexed audio+video
-            (event.event.id === 'multiplexedrep'))) {
+        else if (event.error === 'manifestError' &&
+            // Manifest type not supported
+            (event.event.id === 'createParser' ||
+                // Codec(s) not supported
+                event.event.id === 'codec' ||
+                // No streams available to stream
+                event.event.id === 'nostreams' ||
+                // Error creating Stream object
+                event.event.id === 'nostreamscomposed' ||
+                // syntax error parsing the manifest
+                event.event.id === 'parse' ||
+                // a stream has multiplexed audio+video
+                event.event.id === 'multiplexedrep')) {
             // These errors have useful error messages, so we forward it on
             const formattedError = this.createError(event.error);
             this.trigger(Events.PLAYBACK_ERROR, formattedError);
@@ -359,7 +362,8 @@ export default class DashPlayback extends HTML5Video {
             this.trigger(Events.PLAYBACK_ERROR, formattedError);
             Log.error(event.event);
         }
-        else if (event.error === 'capability' && event.event === 'encryptedmedia') {
+        else if (event.error === 'capability' &&
+            event.event === 'encryptedmedia') {
             // Browser doesn't support EME
             const formattedError = this.createError(event.error);
             this.trigger(Events.PLAYBACK_ERROR, formattedError);
@@ -387,7 +391,7 @@ export default class DashPlayback extends HTML5Video {
         }
         else {
             // ignore the error
-            if (typeof event.error === "object") {
+            if (typeof event.error === 'object') {
                 const formattedError = this.createError(event.error);
                 this.trigger(Events.PLAYBACK_ERROR, formattedError);
                 Log.error(event.error.message);
@@ -411,10 +415,11 @@ export default class DashPlayback extends HTML5Video {
         const update = {
             current: this.getCurrentTime(),
             total: this.getDuration(),
-            firstFragDateTime: this.getProgramDateTime()
+            firstFragDateTime: this.getProgramDateTime(),
         };
-        const isSame = this._lastTimeUpdate && (update.current === this._lastTimeUpdate.current &&
-            update.total === this._lastTimeUpdate.total);
+        const isSame = this._lastTimeUpdate &&
+            update.current === this._lastTimeUpdate.current &&
+            update.total === this._lastTimeUpdate.total;
         if (isSame) {
             return;
         }
@@ -431,7 +436,8 @@ export default class DashPlayback extends HTML5Video {
     }
     get dvrEnabled() {
         assert.ok(this._dash, 'An instance of dashjs MediaPlayer is required to get the DVR status');
-        return this._dash?.getDVRWindowSize() >= this._minDvrSize && this.getPlaybackType() === Playback.LIVE;
+        return (this._dash?.getDVRWindowSize() >= this._minDvrSize &&
+            this.getPlaybackType() === Playback.LIVE);
     }
     _onProgress() {
         if (!this._dash) {
@@ -444,7 +450,7 @@ export default class DashPlayback extends HTML5Video {
         const progress = {
             start: this.getCurrentTime(),
             current: this.getCurrentTime() + buffer,
-            total: this.getDuration()
+            total: this.getDuration(),
         };
         this.trigger(Events.PLAYBACK_PROGRESS, progress, {});
     }
@@ -625,22 +631,34 @@ export default class DashPlayback extends HTML5Video {
             height: currentLevel.height,
             width: currentLevel.width,
             bitrate: currentLevel.bitrate,
-            level: currentLevel.qualityIndex
+            level: currentLevel.qualityIndex,
         });
     }
     getPlaybackType() {
         return this._playbackType;
     }
     isSeekEnabled() {
-        return (this._playbackType === Playback.VOD || this.dvrEnabled);
+        return this._playbackType === Playback.VOD || this.dvrEnabled;
     }
 }
 DashPlayback.canPlay = function (resource, mimeType) {
     const resourceParts = resource.split('?')[0].match(/.*\.(.*)$/) || [];
-    const isDash = ((resourceParts.length > 1 && resourceParts[1].toLowerCase() === 'mpd') ||
-        mimeType === 'application/dash+xml' || mimeType === 'video/mp4');
-    const ctor = window.MediaSource || ('WebKitMediaSource' in window ? window.WebKitMediaSource : undefined);
+    const isDash = (resourceParts.length > 1 && resourceParts[1].toLowerCase() === 'mpd') ||
+        mimeType === 'application/dash+xml' ||
+        mimeType === 'video/mp4';
+    // TODO check
+    const ms = window.MediaSource;
+    const mms = 'ManagedMediaSource' in window ? window.ManagedMediaSource : undefined;
+    const wms = 'WebKitMediaSource' in window ? window.WebKitMediaSource : undefined;
+    const ctor = ms || mms || wms;
     const hasSupport = typeof ctor === 'function';
-    trace(`${T} canPlay`, { hasSupport, isDash, resource });
+    trace(`${T} canPlay`, {
+        hasSupport,
+        isDash,
+        resource,
+        ms: typeof ms === 'function',
+        mms: typeof mms === 'function',
+        wms: typeof wms === 'function',
+    });
     return !!(hasSupport && isDash);
 };

package/lib/types.d.ts

@@ -1,3 +1,4 @@
+import { PlayerMediaSource } from "./internal.types";
 export type PlayerDebugTag = 'all' | 'clappr' | 'dash' | 'hls' | 'none';
 export type PlayerDebugSettings = PlayerDebugTag | boolean;
 export type PlaybackType = 'live' | 'vod';
@@ -18,6 +19,7 @@ export type PlayerConfig = {
     pluginSettings?: Record<string, unknown>;
     poster?: string;
     priorityTransport?: TransportPreference;
+    sources: PlayerMediaSource[];
     strings: TranslationSettings;
 };
 export type PlayerOptionsThumbnails = {
@@ -83,7 +85,6 @@ export type QualityLevelInfo = {
     height: number;
     bitrate: number;
 };
-export type BitrateInfo = QualityLevelInfo;
 export declare enum PlayerEvent {
     Ready = "ready",
     Play = "play",

package/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/lib/utils/mediaSources.d.ts

@@ -0,0 +1,13 @@
+import { PlayerMediaSource } from '../internal.types';
+import { StreamMediaSource, TransportPreference } from '../types';
+export type SourceVariants = {
+    dash: string | null;
+    master: string | null;
+    hls: string | null;
+    mpegts: string | null;
+};
+export declare function buildSourcesSet(sources: PlayerMediaSource[]): SourceVariants;
+export declare function buildSourcesPriorityList(sources: SourceVariants, priorityTransport?: TransportPreference): PlayerMediaSource[];
+export declare function unwrapSource(s: PlayerMediaSource): string;
+export declare function buildGcoreStreamSourcesList(ms: StreamMediaSource, priorityTransport: TransportPreference): PlayerMediaSource[];
+//# sourceMappingURL=mediaSources.d.ts.map

package/lib/utils/mediaSources.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mediaSources.d.ts","sourceRoot":"","sources":["../../src/utils/mediaSources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAGrD,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAEjE,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CACtB,CAAA;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,cAAc,CAkB5E;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,cAAc,EACvB,iBAAiB,GAAE,mBAA4B,GAC9C,iBAAiB,EAAE,CAmDrB;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAEzD;AAED,wBAAgB,2BAA2B,CACzC,EAAE,EAAE,iBAAiB,EACrB,iBAAiB,EAAE,mBAAmB,GACrC,iBAAiB,EAAE,CAQrB"}

package/lib/utils/mediaSources.js

@@ -0,0 +1,82 @@
+import DashPlayback from '../plugins/dash-playback/DashPlayback';
+import HlsPlayback from '../plugins/hls-playback/HlsPlayback';
+export function buildSourcesSet(sources) {
+    const sv = {
+        dash: null,
+        master: null,
+        hls: null,
+        mpegts: null,
+    };
+    sources.forEach((ps) => {
+        const [s, t] = typeof ps === 'string' ? [ps, ''] : [ps.source, ps.mimeType];
+        if (DashPlayback.canPlay(s, t)) {
+            sv.dash = s;
+        }
+        else if (HlsPlayback.canPlay(s, t)) {
+            sv.hls = s;
+        }
+        else {
+            sv.master = s;
+        }
+    });
+    return sv;
+}
+export function buildSourcesPriorityList(sources, priorityTransport = 'auto') {
+    const msl = [];
+    switch (priorityTransport) {
+        case 'dash':
+            addDash();
+            break;
+        case 'hls':
+            addHls();
+            break;
+        case 'mpegts':
+            addMpegts();
+            break;
+        case 'auto':
+            addDash();
+            addHls();
+            break;
+    }
+    Object.values(sources).forEach((s) => {
+        if (s) {
+            msl.push(s);
+        }
+    });
+    return msl;
+    function addMpegts() {
+        if (sources.mpegts) {
+            msl.push(sources.mpegts);
+            sources.mpegts = null;
+        }
+    }
+    function addHls() {
+        if (sources.hls && HlsPlayback.canPlay(sources.hls)) {
+            msl.push(sources.hls);
+            sources.hls = null;
+        }
+        if (sources.master?.endsWith('.m3u8') &&
+            HlsPlayback.canPlay(sources.master)) {
+            msl.push(sources.master);
+            sources.master = null;
+        }
+    }
+    function addDash() {
+        if (sources.dash && DashPlayback.canPlay(sources.dash)) {
+            msl.push(sources.dash);
+            sources.dash = null;
+        }
+    }
+}
+export function unwrapSource(s) {
+    return typeof s === 'string' ? s : s.source;
+}
+export function buildGcoreStreamSourcesList(ms, priorityTransport) {
+    const sources = {
+        dash: ms.sourceDash,
+        master: ms.source,
+        hls: ms.hlsCmafUrl,
+        mpegts: ms.hlsMpegtsUrl,
+    };
+    return buildSourcesPriorityList(sources, priorityTransport);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcorevideo/player",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "description": "Gcore JavaScript video player",
   "main": "dist/index.js",
   "type": "module",

package/src/Player.ts

@@ -13,19 +13,20 @@ import type {
   CorePlayerEvents,
   CoreOptions,
   CorePluginOptions,
+  PlayerMediaSource,
 } from './internal.types.js'
 import type {
   PlaybackType,
   PlayerPlugin,
   QualityLevelInfo,
   StreamMediaSource,
+  TransportPreference,
 } from './types.js'
 import { reportError, trace } from './trace/index.js'
 import { PlayerConfig, PlayerEvent } from './types.js'
 import DashPlayback from './plugins/dash-playback/DashPlayback.js'
 import HlsPlayback from './plugins/hls-playback/HlsPlayback.js'
-
-// import '../assets/style/main.scss' // TODO check if needed
+import { buildSourcesPriorityList, buildSourcesSet, unwrapSource } from './utils/mediaSources.js'
 
 // TODO implement transport retry/failover and fallback logic
 
@@ -35,15 +36,16 @@ const T = 'GPlayer'
 
 const DEFAULT_OPTIONS: PlayerConfig = {
   autoPlay: false,
-  mute: false,
+  debug: 'none',
   loop: false,
+  mute: false,
   multisources: [],
   playbackType: 'vod',
-  priorityTransport: 'dash',
-  debug: 'none',
   pluginSettings: {},
-  strings: {},
   poster: '',
+  priorityTransport: 'dash',
+  sources: [],
+  strings: {},
 }
 
 export type PlaybackModule = 'dash' | 'hls' | 'native'
@@ -236,7 +238,6 @@ export class Player {
     player.core.on(
       ClapprEvents.CORE_ACTIVE_CONTAINER_CHANGED,
       () => {
-        // this.trigger(Events.ContainerChanged)
         this.bindBitrateChangeHandler()
       },
       null,
@@ -345,16 +346,20 @@ export class Player {
   }
 
   private buildCoreOptions(rootNode: HTMLElement): CoreOptions {
-    const multisources = this.config.multisources
-    const mainSource =
-      this.config.playbackType === 'live'
-        ? multisources.find((ms) => ms.live !== false)
-        : multisources[0]
-    const mediaSources = mainSource
-      ? this.buildMediaSourcesList(mainSource)
-      : []
+    // TODO extract
+    // const multisources = this.config.multisources
+    // const mainSource =
+    //   this.config.playbackType === 'live'
+    //     ? multisources.find((ms) => ms.live !== false)
+    //     : multisources[0]
+    // const mediaSources = mainSource
+    //   ? this.buildMediaSourcesList(mainSource)
+    //   : []
     // const mainSourceUrl = mediaSources[0];
-    const poster = mainSource?.poster ?? this.config.poster
+    // const poster = mainSource?.poster ?? this.config.poster
+    const poster = this.config.poster
+
+    const source = this.selectMediaSource(); // TODO
 
     this.rootNode = rootNode
 
@@ -366,7 +371,6 @@ export class Player {
       events: this.events,
       height: rootNode.clientHeight,
       loop: this.config.loop,
-      multisources,
       mute: this.config.mute,
       playback: {
         controls: false,
@@ -382,8 +386,8 @@ export class Player {
       playbackType: this.config.playbackType,
       poster,
       width: rootNode.clientWidth,
-      // source: mainSourceUrl,
-      sources: mediaSources,
+      source: source ? unwrapSource(source) : undefined,
+      // sources: mediaSources,
       strings: this.config.strings,
     }
     return coreOptions
@@ -404,63 +408,8 @@ export class Player {
     )
   }
 
-  private buildMediaSourcesList(ms: StreamMediaSource): string[] {
-    const msl: string[] = []
-    const sources: Record<'dash' | 'master' | 'hls' | 'mpegts', string | null> =
-      {
-        dash: ms.sourceDash,
-        master: ms.source,
-        hls: ms.hlsCmafUrl,
-        mpegts: ms.hlsMpegtsUrl,
-      }
-    switch (this.config.priorityTransport) {
-      case 'dash':
-        addDash()
-        break
-      case 'hls':
-        addHls()
-        break
-      case 'mpegts':
-        addMpegts()
-        break
-      case 'auto':
-        addDash()
-        addHls()
-        break
-    }
-    Object.values(sources).forEach((s) => {
-      if (s) {
-        msl.push(s)
-      }
-    })
-    return msl
-
-    function addMpegts() {
-      if (sources.mpegts) {
-        msl.push(sources.mpegts)
-        sources.mpegts = null
-      }
-    }
-
-    function addHls() {
-      if (sources.hls && HlsPlayback.canPlay(sources.hls)) {
-        msl.push(sources.hls)
-        sources.hls = null
-      }
-      if (
-        sources.master?.endsWith('.m3u8') &&
-        HlsPlayback.canPlay(sources.master)
-      ) {
-        msl.push(sources.master)
-        sources.master = null
-      }
-    }
-
-    function addDash() {
-      if (sources.dash && DashPlayback.canPlay(sources.dash)) {
-        msl.push(sources.dash)
-        sources.dash = null
-      }
-    }
+  // Select a single source to play according to the priority transport and the modules support
+  private selectMediaSource(): PlayerMediaSource | undefined {
+    return buildSourcesPriorityList(buildSourcesSet(this.config.sources), this.config.priorityTransport)[0]
   }
 }

package/src/internal.types.ts

@@ -18,7 +18,7 @@ type MediacontrolStyles = {
   buttons?: string;
 }
 
-type PlayerMediaSourceDesc = {
+export type PlayerMediaSourceDesc = {
   mimeType?: string;
   source: string;
 }
@@ -116,7 +116,7 @@ export type CoreOptions = {
   maxBufferLength?: number;
   mediacontrol?: MediacontrolStyles;
   mimeType?: string;
-  multisources: StreamMediaSource[];
+  // multisources: StreamMediaSource[];
   mute?: boolean;
   persistConfig?: boolean;
   preload?: "auto" | "metadata" | "none";