@flowplayer/player 3.11.2-rc.2 → 3.11.2-rc.4

package/plugins/context-menu.d.ts

@@ -1,7 +1,28 @@
 import type { MediaKeyFunc } from 'hls.js';
 
+declare type AnyPlugin<PluginOwnConfig extends KeyValue> = Plugin_2<PluginOwnConfig> | Loader<PluginOwnConfig>;
+
+declare type ArrayToIntersection<T extends Array<unknown>> = T extends [infer Current, ...infer Remaining] ? Current & ArrayToIntersection<Remaining> : unknown;
+
+declare enum AutoplayOpts {
+    OFF = 0,
+    ON = 1,
+    AUDIO_REQUIRED = 2
+}
+
 declare type BitOpts = number;
 
+declare type Component = {
+    onrender?: (config: Config, root: PlayerRoot, player: Player) => void;
+    onremove?: (config: Config, root: PlayerRoot, player: Player) => void;
+};
+
+declare interface Components {
+    render(key: string, args: any[]): void;
+    remove(key: string, args: any[]): void;
+    put(key: string, args: Component): void;
+}
+
 declare interface Config {
     src?: UnsafeSource;
     preload?: "none" | "metadata" | "auto";
@@ -52,27 +73,13 @@ declare interface Config {
     seconds_to_dvr?: number;
 }
 
-declare namespace Configs {
-    export {
-        BitOpts,
-        FlowplayerCustomElementRegistry,
-        Config,
-        CustomConfig,
-        PluginConfig
-    }
-}
-
-declare type ConfigWith<T> = Configs.Config & T;
-
-declare class ContextMenu implements Plugin_2 {
-    init(opts: ConfigWith<{
-        context_menu?: LinkOpts[];
-    }>, root: PlayerRoot, video: Player): void;
-}
-export default ContextMenu;
-
 declare type CustomConfig<T> = Config & T;
 
+declare const _default: PluginCtor<    {
+context_menu?: LinkOpts[] | undefined;
+}>;
+export default _default;
+
 declare type DeviceId = string;
 
 declare type DRM_KEYSYSTEM = "com.widevine.alpha" | "com.microsoft.playready" | "org.w3.clearkey" | "com.apple.fps.1_0";
@@ -100,6 +107,39 @@ declare type DRMVendorImplementation = {
 
 declare type FlowplayerCustomElementRegistry = Map<string, string>;
 
+declare interface FlowplayerUMD extends FlowplayerUMDBase {
+    (selector: string, config?: Config): Player;
+    (element: HTMLElement, config?: Config): Player;
+    <T>(selector: string, config?: CustomConfig<T>): Player;
+    <T>(element: HTMLElement, config?: CustomConfig<T>): Player;
+    <PluginCtors extends PluginCtor[]>(...plugins: PluginCtors): FlowplayerUMDWithPlugins<CustomConfig<MergeConfigs<PluginCtors>>>;
+}
+
+declare interface FlowplayerUMDBase {
+    instances: Player[];
+    extensions: PluginCtor[];
+    events: Record<string, string>;
+    ads?: {
+        events: Record<string, string>;
+    };
+    states: Record<string, string>;
+    quality: typeof QualityOpts;
+    commit: string;
+    version: string;
+    customElements: FlowplayerCustomElementRegistry;
+    defaultElements: Record<string, string>;
+    components: Components;
+    support: any;
+    autoplay: typeof AutoplayOpts;
+    jwt: any;
+    loaders: any;
+}
+
+declare interface FlowplayerUMDWithPlugins<ConfigWithPlugins extends Config = Config> extends FlowplayerUMDBase {
+    (selector: string, config?: ConfigWithPlugins): Player;
+    (element: HTMLElement, config?: ConfigWithPlugins): Player;
+}
+
 declare interface FPEvent<T> extends CustomEvent<T> {
     /**
      * @deprecated
@@ -126,6 +166,12 @@ declare interface Loader<PluginOwnConfig extends KeyValue = KeyValue> extends Pl
     wants<S = KeyValue, T = KeyValue>(srcString: SourceStr, srcObj: SourceWith<S>, config: PluginConfig<T>): boolean;
 }
 
+declare type MapToConfigs<Arr extends PluginCtor[]> = {
+    [PluginType in keyof Arr]: Arr[PluginType] extends PluginCtor<infer ConfigType> ? ConfigType : never;
+};
+
+declare type MergeConfigs<Arr extends PluginCtor[]> = ArrayToIntersection<MapToConfigs<Arr>>;
+
 declare interface Player extends HTMLVideoElement {
     renderPlugin: (pluginContainer: HTMLElement) => void;
     toggleDisable: (flag: boolean) => void;
@@ -190,6 +236,16 @@ declare interface Plugin_2<PluginOwnConfig extends KeyValue = KeyValue> {
 
 declare type PluginConfig<T> = Config & T;
 
+declare interface PluginCtor<PluginOwnConfig extends KeyValue = KeyValue> {
+    new (umd: FlowplayerUMD, player: Player): AnyPlugin<PluginOwnConfig>;
+}
+
+declare enum QualityOpts {
+    LOW = 1,
+    MEDIUM = 2,
+    HIGH = 4
+}
+
 declare type SourceObj = {
     src?: SourceStr;
     type?: string;

package/plugins/context-menu.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):((e="undefined"!=typeof globalThis?globalThis:e||self).flowplayer=e.flowplayer||{},e.flowplayer.context_menu=t())}(this,(function(){"use strict";const e=document.createElement;function t(t,n){const o=n.href?function(t){const n=e("a");return n.href=t,n}(n.href):e("span"),s=n.onclick;return n.class&&(o.className=n.class),n.text&&(o.innerText=n.text),s&&o.addEventListener("click",(function(e){s(e,t)})),o}const n=[{text:"Flowplayer © "+(new Date).getFullYear()},{href:"https://flowplayer.com",text:"About this player"},{href:"https://flowplayer.com/license/",text:"GPL based license"}];let o=!1;const s=e=>{e.classList.remove("fp-active"),o=!1};document.addEventListener("click",e=>{2!=e.button&&0!=o&&s(o)}),document.addEventListener("keyup",(function(){o&&s(o)}));class ContextMenu{init(e,s,c){const i=e.context_menu||n,l=document.createElement("div");l.className="fp-context-menu fp-menu",l.append(...i.map(e=>t(c,e)));const r=function(e,t){const n=e._customElements.get(t);return n&&e.root.querySelector(n)||void 0}(c,"flowplayer-ui");r&&r.addEventListener("contextmenu",(function(e){if(!l.parentNode)return;e.preventDefault(),c.emit("contextmenu");const t=l.getBoundingClientRect();l.style.left=e.clientX-window.scrollX-t.left+2+"px",l.style.right=e.clientY+window.scrollY-t.top-5+"px",l.classList.contains("fp-active")||(l.classList.contains("fp-active"),o=l)}))}}return function(e,t){if("object"==typeof exports&&"undefined"!=typeof module)return t;if(null===document.currentScript)return t;"flowplayer"in e||(e.flowplayer={extensions:[]});const n=e.flowplayer;"function"==typeof n?n(t):(Array.isArray(n.extensions)||(n.extensions=[]),~n.extensions.indexOf(t)||n.extensions.push(t))}(window,ContextMenu),ContextMenu}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):((e="undefined"!=typeof globalThis?globalThis:e||self).flowplayer=e.flowplayer||{},e.flowplayer.context_menu=t())}(this,(function(){"use strict";const e=document.createElement;function t(t,n){const o=n.href?function(t){const n=e("a");return n.href=t,n}(n.href):e("span"),s=n.onclick;return n.class&&(o.className=n.class),n.text&&(o.innerText=n.text),s&&o.addEventListener("click",(function(e){s(e,t)})),o}const n=[{text:"Flowplayer © "+(new Date).getFullYear()},{href:"https://flowplayer.com",text:"About this player"},{href:"https://flowplayer.com/license/",text:"GPL based license"}];let o=!1;const s=e=>{e.classList.remove("fp-active"),o=!1};document.addEventListener("click",e=>{2!=e.button&&0!=o&&s(o)}),document.addEventListener("keyup",(function(){o&&s(o)}));return function(e,t){if("object"==typeof exports&&"undefined"!=typeof module)return t;if(null===document.currentScript)return t;"flowplayer"in e||(e.flowplayer={extensions:[]});const n=e.flowplayer;return"function"==typeof n?(n(t),t):(Array.isArray(n.extensions)||(n.extensions=[]),~n.extensions.indexOf(t)||n.extensions.push(t),t)}(window,class ContextMenu{init(e,s,c){const i=e.context_menu||n,l=document.createElement("div");l.className="fp-context-menu fp-menu",l.append(...i.map(e=>t(c,e)));const r=function(e,t){const n=e._customElements.get(t);return n&&e.root.querySelector(n)||void 0}(c,"flowplayer-ui");r&&r.addEventListener("contextmenu",(function(e){if(!l.parentNode)return;e.preventDefault(),c.emit("contextmenu");const t=l.getBoundingClientRect();l.style.left=e.clientX-window.scrollX-t.left+2+"px",l.style.right=e.clientY+window.scrollY-t.top-5+"px",l.classList.contains("fp-active")||(l.classList.contains("fp-active"),o=l)}))}})}));

package/plugins/cuepoints.d.ts

@@ -73,18 +73,6 @@ declare interface Config {
     seconds_to_dvr?: number;
 }
 
-declare namespace Configs {
-    export {
-        BitOpts,
-        FlowplayerCustomElementRegistry,
-        Config,
-        CustomConfig,
-        PluginConfig
-    }
-}
-
-declare type ConfigWith<T> = Configs.Config & T;
-
 export declare type CueAttrs = {
     startTime: number;
     endTime: number;
@@ -94,21 +82,14 @@ export declare type CueAttrs = {
 
 export declare type CuepointList = Array<CueAttrs>;
 
-declare class Cuepoints implements Plugin_2<CuepointsConfig> {
-    constructor(umd: FlowplayerUMD);
-    init(opts: CuepointsConfig, root: PlayerRoot, video: Player): void;
-}
-
-export declare type CuepointsConfig = ConfigWith<CuepointsConfigNamespaced>;
-
-declare type CuepointsConfigNamespaced = {
+export declare type CuepointsConfig = {
     cuepoints?: CuepointList;
     draw_cuepoints?: boolean;
 };
 
 declare type CustomConfig<T> = Config & T;
 
-declare const _default: typeof Cuepoints;
+declare const _default: PluginCtor<CuepointsConfig>;
 export default _default;
 
 declare type DeviceId = string;

package/plugins/dash.d.ts

@@ -1,6 +1,8 @@
 import type { MediaKeyFunc } from 'hls.js';
 import { MediaPlayer } from 'dashjs';
 import type { MediaPlayerClass } from 'dashjs';
+import { MediaSettings } from 'dashjs';
+import { ProtectionDataSet } from 'dashjs';
 
 declare type AnyPlugin<PluginOwnConfig extends KeyValue> = Plugin_2<PluginOwnConfig> | Loader<PluginOwnConfig>;
 
@@ -93,19 +95,17 @@ declare type CustomConfig<T> = Config & T;
 
 /* Excluded from this release type: DashClass */
 
-export declare type DashConfig = ConfigWith<{
+declare type DashConfig = ConfigWith<{
     dash?: DashSettings;
 }>;
 
 /* Excluded from this release type: DashPlayer */
 
-export declare type DashSettings = MediaSettings & {
+declare type DashSettings = MediaSettings & {
     drm?: ProtectionDataSet;
 };
 
-declare const _default: PluginCtor<ConfigWith<{
-    dash?: DashSettings | undefined;
-}>>;
+declare const _default: PluginCtor<KeyValue>;
 export default _default;
 
 declare type DeviceId = string;
@@ -191,16 +191,6 @@ declare type MapToConfigs<Arr extends PluginCtor[]> = {
     [PluginType in keyof Arr]: Arr[PluginType] extends PluginCtor<infer ConfigType> ? ConfigType : never;
 };
 
-declare type MediaKeyMessageType_2 = "individualization-request" | "license-release" | "license-renewal" | "license-request";
-
-export declare type MediaSettings = {
-    lang?: string;
-    viewpoint?: any;
-    audioChannelConfiguration?: any[];
-    accessibility?: any;
-    role?: string;
-};
-
 declare type MergeConfigs<Arr extends PluginCtor[]> = ArrayToIntersection<MapToConfigs<Arr>>;
 
 declare interface Player extends HTMLVideoElement {
@@ -285,35 +275,6 @@ declare interface PluginCtor<PluginOwnConfig extends KeyValue = KeyValue> {
     new (umd: FlowplayerUMD, player: Player): AnyPlugin<PluginOwnConfig>;
 }
 
-export declare interface ProtectionData {
-    /**
-     * A license server URL to use with this key system.
-     * When specified as a string, a single URL will be used regardless of message type.
-     * When specified as an object, the object will have property names for each message
-     * type with the corresponding property value being the URL to use for
-     * messages of that type
-     */
-    serverURL?: string | {
-        [P in MediaKeyMessageType_2]: string;
-    };
-    /** headers to add to the http request */
-    httpRequestHeaders?: object;
-    /**
-     * Defines a set of clear keys that are available to the key system.
-     * Object properties are base64-encoded keyIDs (with no padding).
-     * Corresponding property values are keys, base64-encoded (no padding).
-     */
-    clearkeys?: {
-        [key: string]: string;
-    };
-    /** Priority level of the key system to be selected (0 is the highest prority, -1 for undefined priority) */
-    priority?: number;
-}
-
-export declare interface ProtectionDataSet {
-    [keySystemName: string]: ProtectionData;
-}
-
 declare enum QualityOpts {
     LOW = 1,
     MEDIUM = 2,

package/plugins/drm.d.ts

@@ -1,8 +1,31 @@
 import { HlsConfig } from 'hls.js';
 import type { MediaKeyFunc } from 'hls.js';
+import { MediaSettings } from 'dashjs';
+import { ProtectionDataSet } from 'dashjs';
+
+declare type AnyPlugin<PluginOwnConfig extends KeyValue> = Plugin_2<PluginOwnConfig> | Loader<PluginOwnConfig>;
+
+declare type ArrayToIntersection<T extends Array<unknown>> = T extends [infer Current, ...infer Remaining] ? Current & ArrayToIntersection<Remaining> : unknown;
+
+declare enum AutoplayOpts {
+    OFF = 0,
+    ON = 1,
+    AUDIO_REQUIRED = 2
+}
 
 declare type BitOpts = number;
 
+declare type Component = {
+    onrender?: (config: Config, root: PlayerRoot, player: Player) => void;
+    onremove?: (config: Config, root: PlayerRoot, player: Player) => void;
+};
+
+declare interface Components {
+    render(key: string, args: any[]): void;
+    remove(key: string, args: any[]): void;
+    put(key: string, args: Component): void;
+}
+
 declare interface Config {
     src?: UnsafeSource;
     preload?: "none" | "metadata" | "auto";
@@ -67,30 +90,20 @@ declare type ConfigWith<T> = Configs.Config & T;
 
 declare type CustomConfig<T> = Config & T;
 
-declare type DashConfig = ConfigWith<{
-    dash?: DashSettings;
+declare const _default: PluginCtor<    {
+hls?: Partial<HlsConfig> | undefined;
+dash?: Partial<ConfigWith<{
+dash?: (MediaSettings & {
+drm?: ProtectionDataSet | undefined;
+}) | undefined;
+}>> | undefined;
 }>;
-
-declare type DashSettings = MediaSettings & {
-    drm?: ProtectionDataSet;
-};
+export default _default;
 
 declare type DeviceId = string;
 
-declare class DRM implements Plugin_2 {
-    init(config: DRMConfig, _: PlayerRoot, player: DRMPlayer): void;
-    hls_drm(player: DRMPlayer, config: DRMConfig, drm_config?: DRMSourceConfiguration): void;
-    dash_drm(player: DRMPlayer, config: DRMConfig, drm_config?: DRMSourceConfiguration): void;
-}
-export default DRM;
-
 declare type DRM_KEYSYSTEM = "com.widevine.alpha" | "com.microsoft.playready" | "org.w3.clearkey" | "com.apple.fps.1_0";
 
-declare type DRMConfig = ConfigWith<{
-    hls?: Partial<HlsConfig>;
-    dash?: Partial<DashConfig>;
-}>;
-
 declare type DRMConfiguration = {
     license_server: string;
     http_headers?: Record<string, string>;
@@ -100,12 +113,6 @@ declare type DRMConfiguration = {
     query_params?: Record<string, string>;
 };
 
-declare type DRMPlayer = Player & {
-    webkitSetMediaKeys(key: WebKitMediaKeys): void;
-    webkitKeys: WebKitMediaKeys;
-    on: (event: "src", handler: (e: FPEvent<SourceObj>) => void) => DRMPlayer;
-};
-
 declare type DRMSourceConfiguration = {
     [keysystem in DRM_KEYSYSTEM]?: DRMConfiguration;
 };
@@ -118,10 +125,41 @@ declare type DRMVendorImplementation = {
     }, cb: (license_data: Uint8Array) => void) => void;
 };
 
-declare type EventHandler = (ev: any) => void;
-
 declare type FlowplayerCustomElementRegistry = Map<string, string>;
 
+declare interface FlowplayerUMD extends FlowplayerUMDBase {
+    (selector: string, config?: Config): Player;
+    (element: HTMLElement, config?: Config): Player;
+    <T>(selector: string, config?: CustomConfig<T>): Player;
+    <T>(element: HTMLElement, config?: CustomConfig<T>): Player;
+    <PluginCtors extends PluginCtor[]>(...plugins: PluginCtors): FlowplayerUMDWithPlugins<CustomConfig<MergeConfigs<PluginCtors>>>;
+}
+
+declare interface FlowplayerUMDBase {
+    instances: Player[];
+    extensions: PluginCtor[];
+    events: Record<string, string>;
+    ads?: {
+        events: Record<string, string>;
+    };
+    states: Record<string, string>;
+    quality: typeof QualityOpts;
+    commit: string;
+    version: string;
+    customElements: FlowplayerCustomElementRegistry;
+    defaultElements: Record<string, string>;
+    components: Components;
+    support: any;
+    autoplay: typeof AutoplayOpts;
+    jwt: any;
+    loaders: any;
+}
+
+declare interface FlowplayerUMDWithPlugins<ConfigWithPlugins extends Config = Config> extends FlowplayerUMDBase {
+    (selector: string, config?: ConfigWithPlugins): Player;
+    (element: HTMLElement, config?: ConfigWithPlugins): Player;
+}
+
 declare interface FPEvent<T> extends CustomEvent<T> {
     /**
      * @deprecated
@@ -141,16 +179,12 @@ declare interface Loader<PluginOwnConfig extends KeyValue = KeyValue> extends Pl
     wants<S = KeyValue, T = KeyValue>(srcString: SourceStr, srcObj: SourceWith<S>, config: PluginConfig<T>): boolean;
 }
 
-declare type MediaKeyMessageType_2 = "individualization-request" | "license-release" | "license-renewal" | "license-request";
-
-declare type MediaSettings = {
-    lang?: string;
-    viewpoint?: any;
-    audioChannelConfiguration?: any[];
-    accessibility?: any;
-    role?: string;
+declare type MapToConfigs<Arr extends PluginCtor[]> = {
+    [PluginType in keyof Arr]: Arr[PluginType] extends PluginCtor<infer ConfigType> ? ConfigType : never;
 };
 
+declare type MergeConfigs<Arr extends PluginCtor[]> = ArrayToIntersection<MapToConfigs<Arr>>;
+
 declare interface Player extends HTMLVideoElement {
     renderPlugin: (pluginContainer: HTMLElement) => void;
     toggleDisable: (flag: boolean) => void;
@@ -215,33 +249,14 @@ declare interface Plugin_2<PluginOwnConfig extends KeyValue = KeyValue> {
 
 declare type PluginConfig<T> = Config & T;
 
-declare interface ProtectionData {
-    /**
-     * A license server URL to use with this key system.
-     * When specified as a string, a single URL will be used regardless of message type.
-     * When specified as an object, the object will have property names for each message
-     * type with the corresponding property value being the URL to use for
-     * messages of that type
-     */
-    serverURL?: string | {
-        [P in MediaKeyMessageType_2]: string;
-    };
-    /** headers to add to the http request */
-    httpRequestHeaders?: object;
-    /**
-     * Defines a set of clear keys that are available to the key system.
-     * Object properties are base64-encoded keyIDs (with no padding).
-     * Corresponding property values are keys, base64-encoded (no padding).
-     */
-    clearkeys?: {
-        [key: string]: string;
-    };
-    /** Priority level of the key system to be selected (0 is the highest prority, -1 for undefined priority) */
-    priority?: number;
+declare interface PluginCtor<PluginOwnConfig extends KeyValue = KeyValue> {
+    new (umd: FlowplayerUMD, player: Player): AnyPlugin<PluginOwnConfig>;
 }
 
-declare interface ProtectionDataSet {
-    [keySystemName: string]: ProtectionData;
+declare enum QualityOpts {
+    LOW = 1,
+    MEDIUM = 2,
+    HIGH = 4
 }
 
 declare type SourceObj = {
@@ -263,25 +278,4 @@ declare interface VideoTrack {
     selected: boolean;
 }
 
-declare interface WebKitMediaKeyError {
-    code: number;
-    systemCode: number;
-}
-
-declare interface WebKitMediaKeys {
-    keySystem: string;
-    createSession(mimeType: string, cert: Uint8Array): WebKitMediaKeySession;
-}
-
-declare interface WebKitMediaKeySession extends EventTarget {
-    error: WebKitMediaKeyError;
-    keySystem: string;
-    onwebkitkeyadded: EventHandler;
-    onwebkitkeyerror: EventHandler;
-    onwebkitkeymessage: EventHandler;
-    sessionId: string;
-    close: () => void;
-    update: (key: Uint8Array) => void;
-}
-
 export { }

package/plugins/drm.js

@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):((e="undefined"!=typeof globalThis?globalThis:e||self).flowplayer=e.flowplayer||{},e.flowplayer.drm=t())}(this,(function(){"use strict";const e="com.widevine.alpha",t="com.microsoft.playready",r="com.apple.fps.1_0";var n=Object.freeze({__proto__:null,WIDEVINE:e,PLAYREADY:t,CLEARKEY:"org.w3.clearkey",FAIRPLAY:r,LICENSE_SERVER:"license_server",KEY:"key",KEY_ID:"kid",HTTP_HEADERS:"http_headers",QUERY_PARAMS:"query_params",CERTIFICATE:"certificate",VENDOR:"vendor",REQUEST_MEDIA_KEY_SYSTEM_ACCESS_FUNCTION:"request_media_key_system_access_function"});function s(){const e="undefined"!=typeof document&&"undefined"!=typeof window,t=e?navigator.userAgent:"",r=/iP(hone|od)/i.test(t)&&!/iPad/.test(t)&&!/IEMobile/i.test(t),n=/Android/.test(t)&&!/Firefox/.test(t),s=/^((?!chrome|android).)*safari/i.test(t),o=/chrome|crios/i.test(t)&&!/opr|opera|chromium|edg|ucbrowser|googlebot/i.test(t),i=/firefox|fxios/i.test(t)&&!/seamonkey/i.test(t),a=/edg/i.test(t),c=/opr|opera/i.test(t),d=/SamsungBrowser/.test(t),u=d&&/SMART-TV/.test(t);return{controls:!r,video:function(t){return e&&document.createElement("video").canPlayType(t)},lang:e&&window.navigator.language,android:n,iphone:r,safari:s,edge:a,opera:c,chrome:o,firefox:i,ios:e&&/iPad|iPhone|iPod/.test(navigator.userAgent)&&!window.MSStream,samsung:d,samsung_tv:d&&u,touch:"ontouchstart"in window,tizen:"tizen"in window,webOS:"webos"in window}}function o(n){const o={};return Object.keys(n).forEach((function(i){(function(n){const o=s();switch(n){case e:return o.chrome||o.firefox||o.edge||o.opera;case"org.w3.clearkey":return o.chrome||o.firefox;case r:return o.safari;case t:return o.edge}})(i)&&function(e,t,n){Object.assign(n,t),n.emeEnabled=!0,t.request_media_key_system_access_function&&(n.requestMediaKeySystemAccessFunc=t.request_media_key_system_access_function);const s=t.http_headers;s&&(n.licenseXhrSetup=function(e){Object.keys(s).forEach((function(t){e.setRequestHeader(t,s[t])}))}),n.drmSystems=n.drmSystems||{},Object.assign(n.drmSystems,{[e===r?"com.apple.fps":e]:{licenseUrl:t.license_server,serverCertificateUrl:t.certificate}})}(i,n[i],o)})),o}function i(r){const n={};return Object.keys(r).forEach((function(o){(function(r){const n=s();switch(r){case e:return n.chrome||n.firefox||n.edge||n.opera;case"org.w3.clearkey":return n.chrome||n.firefox;case t:return n.edge}})(o)&&(n[o]=function(e){return Object.assign({serverURL:e.license_server,httpRequestHeaders:e.http_headers},e)}(r[o]))})),n}const a=(e,t)=>fetch(e,t).then(c).then(e=>new Uint8Array(e)),c=e=>{if(e.ok)return e.arrayBuffer();throw d(e)},d=e=>new Error(`http:error status=${e.status} during key retrieval`);var u=Object.freeze({__proto__:null,fairplay_fetch_certificate:(e,t)=>{a(e).then(t)},fairplay_request_license:function(e,t,r){const n=((e,t)=>e.includes(t.assetId)&&Object.keys(t.queryParams||{}).find(t=>e.includes(t))?e:e.includes(t.assetId)?`${e}?${new URLSearchParams(t.queryParams).toString()}`:`${e}/${t.assetId}?${new URLSearchParams(t.queryParams).toString()}`)(e,t);a(n,{method:"POST",headers:{"Content-Type":"application/octet-stream"},body:t.message}).then(r)}});var f=Object.freeze({__proto__:null,fairplay_fetch_certificate:(e,t)=>{a(e).then(t)},fairplay_request_license:function(e,t,r){const n=new FormData;var s;n.set("assetid",t.assetId),n.set("spc",(s=t.message,btoa(Array.prototype.map.call(s,(function(e){return String.fromCharCode(e)})).join("")))),fetch(e,{method:"POST",body:n,headers:t.headers}).then(e=>{if(e.ok)return e.text();throw d(e)}).then(e=>function(e){const t=atob(e),r=new Uint8Array(t.length);return Array.prototype.forEach.call(t,(function(e,t){r[t]=e.charCodeAt(0)})),r}(e)).then(r)}}),l=Object.freeze({__proto__:null,ezdrm:u,buydrm:f});function y(e,t,n){const s=t[r],o=null==s?void 0:s.certificate;if(!s||!o)return;if(e.src&&0===e.src.indexOf("blob:"))return;const i=s.vendor||"ezdrm",a="string"==typeof i?l[i]:i;a.fairplay_fetch_certificate(o,(function(o){e.webkitSetMediaKeys(new window.WebKitMediaKeys(r));const i=n.initData,c=function(e){const t=function(e){const t=new Uint16Array(e);return String.fromCharCode(...t)}(e.buffer);return t.substring(t.indexOf("skd:")+6).split(";").pop()}(i);if(!c)return console.debug("flowplayer::drm::fairplay - unable to extract content id from init data");const d=function(e,t,r){"string"==typeof t&&(t=function(e){const t=new ArrayBuffer(2*e.length),r=new Uint16Array(t);return Array(...Array(e.length)).map((e,t)=>t).forEach(t=>{r[t]=e.charCodeAt(t)}),r}(t));let n=0;const s=new ArrayBuffer(e.byteLength+4+t.byteLength+4+r.byteLength),o=new DataView(s);new Uint8Array(s,n,e.byteLength).set(e),n+=e.byteLength,o.setUint32(n,t.byteLength,!0),n+=4;const i=new Uint16Array(s,n,t.length);i.set(t),n+=i.byteLength,o.setUint32(n,r.byteLength,!0),n+=4;return new Uint8Array(s,n,r.byteLength).set(r),new Uint8Array(s,0,s.byteLength)}(i,c,o),u=e.webkitKeys.createSession("application/x-mpegurl",d);u.addEventListener("webkitkeyerror",console.debug.bind(console,"webkitkeyerror")),u.addEventListener("webkitkeymessage",(function(e){const n={message:e.message,assetId:c,headers:s.http_headers||{},queryParams:t[r].query_params||{}};a.fairplay_request_license(s.license_server,n,e=>u.update(e))}))}))}class DRM{init(e,t,r){let n;r.on("webkitneedkey",e=>y(r,n.drm||{},e)),r.on("src",t=>{n=t.detail,function(e){var t,r,n,s,o;null===(t=e.hls)||void 0===t||delete t.drmSystems,null===(r=e.hls)||void 0===r||delete r.licenseXhrSetup,null===(n=e.hls)||void 0===n||delete n.requestMediaKeySystemAccessFunc,null===(s=e.hls)||void 0===s||delete s.drmSystemOptions,null===(o=e.hls)||void 0===o||delete o.emeEnabled}(e),this.hls_drm(r,e,t.detail.drm),this.dash_drm(r,e,t.detail.drm)})}hls_drm(e,t,r){if(!r)return;const n=o(r);e.setOpts({hls:Object.assign(t.hls||{},n)})}dash_drm(e,t,r){if(!r)return;const n=t.dash||{},s=i(r);e.setOpts({dash:Object.assign(n,{drm:s})})}}return Object.assign(DRM,n),function(e,t){if("object"==typeof exports&&"undefined"!=typeof module)return t;if(null===document.currentScript)return t;"flowplayer"in e||(e.flowplayer={extensions:[]});const r=e.flowplayer;"function"==typeof r?r(t):(Array.isArray(r.extensions)||(r.extensions=[]),~r.extensions.indexOf(t)||r.extensions.push(t))}(window,DRM),DRM}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):((e="undefined"!=typeof globalThis?globalThis:e||self).flowplayer=e.flowplayer||{},e.flowplayer.drm=t())}(this,(function(){"use strict";const e="com.widevine.alpha",t="com.microsoft.playready",r="com.apple.fps.1_0";var n=Object.freeze({__proto__:null,WIDEVINE:e,PLAYREADY:t,CLEARKEY:"org.w3.clearkey",FAIRPLAY:r,LICENSE_SERVER:"license_server",KEY:"key",KEY_ID:"kid",HTTP_HEADERS:"http_headers",QUERY_PARAMS:"query_params",CERTIFICATE:"certificate",VENDOR:"vendor",REQUEST_MEDIA_KEY_SYSTEM_ACCESS_FUNCTION:"request_media_key_system_access_function"});function s(){const e="undefined"!=typeof document&&"undefined"!=typeof window,t=e?navigator.userAgent:"",r=/iP(hone|od)/i.test(t)&&!/iPad/.test(t)&&!/IEMobile/i.test(t),n=/Android/.test(t)&&!/Firefox/.test(t),s=/^((?!chrome|android).)*safari/i.test(t),o=/chrome|crios/i.test(t)&&!/opr|opera|chromium|edg|ucbrowser|googlebot/i.test(t),i=/firefox|fxios/i.test(t)&&!/seamonkey/i.test(t),a=/edg/i.test(t),c=/opr|opera/i.test(t),d=/SamsungBrowser/.test(t),u=d&&/SMART-TV/.test(t);return{controls:!r,video:function(t){return e&&document.createElement("video").canPlayType(t)},lang:e&&window.navigator.language,android:n,iphone:r,safari:s,edge:a,opera:c,chrome:o,firefox:i,ios:e&&/iPad|iPhone|iPod/.test(navigator.userAgent)&&!window.MSStream,samsung:d,samsung_tv:d&&u,touch:"ontouchstart"in window,tizen:"tizen"in window,webOS:"webos"in window}}function o(n){const o={};return Object.keys(n).forEach((function(i){(function(n){const o=s();switch(n){case e:return o.chrome||o.firefox||o.edge||o.opera;case"org.w3.clearkey":return o.chrome||o.firefox;case r:return o.safari;case t:return o.edge}})(i)&&function(e,t,n){Object.assign(n,t),n.emeEnabled=!0,t.request_media_key_system_access_function&&(n.requestMediaKeySystemAccessFunc=t.request_media_key_system_access_function);const s=t.http_headers;s&&(n.licenseXhrSetup=function(e){Object.keys(s).forEach((function(t){e.setRequestHeader(t,s[t])}))}),n.drmSystems=n.drmSystems||{},Object.assign(n.drmSystems,{[e===r?"com.apple.fps":e]:{licenseUrl:t.license_server,serverCertificateUrl:t.certificate}})}(i,n[i],o)})),o}function i(r){const n={};return Object.keys(r).forEach((function(o){(function(r){const n=s();switch(r){case e:return n.chrome||n.firefox||n.edge||n.opera;case"org.w3.clearkey":return n.chrome||n.firefox;case t:return n.edge}})(o)&&(n[o]=function(e){return Object.assign({serverURL:e.license_server,httpRequestHeaders:e.http_headers},e)}(r[o]))})),n}const a=(e,t)=>fetch(e,t).then(c).then(e=>new Uint8Array(e)),c=e=>{if(e.ok)return e.arrayBuffer();throw d(e)},d=e=>new Error(`http:error status=${e.status} during key retrieval`);var u=Object.freeze({__proto__:null,fairplay_fetch_certificate:(e,t)=>{a(e).then(t)},fairplay_request_license:function(e,t,r){const n=((e,t)=>e.includes(t.assetId)&&Object.keys(t.queryParams||{}).find(t=>e.includes(t))?e:e.includes(t.assetId)?`${e}?${new URLSearchParams(t.queryParams).toString()}`:`${e}/${t.assetId}?${new URLSearchParams(t.queryParams).toString()}`)(e,t);a(n,{method:"POST",headers:{"Content-Type":"application/octet-stream"},body:t.message}).then(r)}});var f=Object.freeze({__proto__:null,fairplay_fetch_certificate:(e,t)=>{a(e).then(t)},fairplay_request_license:function(e,t,r){const n=new FormData;var s;n.set("assetid",t.assetId),n.set("spc",(s=t.message,btoa(Array.prototype.map.call(s,(function(e){return String.fromCharCode(e)})).join("")))),fetch(e,{method:"POST",body:n,headers:t.headers}).then(e=>{if(e.ok)return e.text();throw d(e)}).then(e=>function(e){const t=atob(e),r=new Uint8Array(t.length);return Array.prototype.forEach.call(t,(function(e,t){r[t]=e.charCodeAt(0)})),r}(e)).then(r)}}),l=Object.freeze({__proto__:null,ezdrm:u,buydrm:f});function y(e,t,n){const s=t[r],o=null==s?void 0:s.certificate;if(!s||!o)return;if(e.src&&0===e.src.indexOf("blob:"))return;const i=s.vendor||"ezdrm",a="string"==typeof i?l[i]:i;a.fairplay_fetch_certificate(o,(function(o){e.webkitSetMediaKeys(new window.WebKitMediaKeys(r));const i=n.initData,c=function(e){const t=function(e){const t=new Uint16Array(e);return String.fromCharCode(...t)}(e.buffer);return t.substring(t.indexOf("skd:")+6).split(";").pop()}(i);if(!c)return console.debug("flowplayer::drm::fairplay - unable to extract content id from init data");const d=function(e,t,r){"string"==typeof t&&(t=function(e){const t=new ArrayBuffer(2*e.length),r=new Uint16Array(t);return Array(...Array(e.length)).map((e,t)=>t).forEach(t=>{r[t]=e.charCodeAt(t)}),r}(t));let n=0;const s=new ArrayBuffer(e.byteLength+4+t.byteLength+4+r.byteLength),o=new DataView(s);new Uint8Array(s,n,e.byteLength).set(e),n+=e.byteLength,o.setUint32(n,t.byteLength,!0),n+=4;const i=new Uint16Array(s,n,t.length);i.set(t),n+=i.byteLength,o.setUint32(n,r.byteLength,!0),n+=4;return new Uint8Array(s,n,r.byteLength).set(r),new Uint8Array(s,0,s.byteLength)}(i,c,o),u=e.webkitKeys.createSession("application/x-mpegurl",d);u.addEventListener("webkitkeyerror",console.debug.bind(console,"webkitkeyerror")),u.addEventListener("webkitkeymessage",(function(e){const n={message:e.message,assetId:c,headers:s.http_headers||{},queryParams:t[r].query_params||{}};a.fairplay_request_license(s.license_server,n,e=>u.update(e))}))}))}class DRM{init(e,t,r){let n;r.on("webkitneedkey",e=>y(r,n.drm||{},e)),r.on("src",t=>{n=t.detail,function(e){var t,r,n,s,o;null===(t=e.hls)||void 0===t||delete t.drmSystems,null===(r=e.hls)||void 0===r||delete r.licenseXhrSetup,null===(n=e.hls)||void 0===n||delete n.requestMediaKeySystemAccessFunc,null===(s=e.hls)||void 0===s||delete s.drmSystemOptions,null===(o=e.hls)||void 0===o||delete o.emeEnabled}(e),this.hls_drm(r,e,t.detail.drm),this.dash_drm(r,e,t.detail.drm)})}hls_drm(e,t,r){if(!r)return;const n=o(r);e.setOpts({hls:Object.assign(t.hls||{},n)})}dash_drm(e,t,r){if(!r)return;const n=t.dash||{},s=i(r);e.setOpts({dash:Object.assign(n,{drm:s})})}}return Object.assign(DRM,n),function(e,t){if("object"==typeof exports&&"undefined"!=typeof module)return t;if(null===document.currentScript)return t;"flowplayer"in e||(e.flowplayer={extensions:[]});const r=e.flowplayer;return"function"==typeof r?(r(t),t):(Array.isArray(r.extensions)||(r.extensions=[]),~r.extensions.indexOf(t)||r.extensions.push(t),t)}(window,DRM)}));

package/plugins/endscreen.d.ts

@@ -73,26 +73,15 @@ declare interface Config {
     seconds_to_dvr?: number;
 }
 
-declare namespace Configs {
-    export {
-        BitOpts,
-        FlowplayerCustomElementRegistry,
-        Config,
-        CustomConfig,
-        PluginConfig
-    }
-}
-
-declare type ConfigWith<T> = Configs.Config & T;
-
-declare type ConfigWithPlaylistAndEndscreen = ConfigWith<{
-    endscreen?: EndscreenConfig;
-    playlist?: PlaylistConfig;
-}>;
-
 declare type CustomConfig<T> = Config & T;
 
-declare const _default: typeof Endscreen;
+declare const _default: PluginCtor<    {
+endscreen?: Partial<{
+interstitial: boolean;
+delay: number;
+}> | undefined;
+playlist?: PlaylistConfig | undefined;
+}>;
 export default _default;
 
 declare type DeviceId = string;
@@ -120,29 +109,6 @@ declare type DRMVendorImplementation = {
     }, cb: (license_data: Uint8Array) => void) => void;
 };
 
-declare class Endscreen implements Plugin_2 {
-    static events: {
-        RECOMMENDATIONS_RENDER: string;
-        RECOMMENDATIONS_READY: string;
-        RECOMMENDATIONS_HIDE: string;
-    };
-    recommendations?: EndscreenRecommendations;
-    logger: Logger;
-    constructor(umd: FlowplayerUMD, _player: Player);
-    init(config: ConfigWithPlaylistAndEndscreen, container: PlayerRoot, player: PlaylistPlayer): void;
-    private _setSrc;
-    private hide_recommendations;
-}
-
-declare type EndscreenConfig = Partial<{
-    interstitial: boolean;
-    delay: number;
-}>;
-
-declare type EndscreenRecommendations = {
-    playlist: Array<PlaylistItem>;
-};
-
 declare type FlowplayerCustomElementRegistry = Map<string, string>;
 
 declare interface FlowplayerUMD extends FlowplayerUMDBase {
@@ -197,11 +163,6 @@ declare interface Loader<PluginOwnConfig extends KeyValue = KeyValue> extends Pl
     wants<S = KeyValue, T = KeyValue>(srcString: SourceStr, srcObj: SourceWith<S>, config: PluginConfig<T>): boolean;
 }
 
-declare interface Logger {
-    (...args: any[]): void;
-    log(...args: any[]): void;
-}
-
 declare type MapToConfigs<Arr extends PluginCtor[]> = {
     [PluginType in keyof Arr]: Arr[PluginType] extends PluginCtor<infer ConfigType> ? ConfigType : never;
 };
@@ -292,13 +253,6 @@ declare type PlaylistConfig = {
     theme?: string;
 };
 
-declare type PlaylistItem = {
-    poster?: string;
-    title?: string;
-    description?: string;
-    src: string[];
-};
-
 /* Excluded from this release type: PlaylistPlayer */
 
 declare interface Plugin_2<PluginOwnConfig extends KeyValue = KeyValue> {

package/plugins/fas.d.ts

@@ -74,20 +74,13 @@ declare interface Config {
     seconds_to_dvr?: number;
 }
 
-declare namespace Configs {
-    export {
-        BitOpts,
-        FlowplayerCustomElementRegistry,
-        Config,
-        CustomConfig,
-        PluginConfig
-    }
-}
-
-declare type ConfigWith<T> = Configs.Config & T;
-
 declare type CustomConfig<T> = Config & T;
 
+declare const _default: PluginCtor<    {
+fas?: FASAttrs | undefined;
+}>;
+export default _default;
+
 declare type DeviceId = string;
 
 declare type DRM_KEYSYSTEM = "com.widevine.alpha" | "com.microsoft.playready" | "org.w3.clearkey" | "com.apple.fps.1_0";
@@ -113,31 +106,11 @@ declare type DRMVendorImplementation = {
     }, cb: (license_data: Uint8Array) => void) => void;
 };
 
-declare class FAS implements Plugin_2 {
-    readonly player: Player;
-    frame_rate: FRAMERATE;
-    frame_offset: number;
-    constructor(umd: FlowplayerUMD, player: Player);
-    init(_config: FASConfig, _root: PlayerRoot, video: PlayerWith<{
-        hls?: any;
-        fas?: FAS;
-    }>): void;
-    current_frame(): number;
-    seek_to(timecode_or_frame: number): void;
-    current_timecode(): string;
-    jump(frames: number): void;
-}
-export default FAS;
-
 declare type FASAttrs = {
     frame_rate?: FRAMERATE;
     frame_offset?: number;
 };
 
-declare type FASConfig = ConfigWith<{
-    fas?: FASAttrs;
-}>;
-
 declare type FlowplayerCustomElementRegistry = Map<string, string>;
 
 declare interface FlowplayerUMD extends FlowplayerUMDBase {
@@ -250,22 +223,8 @@ declare type PlayerRoot = HTMLElement & {
     prevWidth?: number;
 };
 
-declare namespace Players {
-    export {
-        VideoTrack,
-        PlayerState,
-        FPEvent,
-        DeviceId,
-        JSONPlayer,
-        PlayerRoot,
-        Player
-    }
-}
-
 declare type PlayerState = string;
 
-declare type PlayerWith<T> = Players.Player & T;
-
 declare interface Plugin_2<PluginOwnConfig extends KeyValue = KeyValue> {
     /**
      * a plugin must always implement the init method so a player instance knows how to initialize it