@gcorevideo/player 2.28.25 → 2.28.26

package/src/plugins/thumbnails/__tests__/Thumbnails.test.ts

@@ -2,7 +2,6 @@ import { describe, it, expect, beforeEach, vi } from 'vitest'
 
 import { Events } from '@clappr/core'
 
-
 import { createMockCore, createMockMediaControl } from '../../../testUtils'
 
 import { Thumbnails } from '../Thumbnails'
@@ -108,13 +107,13 @@ describe('Thumbnails', () => {
           case 'media_control':
             return mediaControl
         }
-      });
+      })
       thumbnails = new Thumbnails(core)
     })
     describe('loading', () => {
       beforeEach(async () => {
         core.emit(Events.CORE_READY)
-        await new Promise(resolve => setTimeout(resolve, 1))
+        await new Promise((resolve) => setTimeout(resolve, 1))
       })
       it('should render', () => {
         expect(thumbnails.$el.html()).toMatchSnapshot()
@@ -123,10 +122,14 @@ describe('Thumbnails', () => {
         expect(core.$el.find('.scrub-thumbnails')).toHaveLength(1)
       })
       it('should load image dimensions', () => {
-        expect(loadImageDimensions).toHaveBeenCalledWith('https://example.com/sprite.png')
+        expect(loadImageDimensions).toHaveBeenCalledWith(
+          'https://example.com/sprite.png',
+        )
       })
       it('should parse sprite sheet and create thumbnails', () => {
-        const thumbs = thumbnails.$el.find('#thumbnails-carousel .thumbnail-container')
+        const thumbs = thumbnails.$el.find(
+          '#thumbnails-carousel .thumbnail-container',
+        )
         expect(thumbs).toHaveLength(2)
       })
       it('should hide', () => {
@@ -137,7 +140,7 @@ describe('Thumbnails', () => {
       describe('when mouse pointer is over the scrubber', () => {
         beforeEach(async () => {
           core.emit(Events.CORE_READY)
-          await new Promise(resolve => setTimeout(resolve, 1))
+          await new Promise((resolve) => setTimeout(resolve, 1))
           mediaControl.container.getDuration.mockReturnValue(5)
           vi.spyOn(thumbnails.$el, 'width').mockReturnValue(300)
           mediaControl.trigger(Events.MEDIACONTROL_MOUSEMOVE_SEEKBAR, {}, 0.5)
@@ -146,7 +149,11 @@ describe('Thumbnails', () => {
           expect(thumbnails.$el.hasClass('hidden')).toBe(false)
         })
         it('should show the matching spotlight thumbnail', () => {
-          expect(thumbnails.$el.find('#thumbnails-spotlight .thumbnail-container').css('background-position')).toBe('-100px 0px')
+          expect(
+            thumbnails.$el
+              .find('#thumbnails-spotlight .thumbnail-container')
+              .css('background-position'),
+          ).toBe('-100px 0px')
         })
       })
     })

package/src/plugins/thumbnails/utils.ts

@@ -1,4 +1,6 @@
-export function loadImageDimensions(url: string): Promise<{ width: number, height: number }> {
+export function loadImageDimensions(
+  url: string,
+): Promise<{ width: number; height: number }> {
   return new Promise((resolve, reject) => {
     const img = new Image()
     img.src = url

package/src/plugins/typings/globals.d.ts

@@ -1,10 +1,10 @@
 declare interface HTMLVideoElement {
-    webkitDisplayingFullscreen?: boolean;
+  webkitDisplayingFullscreen?: boolean
 }
 
-declare module "*.css";
-declare module "*.ejs";
-declare module "*.ejs?raw";
-declare module "*.html";
-declare module "*.scss";
-declare module "*.svg";
+declare module '*.css'
+declare module '*.ejs'
+declare module '*.ejs?raw'
+declare module '*.html'
+declare module '*.scss'
+declare module '*.svg'

package/src/plugins/typings/workers.d.ts

@@ -1,3 +1,3 @@
-declare module "*.worker.js" {
-    export default string;
-}
+declare module '*.worker.js' {
+  export default string
+}

package/src/plugins/utils/fullscreen.ts

@@ -1,5 +1,5 @@
-import { Browser, Utils } from '@clappr/core';
-import { reportError } from '@gcorevideo/utils';
+import { Browser, Utils } from '@clappr/core'
+import { reportError } from '@gcorevideo/utils'
 
 export const fullscreenEnabled = Utils.Fullscreen.fullscreenEnabled
 

package/src/plugins/utils.ts

@@ -1,9 +1,9 @@
 export function getLocation(href: string) {
-  const l = document.createElement('a');
+  const l = document.createElement('a')
 
-  l.href = href;
+  l.href = href
 
-  return l;
+  return l
 }
 
 /**
@@ -16,33 +16,37 @@ export function getLocation(href: string) {
  */
 export function parseClipTime(str: string): number {
   if (!str) {
-    return 0;
+    return 0
   }
-  const arr = str.split(/:/);
-  let h = 0, m = 0, s = 0;
+  const arr = str.split(/:/)
+  let h = 0,
+    m = 0,
+    s = 0
 
   if (arr.length >= 3) {
-    h = parseInt(arr[arr.length - 3]) * 60 * 60;
+    h = parseInt(arr[arr.length - 3]) * 60 * 60
   }
   if (arr.length >= 2) {
-    m = parseInt(arr[arr.length - 2]) * 60;
+    m = parseInt(arr[arr.length - 2]) * 60
   }
 
   if (arr.length >= 1) {
-    s = parseInt(arr[arr.length - 1]);
+    s = parseInt(arr[arr.length - 1])
   }
 
-  return (h + m + s);
+  return h + m + s
 }
 
 export function getPageX(event: MouseEvent | TouchEvent): number {
   if ((event as MouseEvent).pageX) {
-    return (event as MouseEvent).pageX;
+    return (event as MouseEvent).pageX
   }
 
   if ((event as TouchEvent).changedTouches) {
-    return (event as TouchEvent).changedTouches[(event as TouchEvent).changedTouches.length - 1].pageX;
+    return (event as TouchEvent).changedTouches[
+      (event as TouchEvent).changedTouches.length - 1
+    ].pageX
   }
 
-  return 0;
+  return 0
 }

package/src/plugins/vast-ads/VastAds.ts

@@ -223,7 +223,7 @@ export class VastAds extends UICorePlugin {
           )
         } else {
           this.countRepeatableRoll = this.findCloserAdvertisement(
-                this.options.vastAds.repeatableroll,
+            this.options.vastAds.repeatableroll,
             'startTime',
             this.countRepeatableRoll,
             e,
@@ -626,9 +626,7 @@ export class VastAds extends UICorePlugin {
     this._posterPlugin = this._container?.getPlugin('poster')
 
     // Attempt to get click-to-pause plugin. (May interfere with advert click handling)
-    this._clickToPausePlugin = this._container?.getPlugin(
-      'click_to_pause',
-    )
+    this._clickToPausePlugin = this._container?.getPlugin('click_to_pause')
 
     assert(this.playback, 'playback is not defined')
     this._contentElement = this.playback.el
@@ -790,7 +788,8 @@ export class VastAds extends UICorePlugin {
 
     this.currentState = ''
     this.$el.hide()
-    if (!this.options.disableClickOnPause) { // TODO sort out
+    if (!this.options.disableClickOnPause) {
+      // TODO sort out
       this._clickToPausePlugin?.enable()
     }
 

package/src/plugins/vast-ads/loaderxml.ts

@@ -1,260 +1,301 @@
-import { reportError } from '@gcorevideo/utils';
-import assert from 'assert';
-import URLHandler from './urlhandler.js';
-import MergeVast from './xmlmerge.js';
-import { parseClipTime } from '../utils.js';
+import { reportError } from '@gcorevideo/utils'
+import assert from 'assert'
+import URLHandler from './urlhandler.js'
+import MergeVast from './xmlmerge.js'
+import { parseClipTime } from '../utils.js'
 
 export default class LoaderXML {
-  private config: string = '';
+  private config: string = ''
 
   constructor(private url: string) {}
 
   async startLoad() {
     return new Promise<{ url: string }>((resolve, reject) => {
       if (this._isGoogle(this.url)) {
-        resolve({ url: this.url });
+        resolve({ url: this.url })
       } else {
         this.parse(this.url, null, {}, (response: any, err: any) => {
           if (err) {
-            reject(err);
+            reject(err)
           } else {
-            resolve(response);
+            resolve(response)
           }
-        });
+        })
       }
-    });
+    })
   }
 
-  parse(url: string, parentURLs: string | string[] | null, options: any, cb?: (response: any | null, err: any) => void) {
+  parse(
+    url: string,
+    parentURLs: string | string[] | null,
+    options: any,
+    cb?: (response: any | null, err: any) => void,
+  ) {
     // Options param can be skipped
     if (!cb) {
       if (typeof options === 'function') {
-        cb = options;
+        cb = options
       }
-      options = {};
+      options = {}
     }
 
-    options.withCredentials = !this._isGoogle(url);
-    options.timeout = 2000;
+    options.withCredentials = !this._isGoogle(url)
+    options.timeout = 2000
 
     assert(cb)
 
     URLHandler.get(url, options, (err: any, xml: any) => {
       if (err) {
-        return cb(null, err);
+        return cb(null, err)
       }
 
-      return this.parseXmlDocument(url, parentURLs, options, xml, cb);
-    });
+      return this.parseXmlDocument(url, parentURLs, options, xml, cb)
+    })
   }
 
   _isGoogle(url: string) {
-    return url.indexOf('g.doubleclick.net') > -1 ||
+    return (
+      url.indexOf('g.doubleclick.net') > -1 ||
       url.indexOf('ima3vpaid.appspot') > -1 ||
-      url.indexOf('an.facebook.com') > -1;
+      url.indexOf('an.facebook.com') > -1
+    )
   }
 
-  parseXmlDocument(url: string, parentURLs: string | string[] | null, options: any, xml: any, cb: (response: any, err?: any) => void) {
+  parseXmlDocument(
+    url: string,
+    parentURLs: string | string[] | null,
+    options: any,
+    xml: any,
+    cb: (response: any, err?: any) => void,
+  ) {
     if (xml.indexOf('Wrapper')) {
-      xml = xml.replace(/Wrapper/g, 'InLine');
+      xml = xml.replace(/Wrapper/g, 'InLine')
     }
 
-    this.extendXML(xml);
-    const vastAdTagUri = this.getWrapperUrl();
+    this.extendXML(xml)
+    const vastAdTagUri = this.getWrapperUrl()
 
     if (vastAdTagUri) {
-      this.parse(vastAdTagUri, url, options, cb);
+      this.parse(vastAdTagUri, url, options, cb)
     } else {
-      const ext = this.getExtension();
-      const skipTime = this.timeSkipOffset();
-      const clickUrls = this.clickUrls();
-      const url = { config: this.config };
+      const ext = this.getExtension()
+      const skipTime = this.timeSkipOffset()
+      const clickUrls = this.clickUrls()
+      const url = { config: this.config }
 
       if (this.config.indexOf('<MediaFile') > -1) {
-        cb(Object.assign(url, ext, skipTime, clickUrls));
+        cb(Object.assign(url, ext, skipTime, clickUrls))
       } else {
-        cb(null, { error: 'nobanner' });
+        cb(null, { error: 'nobanner' })
       }
     }
   }
 
   clickUrls() {
-    const clickTrackings = this.getUrls('ClickTracking') || [];
-    const clickThrough = this.getUrls('ClickThrough').length > 0 ? this.getUrls('ClickThrough')[0] : '';
+    const clickTrackings = this.getUrls('ClickTracking') || []
+    const clickThrough =
+      this.getUrls('ClickThrough').length > 0
+        ? this.getUrls('ClickThrough')[0]
+        : ''
 
-    this.removeTag('ClickThrough');
+    this.removeTag('ClickThrough')
 
-    return { clickTrackings, clickThrough };
+    return { clickTrackings, clickThrough }
   }
 
   timeSkipOffset() {
-    const skipEvents = this.getUrls('Tracking', 'event="skip"');
-    const progressEvents = this.getUrls('Tracking', 'event="progress"');
-    const linearSkipOffset = this.config.match(/skipoffset="(\d+:\d+:\d+){1}"/);
-    let timeOffset = -1;
+    const skipEvents = this.getUrls('Tracking', 'event="skip"')
+    const progressEvents = this.getUrls('Tracking', 'event="progress"')
+    const linearSkipOffset = this.config.match(/skipoffset="(\d+:\d+:\d+){1}"/)
+    let timeOffset = -1
 
     if (skipEvents.length > 0) {
-      timeOffset = 5;
-      this.removeTag('Tracking', 'event="skip"');
+      timeOffset = 5
+      this.removeTag('Tracking', 'event="skip"')
     }
 
     if (progressEvents.length > 0) {
-      timeOffset = 5;
-      this.removeTag('Tracking', 'event="progress"');
+      timeOffset = 5
+      this.removeTag('Tracking', 'event="progress"')
     }
 
     if (linearSkipOffset && linearSkipOffset.length > 1) {
-      timeOffset = parseClipTime(linearSkipOffset[1]);
-      this.config = this.config.replace(/<Linear skipoffset="(\d+:\d+:\d+)".*?>/g, '<Linear>');
+      timeOffset = parseClipTime(linearSkipOffset[1])
+      this.config = this.config.replace(
+        /<Linear skipoffset="(\d+:\d+:\d+)".*?>/g,
+        '<Linear>',
+      )
     }
 
-    return { skipEvents, progressEvents, timeOffset };
+    return { skipEvents, progressEvents, timeOffset }
   }
 
   getExtension() {
-    const extensions = this.getTag('Extensions');
+    const extensions = this.getTag('Extensions')
 
     if (!extensions) {
-      return {};
+      return {}
     }
-    const xml = this.parseXML(extensions[0]);
-    assert(xml, 'xml is null');
-    const items = xml.getElementsByTagName('Extension');
-    const extObj: { controls?: string; isClickable?: string; } & Record<string, string> = {};
+    const xml = this.parseXML(extensions[0])
+    assert(xml, 'xml is null')
+    const items = xml.getElementsByTagName('Extension')
+    const extObj: { controls?: string; isClickable?: string } & Record<
+      string,
+      string
+    > = {}
 
-    extObj.controls === '1';
+    extObj.controls === '1'
 
     for (let i = 0; i < items.length; i++) {
       try {
-        const eventName = items[i].getAttribute('type');
-        let trackingURLTemplate = '';
+        const eventName = items[i].getAttribute('type')
+        let trackingURLTemplate = ''
 
         if (items[i].children && items[i].children.length > 0) {
-          trackingURLTemplate = String(items[i]); // TODO or textContent
+          trackingURLTemplate = String(items[i]) // TODO or textContent
         } else {
-          trackingURLTemplate = this.getExtensionNode(items[i]);
+          trackingURLTemplate = this.getExtensionNode(items[i])
         }
         if (eventName && trackingURLTemplate) {
           try {
-            extObj[eventName] = trackingURLTemplate;
+            extObj[eventName] = trackingURLTemplate
           } catch (error) {
             // LogManager.exception(error);
-            reportError(error);
+            reportError(error)
           }
         }
       } catch (error) {
         // LogManager.exception(error);
-        reportError(error);
-        continue;
+        reportError(error)
+        continue
       }
     }
     if (!extObj.isClickable) {
-      extObj.isClickable = '1';
+      extObj.isClickable = '1'
     }
     //может оно и не надо
     if (extObj.isClickable === '0') {
-      this.removeTag('VideoClicks');
+      this.removeTag('VideoClicks')
     }
     if (extObj.skipTime2) {
       if (extObj.skipTime2.split(':').length === 2) {
-        extObj.skipTime2 = '00:' + extObj.skipTime2;
+        extObj.skipTime2 = '00:' + extObj.skipTime2
       }
       if (this.config.indexOf('Linear') > -1) {
-        this.config = this.config.replace(/<Linear.*?>/g, '<Linear skipoffset="' + extObj.skipTime2 + '">');
+        this.config = this.config.replace(
+          /<Linear.*?>/g,
+          '<Linear skipoffset="' + extObj.skipTime2 + '">',
+        )
       }
     }
 
-    return extObj;
+    return extObj
   }
 
   getExtensionNode(node: Element): string {
     if (!node) {
-      return '';
+      return ''
     }
-    const result = (node.textContent || (node as any).text || '').trim();
+    const result = (node.textContent || (node as any).text || '').trim()
 
-    return result;
+    return result
   }
 
   getWrapperUrl() {
-    const vastAdTagUri = this.getUrls('VASTAdTagURI')[0];
+    const vastAdTagUri = this.getUrls('VASTAdTagURI')[0]
 
-    this.removeTag('VASTAdTagURI');
+    this.removeTag('VASTAdTagURI')
 
-    return vastAdTagUri;
+    return vastAdTagUri
   }
 
   getTag(name: string, attr?: string): string[] | null {
-    let tag = '<' + name + '.*?>';
+    let tag = '<' + name + '.*?>'
 
     if (attr) {
-      tag = '<' + name + ' ' + attr + '.*?>';
+      tag = '<' + name + ' ' + attr + '.*?>'
     }
-    const matchString = new RegExp(tag + '(.|\n|\r)*?' + '<\\/' + name + '>', 'g');
+    const matchString = new RegExp(
+      tag + '(.|\n|\r)*?' + '<\\/' + name + '>',
+      'g',
+    )
 
-    return this.config.match(matchString);
+    return this.config.match(matchString)
   }
 
   getUrls(tag: string, attr?: string): string[] {
-    const matched = this.getTag(tag, attr);
-    const res: string[] = [];
+    const matched = this.getTag(tag, attr)
+    const res: string[] = []
 
     if (matched) {
       for (let i = 0; i < matched.length; i++) {
         if (matched[i].indexOf('<![CDATA[') > -1) {
-          const lengthCDATA = 9;
-
-          res.push(matched[i].substring(matched[i].indexOf('<![CDATA[') + lengthCDATA, matched[i].indexOf(']]>')));
+          const lengthCDATA = 9
+
+          res.push(
+            matched[i].substring(
+              matched[i].indexOf('<![CDATA[') + lengthCDATA,
+              matched[i].indexOf(']]>'),
+            ),
+          )
         } else {
           if (matched[i].indexOf('https://') > -1) {
-            res.push(matched[i].substring(matched[i].indexOf('https://'), matched[i].length - 1));
+            res.push(
+              matched[i].substring(
+                matched[i].indexOf('https://'),
+                matched[i].length - 1,
+              ),
+            )
           }
         }
       }
     }
 
-    return res;
+    return res
   }
 
   parseXML(val: string): XMLDocument | null {
-    let xmlDoc = null;
+    let xmlDoc = null
 
-    if (document.implementation && (document.implementation as any).createDocument) {
-      xmlDoc = (new DOMParser()).parseFromString(val, 'application/xml');
+    if (
+      document.implementation &&
+      (document.implementation as any).createDocument
+    ) {
+      xmlDoc = new DOMParser().parseFromString(val, 'application/xml')
     } else if ('ActiveXObject' in window) {
-      xmlDoc = new (window.ActiveXObject as any)('Microsoft.XMLDOM');
-      xmlDoc.loadXML(val);
+      xmlDoc = new (window.ActiveXObject as any)('Microsoft.XMLDOM')
+      xmlDoc.loadXML(val)
     } else {
-      return null;
+      return null
     }
 
-    return xmlDoc;
+    return xmlDoc
   }
 
   removeTag(name: string, attr?: string) {
-    let tag = '<'+name+'.*?>';
+    let tag = '<' + name + '.*?>'
 
     if (attr) {
-      tag = '<'+name+' ' + attr + '.*?>';
+      tag = '<' + name + ' ' + attr + '.*?>'
     }
-    const filter = new RegExp(tag + '(.|\n|\r)*?' + '<\\/' + name + '>', 'g');
+    const filter = new RegExp(tag + '(.|\n|\r)*?' + '<\\/' + name + '>', 'g')
 
-    this.config = this.config.replace(filter, '');
+    this.config = this.config.replace(filter, '')
   }
 
   extendXML(xml: string) {
     if (xml.indexOf('<?xml') < 0) {
-      xml = '<?xml version="1.0" encoding="utf-8"?>' + xml;
+      xml = '<?xml version="1.0" encoding="utf-8"?>' + xml
     }
     if (!this.config) {
-      this.config = xml;
+      this.config = xml
 
-      return;
+      return
     } else {
-      const xmlMerge = new MergeVast(this.config, xml);
+      const xmlMerge = new MergeVast(this.config, xml)
 
-      this.config = xmlMerge.merge();
-      this.config = this.config.replace(/<\?xml.+\?>/g, '');
+      this.config = xmlMerge.merge()
+      this.config = this.config.replace(/<\?xml.+\?>/g, '')
     }
   }
 }