@gcorevideo/player 2.28.25 → 2.28.26

package/src/playback/dash-playback/__tests__/DashPlayback.test.ts

@@ -27,17 +27,9 @@ describe('DashPlayback', () => {
         globalThis.WebKitMediaSource = undefined
       })
       describe.each([
-        [
-          'http://example.com/test.mpd',
-          undefined,
-          false
-        ],
-        [
-          'http://example.com/123123_1232',
-          'application/dash+xml',
-          false
-        ],
-      ])("%s %s", (resource, mimeType, expected) => {
+        ['http://example.com/test.mpd', undefined, false],
+        ['http://example.com/123123_1232', 'application/dash+xml', false],
+      ])('%s %s', (resource, mimeType, expected) => {
         it('should return false', () => {
           expect(DashPlayback.canPlay(resource, mimeType)).toBe(expected)
         })
@@ -51,36 +43,16 @@ describe('DashPlayback', () => {
         }
       })
       describe.each([
-        [
-          'http://example.com/test.mpd',
-          undefined,
-          true
-        ],
-        [
-          'http://example.com/123123_1232',
-          'application/dash+xml',
-          true
-        ],
-        [
-          'http://example.com/123123_1232.mpd',
-          'video/mp4',
-          false
-        ],
-        [
-          'http://example.com/123123_1232.m3u8',
-          'application/dash+xml',
-          true
-        ],
-        [
-          'http://example.com/123123_1232',
-          undefined,
-          false
-        ],
-      ])("%s %s", (resource, mimeType, expected) => {
+        ['http://example.com/test.mpd', undefined, true],
+        ['http://example.com/123123_1232', 'application/dash+xml', true],
+        ['http://example.com/123123_1232.mpd', 'video/mp4', false],
+        ['http://example.com/123123_1232.m3u8', 'application/dash+xml', true],
+        ['http://example.com/123123_1232', undefined, false],
+      ])('%s %s', (resource, mimeType, expected) => {
         it('should respect the mime type if present and the file extention otherwise', () => {
           expect(DashPlayback.canPlay(resource, mimeType)).toBe(expected)
         })
       })
     })
   })
-})
+})

package/src/playback/hls-playback/__tests__/HlsPlayback.test.ts

@@ -6,7 +6,7 @@ import HlsPlayback from '../HlsPlayback'
 vi.mock('hls.js', () => ({
   default: {
     isSupported: vi.fn(),
-  }
+  },
 }))
 
 describe('HlsPlayback', () => {
@@ -16,19 +16,10 @@ describe('HlsPlayback', () => {
         vi.mocked(HLSJS.isSupported).mockReturnValue(false)
       })
       describe.each([
-        [
-          '/123123_1232',
-          'application/x-mpegurl',
-          ],
-        [
-          '/123123_1232',
-          'application/vnd.apple.mpegurl',
-        ],
-        [
-          '/123123_1232.m3u8',
-          undefined
-        ]
-      ])("%s %s", (resource, mimeType) => {
+        ['/123123_1232', 'application/x-mpegurl'],
+        ['/123123_1232', 'application/vnd.apple.mpegurl'],
+        ['/123123_1232.m3u8', undefined],
+      ])('%s %s', (resource, mimeType) => {
         it('should return false', () => {
           expect(HlsPlayback.canPlay(resource, mimeType)).toBe(false)
         })
@@ -39,37 +30,13 @@ describe('HlsPlayback', () => {
         vi.mocked(HLSJS.isSupported).mockReturnValue(true)
       })
       describe.each([
-        [
-          '/123123_1232',
-          'application/x-mpegurl',
-          true,
-        ],
-        [
-          '/123123_1232',
-          'application/vnd.apple.mpegurl',
-          true,
-        ],
-        [
-          '/123123_1232.m3u8',
-          undefined,
-          true,
-        ],
-        [
-          '/123123_1232.mpd',
-          undefined,
-          false
-        ],
-        [
-          '/123123_1232.m3u8',
-          'video/mp4',
-          false
-        ],
-        [
-          '/123123_1232',
-          'video/mp4',
-          false
-        ],
-      ])("%s %s", (resource, mimeType, expected) => {
+        ['/123123_1232', 'application/x-mpegurl', true],
+        ['/123123_1232', 'application/vnd.apple.mpegurl', true],
+        ['/123123_1232.m3u8', undefined, true],
+        ['/123123_1232.mpd', undefined, false],
+        ['/123123_1232.m3u8', 'video/mp4', false],
+        ['/123123_1232', 'video/mp4', false],
+      ])('%s %s', (resource, mimeType, expected) => {
         it('should respect the mime type if present and file extention otherwise', () => {
           expect(HlsPlayback.canPlay(resource, mimeType)).toBe(expected)
         })

package/src/playback/types.ts

@@ -1,4 +1,3 @@
-
 export enum PlaybackEvents {
   /**
    * Emitted when the playback rate changes.

package/src/playback.types.ts

@@ -1,6 +1,6 @@
 /**
  * Playback time position in seconds since the beginning of the stream.
- * For the live streams this is limited to the length of a segment. When DVR is enabled, this refers to the 
+ * For the live streams this is limited to the length of a segment. When DVR is enabled, this refers to the
  * @public
  */
 export type TimeValue = number
@@ -144,4 +144,3 @@ export interface PlaybackError {
     icon?: string
   }
 }
-

package/src/plugins/audio-selector/AudioTracks.ts

@@ -221,7 +221,7 @@ export class AudioTracks extends UICorePlugin {
     return (
       this.$(
         '#gplayer-audiotracks-menu a' +
-        (id !== undefined ? `[data-item="${id}"]` : ''),
+          (id !== undefined ? `[data-item="${id}"]` : ''),
       ) as ZeptoResult
     ).parent()
   }

package/src/plugins/audio-selector/__tests__/AudioTracks.test.ts

@@ -35,7 +35,9 @@ describe('AudioTracks', () => {
       expect(audioTracks.$el.find('#gplayer-audiotracks-button').length).toBe(1)
     })
     it('should render menu hidden', () => {
-      expect(audioTracks.$el.find('#gplayer-audiotracks-menu').css('display')).toBe('none')
+      expect(
+        audioTracks.$el.find('#gplayer-audiotracks-menu').css('display'),
+      ).toBe('none')
     })
   })
   describe('until audio tracks are available', () => {
@@ -98,11 +100,17 @@ describe('AudioTracks', () => {
           expect(
             audioTracks.$el.find('#gplayer-audiotracks-menu').css('display'),
           ).toBe('none')
-          expect(audioTracks.$el.find('#gplayer-audiotracks-button').attr('aria-expanded')).toBe('false')
+          expect(
+            audioTracks.$el
+              .find('#gplayer-audiotracks-button')
+              .attr('aria-expanded'),
+          ).toBe('false')
         })
         it('should add changing class to the button', () => {
           expect(
-            audioTracks.$el.find('#gplayer-audiotracks-button').hasClass('changing'),
+            audioTracks.$el
+              .find('#gplayer-audiotracks-button')
+              .hasClass('changing'),
           ).toBe(true)
         })
         describe('when current audio track changes', () => {
@@ -140,14 +148,13 @@ describe('AudioTracks', () => {
             )
             expect(selectedItem.text().trim()).toBe('Spanish')
             expect(
-              selectedItem
-                .find('a[data-item]')
-                .hasClass('gcore-skin-active'),
+              selectedItem.find('a[data-item]').hasClass('gcore-skin-active'),
             ).toBe(true)
           })
           it('should unhighlight any previously highlighted menu item', () => {
             expect(
-              audioTracks.$el.find('#gplayer-audiotracks-menu li.current').length,
+              audioTracks.$el.find('#gplayer-audiotracks-menu li.current')
+                .length,
             ).toBe(1)
             expect(
               audioTracks.$el.find(
@@ -164,8 +171,14 @@ describe('AudioTracks', () => {
         audioTracks.$el.find('#gplayer-audiotracks-button').click()
       })
       it('should collapse the menu', () => {
-        expect(audioTracks.$el.find('#gplayer-audiotracks-menu').css('display')).toBe('none')
-        expect(audioTracks.$el.find('#gplayer-audiotracks-button').attr('aria-expanded')).toBe('false')
+        expect(
+          audioTracks.$el.find('#gplayer-audiotracks-menu').css('display'),
+        ).toBe('none')
+        expect(
+          audioTracks.$el
+            .find('#gplayer-audiotracks-button')
+            .attr('aria-expanded'),
+        ).toBe('false')
       })
     })
     describe('when media control is rendered', () => {
@@ -188,8 +201,14 @@ describe('AudioTracks', () => {
       core.activeContainer.emit(Events.CONTAINER_CLICK)
     })
     it('should hide the menu', () => {
-      expect(audioTracks.$el.find('#gplayer-audiotracks-menu').css('display')).toBe('none')
-      expect(audioTracks.$el.find('#gplayer-audiotracks-button').attr('aria-expanded')).toBe('false')
+      expect(
+        audioTracks.$el.find('#gplayer-audiotracks-menu').css('display'),
+      ).toBe('none')
+      expect(
+        audioTracks.$el
+          .find('#gplayer-audiotracks-button')
+          .attr('aria-expanded'),
+      ).toBe('false')
     })
   })
 })

package/src/plugins/bottom-gear/BottomGear.ts

@@ -332,8 +332,9 @@ export class BottomGear extends UICorePlugin {
   }
 
   private clampPopup($subMenu: ZeptoResult) {
-    const availableHeight =
-      this.core.getPlugin('media_control').getAvailablePopupHeight()
+    const availableHeight = this.core
+      .getPlugin('media_control')
+      .getAvailablePopupHeight()
     $subMenu.css('max-height', `${availableHeight}px`)
     $subMenu
       .find('.gear-sub-menu')

package/src/plugins/clappr-nerd-stats/NerdStats.ts

@@ -6,7 +6,7 @@ import {
   Container,
   Playback,
 } from '@clappr/core'
-import { reportError/* , trace */ } from '@gcorevideo/utils'
+import { reportError /* , trace */ } from '@gcorevideo/utils'
 import Mousetrap from 'mousetrap'
 import assert from 'assert'
 

package/src/plugins/clappr-nerd-stats/speedtest/index.ts

@@ -1,67 +1,80 @@
-import { type Server, type TestStatusInfo, Speedtest } from './Speedtest.js';
-import { SpeedtestMetrics } from './types.js';
+import { type Server, type TestStatusInfo, Speedtest } from './Speedtest.js'
+import { SpeedtestMetrics } from './types.js'
 
-const DIGITS_THRESHOLD = 99999;
-const DEFAULT_DOWNLOAD_SPEED = '0.00';
+const DIGITS_THRESHOLD = 99999
+const DEFAULT_DOWNLOAD_SPEED = '0.00'
 
-const DRAW_SIZE = 5;
+const DRAW_SIZE = 5
 
 // const T = 'plugins.clappr_nerd_stats.speedtest';
 
 function limitDigits(value: number): string {
-  return value > DIGITS_THRESHOLD ? '> ' + DIGITS_THRESHOLD : value.toFixed(2);
+  return value > DIGITS_THRESHOLD ? '> ' + DIGITS_THRESHOLD : value.toFixed(2)
 }
 
 function getElementById(id: string): Element | null {
-  return document.getElementById(id);
+  return document.getElementById(id)
 }
 
-const speedTest = new Speedtest();
+const speedTest = new Speedtest()
 
-const speedtestResults: number[] = [];
+const speedtestResults: number[] = []
 
-const serversList: Server[] = [];
+const serversList: Server[] = []
 
 const getColor = (speedValue: number): string => {
   if (speedValue < 3) {
-    return '#df564d';
+    return '#df564d'
   } else if (speedValue < 7) {
-    return '#df934d';
+    return '#df934d'
   } else if (speedValue < 13) {
-    return '#dfd04d';
+    return '#dfd04d'
   } else if (speedValue < 25) {
-    return '#c2df4d';
+    return '#c2df4d'
   } else {
-    return '#73df4d';
+    return '#73df4d'
   }
-};
+}
 
 export function drawSpeedTestResults() {
-  const canvas = document.getElementById('nerd-stats-speed-test-canvas');
+  const canvas = document.getElementById('nerd-stats-speed-test-canvas')
   if (!canvas) {
-    return;
+    return
   }
-  const ctx = (canvas as HTMLCanvasElement).getContext('2d');
+  const ctx = (canvas as HTMLCanvasElement).getContext('2d')
   if (!ctx) {
-    return;
+    return
   }
-  ctx.clearRect(0, 0, (canvas as HTMLCanvasElement).width, (canvas as HTMLCanvasElement).height);
+  ctx.clearRect(
+    0,
+    0,
+    (canvas as HTMLCanvasElement).width,
+    (canvas as HTMLCanvasElement).height,
+  )
 
-  const barWidth = (canvas as HTMLCanvasElement).width / DRAW_SIZE;
+  const barWidth = (canvas as HTMLCanvasElement).width / DRAW_SIZE
 
   for (let i = 0; i < speedtestResults.length; i++) {
-    const height = (speedtestResults[i] / 100) * (canvas as HTMLCanvasElement).height; // assuming max speed is 100 for 100% height
-
-    ctx.fillStyle = getColor(speedtestResults[i]);
-    ctx.fillRect(i * barWidth, (canvas as HTMLCanvasElement).height - height, barWidth, height);
+    const height =
+      (speedtestResults[i] / 100) * (canvas as HTMLCanvasElement).height // assuming max speed is 100 for 100% height
+
+    ctx.fillStyle = getColor(speedtestResults[i])
+    ctx.fillRect(
+      i * barWidth,
+      (canvas as HTMLCanvasElement).height - height,
+      barWidth,
+      height,
+    )
   }
 }
 
-let inited: Promise<void> | null = null;
+let inited: Promise<void> | null = null
 
-export const initSpeedTest = (customMetrics: SpeedtestMetrics): Promise<void> => {
+export const initSpeedTest = (
+  customMetrics: SpeedtestMetrics,
+): Promise<void> => {
   if (inited !== null) {
-    return inited;
+    return inited
   }
   inited = (async () => {
     // TODO: fix server selection
@@ -70,126 +83,135 @@ export const initSpeedTest = (customMetrics: SpeedtestMetrics): Promise<void> =>
 
     // SPEEDTEST_SERVERS[0].server = `http://${data.Server}.fe.gc.onl/speedtest/`;
 
-    speedTest.onupdate = function (data: TestStatusInfo) { //callback to update data in UI
-      if (![0, 1].includes(data.testState) && typeof data.dlStatus === 'number') {
-        const dlSpeed = limitDigits(data.dlStatus);
-        const el = getElementById('dlText');
+    speedTest.onupdate = function (data: TestStatusInfo) {
+      //callback to update data in UI
+      if (
+        ![0, 1].includes(data.testState) &&
+        typeof data.dlStatus === 'number'
+      ) {
+        const dlSpeed = limitDigits(data.dlStatus)
+        const el = getElementById('dlText')
         if (el) {
-          el.textContent = dlSpeed;
+          el.textContent = dlSpeed
         }
-        customMetrics.connectionSpeed = rankConnectionSpeed(data.dlStatus);
+        customMetrics.connectionSpeed = rankConnectionSpeed(data.dlStatus)
       }
 
-      const pingStatus = parseFloat(data.pingStatus);
+      const pingStatus = parseFloat(data.pingStatus)
       if (pingStatus > 0) {
-        const el = getElementById('pingText');
+        const el = getElementById('pingText')
         if (el) {
-          el.textContent = data.pingStatus;
+          el.textContent = data.pingStatus
         }
-        customMetrics.ping = pingStatus;
+        customMetrics.ping = pingStatus
       }
 
-      const jitterStatus = parseFloat(data.jitterStatus);
+      const jitterStatus = parseFloat(data.jitterStatus)
       if (jitterStatus > 0) {
-        const el = getElementById('jitterText');
+        const el = getElementById('jitterText')
         if (el) {
-          el.textContent = data.jitterStatus;
+          el.textContent = data.jitterStatus
         }
-        customMetrics.jitter = jitterStatus;
+        customMetrics.jitter = jitterStatus
       }
 
       if (data.dlStatus === 0) {
-        return;
+        return
       }
       if (typeof data.dlStatus === 'number') {
-        speedtestResults.push(data.dlStatus);
+        speedtestResults.push(data.dlStatus)
       }
 
       // Keep only the last 10 results
       if (speedtestResults.length > DRAW_SIZE) {
-        speedtestResults.shift();
+        speedtestResults.shift()
       }
 
-      drawSpeedTestResults();
-    };
+      drawSpeedTestResults()
+    }
 
-    speedTest.onend = function (aborted: boolean) { //callback for test ended/aborted
-      if (aborted) { //if the test was aborted, clear the UI and prepare for new test
+    speedTest.onend = function (aborted: boolean) {
+      //callback for test ended/aborted
+      if (aborted) {
+        //if the test was aborted, clear the UI and prepare for new test
         // TODO: fix
-        const el = getElementById('dlText');
+        const el = getElementById('dlText')
         if (el) {
-          el.textContent = DEFAULT_DOWNLOAD_SPEED;
+          el.textContent = DEFAULT_DOWNLOAD_SPEED
         }
       }
-    };
+    }
 
     const myinfoUrl = 'https://gcore.com/.well-known/cdn-debug/json'
     // await fetch('https://iam.gcdn.co/info/json')
     await fetch(myinfoUrl)
-      .then(r => r.json())
-      .then(data => {
+      .then((r) => r.json())
+      .then((data) => {
         // const country = data['Server Country code'].toLowerCase();
         const country = getCountryCodeFromClientHeaders(data.client_headers)
-        const server = serversList.find(s => s.country === country) || serversList[0];
+        const server =
+          serversList.find((s) => s.country === country) || serversList[0]
         if (!server) {
-          throw new Error('Failed to select a server');
+          throw new Error('Failed to select a server')
         }
-        speedTest.addTestPoint(server);
-        speedTest.setSelectedServer(server);
-      });
-  })();
+        speedTest.addTestPoint(server)
+        speedTest.setSelectedServer(server)
+      })
+  })()
 
-  return inited;
-};
+  return inited
+}
 
 export const stopSpeedtest = () => {
   if (speedTest.getState() === 3) {
-    speedTest.abort();
+    speedTest.abort()
   }
-};
+}
 
-export const startSpeedtest = () =>  {
+export const startSpeedtest = () => {
   if (speedTest.getState() !== 3) {
-    speedTest.start();
+    speedTest.start()
   }
-};
+}
 
 export const clearSpeedTestResults = () => {
-  speedtestResults.splice(0, speedtestResults.length);
-};
+  speedtestResults.splice(0, speedtestResults.length)
+}
 
 export function configureSpeedTest(servers: Server[]) {
   // speedTest.addTestPoints(servers);
-  serversList.push(...servers);
+  serversList.push(...servers)
 }
 
-type ConnectionSpeed = 0 | 1 | 2 | 3 | 4 | 5;
+type ConnectionSpeed = 0 | 1 | 2 | 3 | 4 | 5
 
 function rankConnectionSpeed(dlSpeed: number): ConnectionSpeed {
   if (dlSpeed >= 100) {
-    return 5;
+    return 5
   }
   if (dlSpeed >= 25) {
-    return 4;
+    return 4
   }
   if (dlSpeed >= 10) {
-    return 3;
+    return 3
   }
   if (dlSpeed >= 2) {
-    return 2;
+    return 2
   }
   if (dlSpeed >= 0.5) {
-    return 1;
+    return 1
   }
-  return 0;
+  return 0
 }
 
-function getCountryCodeFromClientHeaders(clientHeaders: Record<string, string>): string {
+function getCountryCodeFromClientHeaders(
+  clientHeaders: Record<string, string>,
+): string {
   if (clientHeaders && clientHeaders['country']) {
-    const m = clientHeaders['country'].match(/'code':\s*'([A-Za-z]{2})'/);
+    const m = clientHeaders['country'].match(/'code':\s*'([A-Za-z]{2})'/)
     if (m) {
-      return m[1].toLowerCase();
+      return m[1].toLowerCase()
     }
   }
-  return 'lu';
+  return 'lu'
 }

package/src/plugins/clappr-nerd-stats/speedtest/types.ts

@@ -1,5 +1,5 @@
 export type SpeedtestMetrics = {
-  ping: number;
-  jitter: number;
-  connectionSpeed: number;
+  ping: number
+  jitter: number
+  connectionSpeed: number
 }

package/src/plugins/clappr-nerd-stats/utils.ts

@@ -1,5 +1,5 @@
-import { ZeptoResult } from "../../types"
-import { SpeedtestMetrics } from "./speedtest/types"
+import { ZeptoResult } from '../../types'
+import { SpeedtestMetrics } from './speedtest/types'
 
 const qualityClasses = [
   'speedtest-quality-value-1',

package/src/plugins/clappr-stats/__tests__/ClapprStats.test.ts

@@ -4,7 +4,11 @@ import FakeTimers from '@sinonjs/fake-timers'
 
 import { ClapprStats } from '../ClapprStats'
 import { createMockCore } from '../../../testUtils'
-import { ClapprStatsChronograph, ClapprStatsCounter, ClapprStatsEvents } from '../types'
+import {
+  ClapprStatsChronograph,
+  ClapprStatsCounter,
+  ClapprStatsEvents,
+} from '../types'
 
 describe('ClapprStats', () => {
   let core: any
@@ -86,13 +90,15 @@ describe('ClapprStats', () => {
         core.activeContainer.trigger(CoreEvents.CONTAINER_STOP)
       })
       it('should measure', () => {
-        expect(onReport).toHaveBeenCalledWith(expect.objectContaining({
-          chrono: expect.objectContaining({
-            [ClapprStatsChronograph.Session]: 60200,
+        expect(onReport).toHaveBeenCalledWith(
+          expect.objectContaining({
+            chrono: expect.objectContaining({
+              [ClapprStatsChronograph.Session]: 60200,
+            }),
           }),
-        }))
+        )
       })
-    })  
+    })
   })
   describe('fps measurements', () => {
     beforeEach(async () => {
@@ -114,20 +120,26 @@ describe('ClapprStats', () => {
       core.activeContainer.trigger(CoreEvents.CONTAINER_STOP)
     })
     it('should measure fps', () => {
-      expect(onReport).toHaveBeenNthCalledWith(1, expect.objectContaining({
-        counters: expect.objectContaining({
-          [ClapprStatsCounter.DecodedFrames]: 126,
-          [ClapprStatsCounter.DroppedFrames]: 3,
-          [ClapprStatsCounter.Fps]: expect.closeTo(25, 0),
+      expect(onReport).toHaveBeenNthCalledWith(
+        1,
+        expect.objectContaining({
+          counters: expect.objectContaining({
+            [ClapprStatsCounter.DecodedFrames]: 126,
+            [ClapprStatsCounter.DroppedFrames]: 3,
+            [ClapprStatsCounter.Fps]: expect.closeTo(25, 0),
+          }),
         }),
-      }))
-      expect(onReport).toHaveBeenNthCalledWith(2, expect.objectContaining({
-        counters: expect.objectContaining({
-          [ClapprStatsCounter.DecodedFrames]: 275,
-          [ClapprStatsCounter.DroppedFrames]: 4,
-          [ClapprStatsCounter.Fps]: expect.closeTo(30, 0),
+      )
+      expect(onReport).toHaveBeenNthCalledWith(
+        2,
+        expect.objectContaining({
+          counters: expect.objectContaining({
+            [ClapprStatsCounter.DecodedFrames]: 275,
+            [ClapprStatsCounter.DroppedFrames]: 4,
+            [ClapprStatsCounter.Fps]: expect.closeTo(30, 0),
+          }),
         }),
-      }))
+      )
     })
   })
 })