@playkit-js/playkit-js-providers 2.41.0-canary.0-2452bbc → 2.41.0-canary.0-3d6d02a

package/src/k-provider/ovp/provider-parser.ts

@@ -21,6 +21,7 @@ import {KalturaAccessControlMessage} from '../common/response-types/kaltura-acce
 import type {OVPMediaEntryLoaderResponse} from './loaders/media-entry-loader';
 import {ExternalCaptionsBuilder} from './external-captions-builder';
 import {ImageSource} from '../../entities/image-source';
+import {DocumentSource} from '../../entities/document-source';
 
 class OVPProviderParser {
   private static _logger = getLogger('OVPProviderParser');
@@ -44,7 +45,7 @@ class OVPProviderParser {
     const kalturaSources = playbackContext.sources;
 
     mediaEntry.sources = OVPProviderParser._getParsedSources(kalturaSources, ks, partnerId, uiConfId, entry, playbackContext);
-    OVPProviderParser._fillBaseData(mediaEntry, entry, metadataList);
+    OVPProviderParser._fillBaseData(mediaEntry, entry, metadataList, playbackContext);
     if (mediaEntry.type !== MediaEntry.Type.LIVE && OVPConfiguration.get().useApiCaptions && playbackContext.data.playbackCaptions) {
       mediaEntry.sources.captions = ExternalCaptionsBuilder.createConfig(playbackContext.data.playbackCaptions, ks);
     }
@@ -150,7 +151,7 @@ class OVPProviderParser {
     }
   }
 
-  private static _fillBaseData(mediaEntry: MediaEntry, entry: KalturaMediaEntry, metadataList?: KalturaMetadataListResponse): MediaEntry {
+  private static _fillBaseData(mediaEntry: MediaEntry, entry: KalturaMediaEntry, metadataList?: KalturaMetadataListResponse, playbackContext?: any): MediaEntry {
     mediaEntry.poster = entry.poster;
     mediaEntry.id = entry.id;
     mediaEntry.duration = entry.duration;
@@ -173,6 +174,16 @@ class OVPProviderParser {
       mediaEntry.dvrStatus = entry.dvrStatus;
     }
 
+    if (playbackContext &&
+      playbackContext.flavorAssets[0] &&
+      playbackContext.flavorAssets[0].width && playbackContext.flavorAssets[0].height) {
+
+      const {height, width} = playbackContext.flavorAssets[0];
+      mediaEntry.metadata.heightRatio = +Number(height / width).toFixed(2);
+    } else {
+      mediaEntry.metadata.heightRatio = 1.78;
+    }
+
     return mediaEntry;
   }
 
@@ -194,6 +205,9 @@ class OVPProviderParser {
       case KalturaMediaEntry.EntryType.LIVE_CHANNEL.value:
         type = MediaEntry.Type.LIVE;
         break;
+      case KalturaMediaEntry.EntryType.DOCUMENT.value:
+        type = MediaEntry.Type.DOCUMENT;
+        break;
       default:
         type = MediaEntry.Type.UNKNOWN;
       }
@@ -246,6 +260,10 @@ class OVPProviderParser {
       sources.image.push(new ImageSource(entry));
     };
 
+    const parseDocumentSources = (): void => {
+      sources.document.push(new DocumentSource(entry));
+    };
+
     const parseExternalMedia = (): void => {
       const mediaSource = new MediaSource();
       mediaSource.mimetype = 'video/youtube';
@@ -258,6 +276,8 @@ class OVPProviderParser {
       parseExternalMedia();
     } else if (entry.entryType === KalturaMediaEntry.MediaType.IMAGE.value) {
       parseImageSources();
+    } else if (entry.type === KalturaMediaEntry.EntryType.DOCUMENT.value) {
+      parseDocumentSources();
     } else if (kalturaSources && kalturaSources.length > 0) {
       parseAdaptiveSources();
       parseProgressiveSources();

package/src/k-provider/ovp/provider.ts

@@ -18,8 +18,10 @@ import {
   ProviderFilterOptionsObject,
   ProviderMediaConfigObject,
   ProviderMediaConfigSourcesObject,
-  ProviderOptionsObject, ProviderPlaylistInfoObject,
-  ProviderPlaylistObject, RequestLoader
+  ProviderOptionsObject,
+  ProviderPlaylistInfoObject,
+  ProviderPlaylistObject,
+  RequestLoader
 } from '../../types';
 
 export default class OVPProvider extends BaseProvider<OVPProviderMediaInfoObject> {
@@ -65,7 +67,7 @@ export default class OVPProvider extends BaseProvider<OVPProviderMediaInfoObject
           this._dataLoader.add(OVPSessionLoader, {widgetId: this.widgetId});
         }
         const redirectFromEntryId = this._getEntryRedirectFilter(mediaInfo);
-        this._dataLoader.add(OVPMediaEntryLoader, {entryId, ks, redirectFromEntryId, referenceId});
+        this._dataLoader.add(OVPMediaEntryLoader, {entryId, ks, redirectFromEntryId, referenceId, referrer: this._referrer});
         return this._dataLoader.fetchData().then(
           response => {
             try {
@@ -85,7 +87,7 @@ export default class OVPProvider extends BaseProvider<OVPProviderMediaInfoObject
     });
   }
 
-  public doRequest(loaders: Array<RequestLoader>, ks?: string): Promise<any> {
+  public doRequest(loaders: Array<RequestLoader>, ks?: string, requestsMustSucceed?: boolean): Promise<any> {
     const theKs: string = ks || this.ks;
     const dataLoader = new OVPDataLoaderManager(this.playerVersion, this.partnerId, theKs, this._networkRetryConfig);
 
@@ -98,7 +100,7 @@ export default class OVPProvider extends BaseProvider<OVPProviderMediaInfoObject
         // @ts-ignore
         dataLoader.add(loaderRequest.loader, loaderRequest.params, theKs || '{1:result:ks}');
       });
-      return dataLoader.fetchData().then(
+      return dataLoader.fetchData(requestsMustSucceed).then(
         response => {
           try {
             resolve(response);
@@ -319,6 +321,7 @@ export default class OVPProvider extends BaseProvider<OVPProviderMediaInfoObject
       dash: [],
       progressive: [],
       image: [],
+      document: [],
       id: '',
       duration: 0,
       type: MediaEntry.Type.UNKNOWN,
@@ -340,6 +343,7 @@ export default class OVPProvider extends BaseProvider<OVPProviderMediaInfoObject
     sourcesObject.dash = mediaSources.dash;
     sourcesObject.progressive = mediaSources.progressive;
     sourcesObject.image = mediaSources.image;
+    sourcesObject.document = mediaSources.document;
     sourcesObject.id = mediaEntry.id;
     sourcesObject.duration = mediaEntry.duration;
     sourcesObject.type = mediaEntry.type;

package/src/k-provider/ovp/regex-action-handler.ts

@@ -27,34 +27,39 @@ class RegexActionHandler {
   }
 
   /**
-   * Ping the ECDN url to check if alive
-   * @function _pingECDNUrl
+   * Ping the ECDN url and replace the host urls if needed
+   * @function _pingECDNAndReplaceHostUrls
+   * @param {ProviderMediaConfigObject} mediaConfig - The media config
    * @param {KalturaAccessControlModifyRequestHostRegexAction} regexAction - The regex action
    * @param {string} cdnUrl - The CDN url
-   * @returns {Promise<boolean>} - Whether the media config sources urls should be modified or not
+   * @returns {Promise<ProviderMediaConfigObject>} - The media config with old or modified urls
    * @static
    * @private
    */
-  private static async _isECDNUrlAlive(regexAction: KalturaAccessControlModifyRequestHostRegexAction, cdnUrl: string): Promise<boolean> {
-    const urlPing = cdnUrl + '/api_v3/service/system/action/ping/format/1';
-    const req = new XMLHttpRequest();
-    req.open('GET', urlPing);
-    req.timeout = regexAction.checkAliveTimeoutMs;
-    req.onreadystatechange = (): boolean => {
-      if (req.readyState === 4) {
-        if (req.status === 200) {
-          return true;
+  private static _pingECDNAndReplaceHostUrls(
+    mediaConfig: ProviderMediaConfigObject,
+    regexAction: KalturaAccessControlModifyRequestHostRegexAction,
+    cdnUrl: string
+  ): Promise<ProviderMediaConfigObject> {
+    return new Promise(resolve => {
+      const urlPing = cdnUrl + '/api_v3/service/system/action/ping/format/1';
+      const req = new XMLHttpRequest();
+      req.open('GET', urlPing);
+      req.timeout = regexAction.checkAliveTimeoutMs;
+      req.onreadystatechange = ():void => {
+        if (req.readyState === 4) {
+          if (req.status === 200) {
+            RegexActionHandler._replaceHostUrls(mediaConfig, regexAction);
+          }
+          resolve(mediaConfig);
         }
-        return false;
-      }
-      return false;
-    };
-    req.ontimeout = (): boolean => {
-      RegexActionHandler._logger.warn(`Got timeout while pinging the ECDN url. the ping url: ${urlPing}`);
-      return false;
-    };
-    req.send();
-    return false;
+      };
+      req.ontimeout = ():void => {
+        RegexActionHandler._logger.warn(`Got timeout while pinging the ECDN url. the ping url: ${urlPing}`);
+        resolve(mediaConfig);
+      };
+      req.send();
+    });
   }
 
   /**
@@ -62,31 +67,33 @@ class RegexActionHandler {
    * @function handleRegexAction
    * @param {ProviderMediaConfigObject} mediaConfig - The media config
    * @param {Map<string, Function>} rawResponse - The raw response data from backend
-   * @returns {Promise<ProviderMediaConfigObject>} - The media config with old or modified urls
+   * @returns {ProviderMediaConfigObject} - The media config with old or modified urls
    * @static
    */
-  public static async handleRegexAction(mediaConfig: ProviderMediaConfigObject, rawResponse: Map<string, ILoader>): Promise<ProviderMediaConfigObject> {
-    const cdnUrl = OVPConfiguration.get().cdnUrl;
-    const regexAction = RegexActionHandler._extractRegexActionFromData(rawResponse);
-    const regExp = RegexActionHandler._getRegExp(regexAction);
+  public static handleRegexAction(mediaConfig: ProviderMediaConfigObject, rawResponse: Map<string, ILoader>): Promise<ProviderMediaConfigObject> {
+    return new Promise(resolve => {
+      const cdnUrl = OVPConfiguration.get().cdnUrl;
+      const regexAction = RegexActionHandler._extractRegexActionFromData(rawResponse);
+      const regExp = RegexActionHandler._getRegExp(regexAction);
 
-    if (
-      cdnUrl &&
-      regexAction &&
-      regExp &&
-      cdnUrl.match(regExp) &&
-      // we need to make the replacement in all cases except for when the checkAliveTimeoutMs > 0 && the ping has failed
-      !(
-        regexAction.checkAliveTimeoutMs > 0 &&
-        !(await RegexActionHandler._isECDNUrlAlive(regexAction, cdnUrl.replace(regExp, regexAction.replacement)))
-      )
-    ) {
-      RegexActionHandler._replaceHostUrls(mediaConfig, regexAction);
-      return mediaConfig;
-    }
-
-    RegexActionHandler._logger.debug('exiting handleRegexAction - not applying regex action.');
-    return mediaConfig;
+      if(
+        cdnUrl &&
+         regexAction &&
+         regExp &&
+         cdnUrl.match(regExp)
+      ) {
+        if (regexAction.checkAliveTimeoutMs > 0) {
+          RegexActionHandler._logger.debug('executing ping request...');
+          RegexActionHandler._pingECDNAndReplaceHostUrls(mediaConfig, regexAction, cdnUrl.replace(regExp, regexAction.replacement)).then(resolve);
+        } else {
+          RegexActionHandler._replaceHostUrls(mediaConfig, regexAction);
+          resolve(mediaConfig);
+        }
+      } else {
+        RegexActionHandler._logger.debug('exiting handleRegexAction - not applying regex action.');
+        resolve(mediaConfig);
+      }
+    });
   }
 
   /**

package/src/k-provider/ovp/response-types/kaltura-media-entries.ts

@@ -16,13 +16,7 @@ export class KalturaMediaEntries extends ServiceResult {
     super(responseObj);
     if (!this.hasError) {
       this.entries = [];
-      responseObj.map(entry => {
-        const kalturaMediaEntry = new KalturaMediaEntry(entry);
-        if (kalturaMediaEntry.type !== KalturaMediaEntry.EntryType.DOCUMENT.value) {
-          // filter out documents
-          this.entries.push(kalturaMediaEntry);
-        }
-      });
+      responseObj.map(entry => this.entries.push(new KalturaMediaEntry(entry)));
     }
   }
 }

package/src/k-provider/ovp/services/base-entry-service.ts

@@ -14,7 +14,7 @@ export default class OVPBaseEntryService extends OVPService {
    * @returns {RequestBuilder} The request builder
    * @static
    */
-  public static getPlaybackContext(serviceUrl: string, ks: string, serviceEntryId: string): RequestBuilder {
+  public static getPlaybackContext(serviceUrl: string, ks: string, serviceEntryId: string, referrer?: string): RequestBuilder {
     const headers: Map<string, string> = new Map();
     headers.set('Content-Type', 'application/json');
     const request = new RequestBuilder(headers);
@@ -23,7 +23,7 @@ export default class OVPBaseEntryService extends OVPService {
     request.method = 'POST';
     request.url = request.getUrl(serviceUrl);
     request.tag = 'baseEntry-getPlaybackContext';
-    const contextDataParams = {objectType: 'KalturaContextDataParams', flavorTags: 'all'};
+    const contextDataParams = {objectType: 'KalturaContextDataParams', flavorTags: 'all', referrer};
     request.params = {entryId: serviceEntryId, ks: ks, contextDataParams: contextDataParams};
     return request;
   }

package/src/types/index.ts

@@ -24,11 +24,3 @@ export * from './playlist-info'
 export * from './provider-options'
 export * from './request-loader'
 export * from './poster'
-
-export { ProviderParser, RequestBuilder, ResponseTypes} from '../k-provider/ovp'
-export { ContextType, MediaType} from '../k-provider/ott'
-import {BaseProvider} from '../k-provider/common/base-provider'
-import OTTProvider from '../k-provider/ott/provider'
-import OVPProvider from '../k-provider/ovp/provider'
-export {OTTProvider, OVPProvider, OTTProvider as Provider, BaseProvider}
-export type IProvider = OTTProvider | OVPProvider;

package/src/types/media-config-sources.ts

@@ -1,4 +1,5 @@
 import {ImageSource} from '../entities/image-source';
+import {DocumentSource} from '../entities/document-source';
 import {ProviderMediaConfigMetadataObject} from './media-config-metadata';
 import {PKExternalCaptionObject} from './external-caption-object';
 import {ProviderMediaSourceObject} from './media-source';
@@ -8,6 +9,7 @@ export type ProviderMediaConfigSourcesObject = {
   hls: Array<ProviderMediaSourceObject>;
   progressive: Array<ProviderMediaSourceObject>;
   image: Array<ImageSource>;
+  document: Array<DocumentSource>;
   duration?: number;
   type: string;
   id?: string;

package/src/types/media-sources.ts

@@ -1,4 +1,5 @@
 import {ImageSource} from '../entities/image-source';
+import {DocumentSource} from '../entities/document-source';
 import {ProviderMediaSourceObject} from './media-source';
 import {PKExternalCaptionObject} from './external-caption-object';
 
@@ -7,5 +8,6 @@ export type ProviderMediaSourcesObject = {
   dash: Array<ProviderMediaSourceObject>;
   hls: Array<ProviderMediaSourceObject>;
   image: Array<ImageSource>;
+  document: Array<DocumentSource>;
   captions?: Array<PKExternalCaptionObject>;
 };

package/src/types/provider-options.ts

@@ -14,4 +14,5 @@ export type ProviderOptionsObject = {
   filterOptions?: ProviderFilterOptionsObject;
   ignoreServerConfig?: boolean;
   loadThumbnailWithKs?: boolean;
+  referrer?: string;
 };

package/stats-service/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "@playkit-js/playkit-js-providers/stats-service",
+  "main": "../dist/playkit-stats-service.js",
+  "types": "../dist/stats-service.d.ts",
+  "sideEffects": false
+}

package/types/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@playkit-js/playkit-js-providers/types",
+  "types": "../dist/types.d.ts",
+  "sideEffects": false
+}

package/playkit-analytics-service/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "@playkit-js/playkit-js-providers/playkit-analytics-service",
-  "main": "../dist/playkit-analytics-service.js",
-  "sideEffects": false
-}

package/playkit-bookmark-service/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "@playkit-js/playkit-js-providers/playkit-bookmark-service",
-  "main": "../dist/playkit-bookmark-service.js",
-  "sideEffects": false
-}

package/playkit-ott-provider/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "@playkit-js/playkit-js-providers/playkit-ott-provider",
-  "main": "../dist/playkit-ott-provider.js",
-  "sideEffects": false
-}

package/playkit-ovp-provider/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "@playkit-js/playkit-js-providers/playkit-ovp-provider",
-  "main": "../dist/playkit-ovp-provider.js",
-  "sideEffects": false
-}

package/playkit-stats-service/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "@playkit-js/playkit-js-providers/playkit-stats-service",
-  "main": "../dist/playkit-stats-service.js",
-  "sideEffects": false
-}