@gcorevideo/player 2.14.1 → 2.15.0

package/lib/index.d.ts

@@ -7,7 +7,7 @@
  *
  * @packageDocumentation
  */
-export { setTracer } from '@gcorevideo/utils';
+export { SentryTracer, setTracer } from '@gcorevideo/utils';
 export * from './Player.js';
 export * from './playback.types.js';
 export * from './testUtils.js';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC3D,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA"}

package/lib/index.js

@@ -7,7 +7,7 @@
  *
  * @packageDocumentation
  */
-export { setTracer } from '@gcorevideo/utils';
+export { SentryTracer, setTracer } from '@gcorevideo/utils';
 export * from './Player.js';
 export * from './playback.types.js';
 export * from './testUtils.js';

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

@@ -1 +1 @@
-{"version":3,"file":"mediaSources.d.ts","sourceRoot":"","sources":["../../src/utils/mediaSources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,UAAU,CAAA;AAGjB,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAA;IAClC,GAAG,EAAE,qBAAqB,GAAG,IAAI,CAAA;IACjC,MAAM,EAAE,qBAAqB,GAAG,IAAI,CAAA;CACrC,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,cAAc,CAiB5E;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,qBAAqB,EAAE,EAChC,iBAAiB,GAAE,mBAA4B,GAC9C,qBAAqB,EAAE,CA4BzB;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAEzD;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,iBAAiB,GAAG,qBAAqB,CAEtE;AAWD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,WAK7D;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,WAO5D"}
+{"version":3,"file":"mediaSources.d.ts","sourceRoot":"","sources":["../../src/utils/mediaSources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,UAAU,CAAA;AAGjB,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAA;IAClC,GAAG,EAAE,qBAAqB,GAAG,IAAI,CAAA;IACjC,MAAM,EAAE,qBAAqB,GAAG,IAAI,CAAA;CACrC,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,cAAc,CAiB5E;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,qBAAqB,EAAE,EAChC,iBAAiB,GAAE,mBAA4B,GAC9C,qBAAqB,EAAE,CA6BzB;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAEzD;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,iBAAiB,GAAG,qBAAqB,CAEtE;AAWD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,WAK7D;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,WAO5D"}

package/lib/utils/mediaSources.js

@@ -26,12 +26,14 @@ export function buildSourcesSet(sources) {
     return sv;
 }
 export function buildMediaSourcesList(sources, priorityTransport = 'dash') {
-    const [preferred, rest] = sources.reduce(priorityTransport === 'dash'
+    const [preferred, rest] = sources.reduce(
+    // Always include HLS sources to enable HTML5 fallback
+    priorityTransport === 'dash'
         ? (acc, item) => {
             if (canPlayDash(item.source, item.mimeType)) {
                 acc[0].push(item);
             }
-            else {
+            else if (!isDashSource(item.source, item.mimeType)) {
                 acc[1].push(item);
             }
             return acc;
@@ -40,7 +42,7 @@ export function buildMediaSourcesList(sources, priorityTransport = 'dash') {
             if (canPlayHls(item.source, item.mimeType)) {
                 acc[0].push(item);
             }
-            else {
+            else if (!(isDashSource(item.source, item.mimeType) && !canPlayDash(item.source, item.mimeType))) {
                 acc[1].push(item);
             }
             return acc;

package/package.json

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

package/src/__tests__/Player.test.ts

@@ -7,7 +7,6 @@ import {
   MockedObject,
   vi,
 } from 'vitest'
-import FakeTimers from '@sinonjs/fake-timers'
 import { LogTracer, Logger, setTracer } from '@gcorevideo/utils'
 import { Loader, Player as PlayerClappr } from '@clappr/core'
 import EventLite from 'event-lite'
@@ -15,7 +14,6 @@ import EventLite from 'event-lite'
 import { Player } from '../Player'
 import { TransportPreference } from '../types'
 import { canPlayDash, canPlayHls } from '../playback'
-import { PlaybackErrorCode } from '../playback.types'
 import { isDashSource, isHlsSource } from '../utils/testUtils'
 
 function createMockClapprPlayer(): MockedObject<typeof PlayerClappr> {
@@ -89,10 +87,10 @@ describe('Player', () => {
     describe.each([
       ['dash', true, true, 'http://0eab.cdn.globo.com/1932-1447.mpd'],
       ['dash', false, true, 'http://0eab.cdn.globo.com/1932-1447.m3u8'],
-      ['dash', false, false, undefined],
+      ['dash', false, false, 'http://0eab.cdn.globo.com/1932-1447.m3u8'],
       ['hls', true, true, 'http://0eab.cdn.globo.com/1932-1447.m3u8'],
       ['hls', true, false, 'http://0eab.cdn.globo.com/1932-1447.mpd'],
-      ['hls', false, false, undefined],
+      ['hls', false, false, 'http://0eab.cdn.globo.com/1932-1447.m3u8'],
     ])(
       ' according to the preference (%s) and capabilities (dash=%s, hls=%s)',
       (priority, dash, hls, source: string | undefined) => {

package/src/index.ts

@@ -8,7 +8,7 @@
  * @packageDocumentation
  */
 
-export { setTracer } from '@gcorevideo/utils'
+export { SentryTracer, setTracer } from '@gcorevideo/utils'
 export * from './Player.js'
 export * from './playback.types.js'
 export * from './testUtils.js'

package/src/utils/__tests__/mediaSources.test.ts

@@ -155,6 +155,10 @@ describe('mediaSources', () => {
           },
         ],
         [
+          { // HLS sources are always included to enable HTML5 fallback
+            source: 'http://example.com/video.m3u8',
+            mimeType: 'application/vnd.apple.mpegurl',
+          },
           {
             source: 'http://example.com/video.mpd',
             mimeType: 'application/dash+xml',
@@ -163,6 +167,10 @@ describe('mediaSources', () => {
             source: 'http://example.com/video2.mpd',
             mimeType: 'application/dash+xml',
           },
+          {
+            source: 'http://example.com/video3.m3u8',
+            mimeType: 'application/vnd.apple.mpegurl',
+          },
         ],
       ],
     ])('prefer %s, dash=%s,hls=%s', (preference, dash, hls, sources, expected) => {
@@ -174,9 +182,6 @@ describe('mediaSources', () => {
           vi.mocked(canPlayHls).mockReturnValue(false)
         }
       })
-      // afterEach(() => {
-      //   vi.mocked(canPlayDash)
-      // })
       it('should build the ordered list of available sources', () => {
         const ordered = buildMediaSourcesList(
           sources,

package/src/utils/mediaSources.ts

@@ -41,6 +41,7 @@ export function buildMediaSourcesList(
   priorityTransport: TransportPreference = 'dash',
 ): PlayerMediaSourceDesc[] {
   const [preferred, rest] = sources.reduce(
+    // Always include HLS sources to enable HTML5 fallback
     priorityTransport === 'dash'
       ? (
           acc: [PlayerMediaSourceDesc[], PlayerMediaSourceDesc[]],
@@ -48,7 +49,7 @@ export function buildMediaSourcesList(
         ) => {
           if (canPlayDash(item.source, item.mimeType)) {
             acc[0].push(item)
-          } else {
+          } else if (!isDashSource(item.source, item.mimeType)) {
             acc[1].push(item)
           }
           return acc
@@ -59,7 +60,7 @@ export function buildMediaSourcesList(
         ) => {
           if (canPlayHls(item.source, item.mimeType)) {
             acc[0].push(item)
-          } else {
+          } else if (!(isDashSource(item.source, item.mimeType) && !canPlayDash(item.source, item.mimeType))) {
             acc[1].push(item)
           }
           return acc