@flowplayer/player 3.23.1-rc → 3.24.0-rc.2

package/plugins/context-menu.d.ts

@@ -3,8 +3,6 @@
 import type { BitrateInfo } from 'dashjs';
 import type { Get } from 'type-fest';
 import type { Level } from 'hls.js';
-import type { MediaKeyFunc } from 'hls.js';
-import type { SetFieldType } from 'type-fest';
 import type { TupleToUnion } from 'type-fest';
 
 /* Excluded from this release type: AnyLoader */
@@ -275,41 +273,6 @@ declare const DESTROYED = "is-destroyed";
 
 declare const DISABLED = "is-disabled";
 
-/**
- * @public
- */
-declare type DRM_KEYSYSTEM = "com.widevine.alpha" | "com.microsoft.playready" | "org.w3.clearkey" | "com.apple.fps.1_0";
-
-/**
- * @public
- */
-declare type DRMConfiguration = {
-    license_server: string;
-    http_headers?: Record<string, string>;
-    certificate?: string;
-    vendor?: string | DRMVendorImplementation;
-    request_media_key_system_access_function?: MediaKeyFunc;
-    query_params?: Record<string, string>;
-};
-
-/**
- * @public
- */
-declare type DRMSourceConfiguration = {
-    [keysystem in DRM_KEYSYSTEM]?: DRMConfiguration;
-};
-
-/**
- * @public
- */
-declare type DRMVendorImplementation = {
-    fairplay_fetch_certificate: (url: string, cb: (certificate_data: Uint8Array) => void) => void;
-    fairplay_request_license: (url: string, params: {
-        message: any;
-        assetId: string;
-    }, cb: (license_data: Uint8Array) => void) => void;
-};
-
 /**
  * @public
  */
@@ -536,13 +499,13 @@ declare interface FlowplayerUMDWithPlugins<ConfigWithPlugins extends Config = Co
      * @param selector - query selector of the HTML element where player will render
      * @param config - Configuration of the flowplayer and the attached plugins
      */
-    (selector: string, config?: ConfigWithPlugins): WithOpts<PluginPlayer, ConfigWithPlugins>;
+    (selector: string, config?: ConfigWithPlugins): PlayerWithOpts<PluginPlayer, ConfigWithPlugins>;
     /**
      * Configure flowplayer, it's attached plugins and display flowplayer it in the UI
      * @param element - HTML element where player will render
      * @param config - Configuration of the flowplayer and the attached plugins
      */
-    (element: HTMLElement, config?: ConfigWithPlugins): WithOpts<PluginPlayer, ConfigWithPlugins>;
+    (element: HTMLElement, config?: ConfigWithPlugins): PlayerWithOpts<PluginPlayer, ConfigWithPlugins>;
 }
 
 /**
@@ -1166,6 +1129,11 @@ declare type PlayerState = FlowplayerStates[keyof FlowplayerStates];
  */
 declare type PlayerWith<T> = T & Player;
 
+declare type PlayerWithOpts<PluginPlayer extends Player = Player, PluginConfig extends Config = Config> = Omit<PluginPlayer, "opts" | "setOpts"> & {
+    opts: PluginConfig;
+    setOpts: (config: PluginConfig) => void;
+};
+
 declare const PLAYING = "is-playing";
 
 /**
@@ -1196,6 +1164,7 @@ declare interface Plugin_2<PluginConfig extends Config = Config, PluginPlayer ex
  */
 declare interface PluginCtor<PluginConfig extends Config = Config, PluginPlayer extends Player = Player> {
     new (umd: FlowplayerUMD, player: Player): Plugin_2<PluginConfig, PluginPlayer>;
+    pluginName: string;
 }
 
 /* Excluded from this release type: PluginRegisteredEventDetail */
@@ -1494,7 +1463,6 @@ declare type SourceObj<T = unknown> = {
      *  the MIME type (example `video/mp4` or `application/x-mpegurl`)
      */
     type?: string;
-    drm?: DRMSourceConfiguration;
 } & T;
 
 /**
@@ -1718,6 +1686,4 @@ declare const WILL_PLAY = "will-play";
 
 declare const WILL_SEEK = "will-seek";
 
-declare type WithOpts<PluginPlayer extends Player = Player, PluginConfig extends Config = Config> = SetFieldType<SetFieldType<PluginPlayer, "opts", PluginConfig>, "setOpts", (config: PluginConfig) => void>;
-
 export { }

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)}));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)}))}})}));
+!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"),c=n.onclick;return n.class&&(o.className=n.class),n.text&&(o.innerText=n.text),c&&o.addEventListener("click",(function(e){c(e,t)})),o}var n;const o=[{text:"Flowplayer © "+(new Date).getFullYear()},{href:"https://flowplayer.com",text:"About this player"},{href:"https://flowplayer.com/license/",text:"GPL based license"}];let c=!1;const s=e=>{e.classList.remove("fp-active"),c=!1};document.addEventListener("click",e=>{2!=e.button&&0!=c&&s(c)}),document.addEventListener("keyup",(function(){c&&s(c)}));const i=((n=class ContextMenu{init(e,n,s){const i=e.context_menu||o,l=document.createElement("div");l.className="fp-context-menu fp-menu",l.append(...i.map(e=>t(s,e)));const r=function(e,t){const n=e._customElements.get(t);return n&&e.root.querySelector(n)||void 0}(s,"flowplayer-ui");r&&r.addEventListener("contextmenu",(function(e){if(!l.parentNode)return;e.preventDefault(),s.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"),c=l)}))}}).pluginName="context-menu",n);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,i)}));

package/plugins/cuepoints.d.ts

@@ -3,8 +3,6 @@
 import type { BitrateInfo } from 'dashjs';
 import type { Get } from 'type-fest';
 import type { Level } from 'hls.js';
-import type { MediaKeyFunc } from 'hls.js';
-import type { SetFieldType } from 'type-fest';
 import type { TupleToUnion } from 'type-fest';
 
 /* Excluded from this release type: AnyLoader */
@@ -384,41 +382,6 @@ declare const DESTROYED = "is-destroyed";
 
 declare const DISABLED = "is-disabled";
 
-/**
- * @public
- */
-declare type DRM_KEYSYSTEM = "com.widevine.alpha" | "com.microsoft.playready" | "org.w3.clearkey" | "com.apple.fps.1_0";
-
-/**
- * @public
- */
-declare type DRMConfiguration = {
-    license_server: string;
-    http_headers?: Record<string, string>;
-    certificate?: string;
-    vendor?: string | DRMVendorImplementation;
-    request_media_key_system_access_function?: MediaKeyFunc;
-    query_params?: Record<string, string>;
-};
-
-/**
- * @public
- */
-declare type DRMSourceConfiguration = {
-    [keysystem in DRM_KEYSYSTEM]?: DRMConfiguration;
-};
-
-/**
- * @public
- */
-declare type DRMVendorImplementation = {
-    fairplay_fetch_certificate: (url: string, cb: (certificate_data: Uint8Array) => void) => void;
-    fairplay_request_license: (url: string, params: {
-        message: any;
-        assetId: string;
-    }, cb: (license_data: Uint8Array) => void) => void;
-};
-
 /**
  * @public
  */
@@ -653,13 +616,13 @@ declare interface FlowplayerUMDWithPlugins<ConfigWithPlugins extends Config = Co
      * @param selector - query selector of the HTML element where player will render
      * @param config - Configuration of the flowplayer and the attached plugins
      */
-    (selector: string, config?: ConfigWithPlugins): WithOpts<PluginPlayer, ConfigWithPlugins>;
+    (selector: string, config?: ConfigWithPlugins): PlayerWithOpts<PluginPlayer, ConfigWithPlugins>;
     /**
      * Configure flowplayer, it's attached plugins and display flowplayer it in the UI
      * @param element - HTML element where player will render
      * @param config - Configuration of the flowplayer and the attached plugins
      */
-    (element: HTMLElement, config?: ConfigWithPlugins): WithOpts<PluginPlayer, ConfigWithPlugins>;
+    (element: HTMLElement, config?: ConfigWithPlugins): PlayerWithOpts<PluginPlayer, ConfigWithPlugins>;
 }
 
 /**
@@ -1276,6 +1239,11 @@ declare type PlayerState = FlowplayerStates[keyof FlowplayerStates];
  */
 declare type PlayerWith<T> = T & Player;
 
+declare type PlayerWithOpts<PluginPlayer extends Player = Player, PluginConfig extends Config = Config> = Omit<PluginPlayer, "opts" | "setOpts"> & {
+    opts: PluginConfig;
+    setOpts: (config: PluginConfig) => void;
+};
+
 declare const PLAYING = "is-playing";
 
 /**
@@ -1306,6 +1274,7 @@ declare interface Plugin_2<PluginConfig extends Config = Config, PluginPlayer ex
  */
 declare interface PluginCtor<PluginConfig extends Config = Config, PluginPlayer extends Player = Player> {
     new (umd: FlowplayerUMD, player: Player): Plugin_2<PluginConfig, PluginPlayer>;
+    pluginName: string;
 }
 
 /* Excluded from this release type: PluginRegisteredEventDetail */
@@ -1604,7 +1573,6 @@ declare type SourceObj<T = unknown> = {
      *  the MIME type (example `video/mp4` or `application/x-mpegurl`)
      */
     type?: string;
-    drm?: DRMSourceConfiguration;
 } & T;
 
 /**
@@ -1828,6 +1796,4 @@ declare const WILL_PLAY = "will-play";
 
 declare const WILL_SEEK = "will-seek";
 
-declare type WithOpts<PluginPlayer extends Player = Player, PluginConfig extends Config = Config> = SetFieldType<SetFieldType<PluginPlayer, "opts", PluginConfig>, "setOpts", (config: PluginConfig) => void>;
-
 export { }

package/plugins/cuepoints.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.cuepoints=t())}(this,(function(){"use strict";var e=Object.freeze({__proto__:null,CUEPOINTS:"cuepoints",CUEPOINT_START:"cuepointstart",CUEPOINT_END:"cuepointend"});const t=(e,t)=>new(((e,t)=>{const n=e.get(t);if(!n)throw new Error(`no flowplayer component with the name ${t} exists`);const o=window.customElements.get(t);if(!o)throw new Error(`no default flowplayer component with the name ${t} exists`);const r=window.customElements.get(n);return"function"!=typeof r?o:r})(e._customElements,t))(e);function n(e,t,n){const o=function(e,t){const n=new CustomEvent(e,{detail:t,cancelable:!0});return t&&Object.defineProperty(n,"data",{get:()=>t}),n}(t,n);return e.dispatchEvent(o),e}function o(e){const t=e._customElements.get("flowplayer-cue");t&&Array.from(e.root.querySelectorAll(t)).forEach(e=>{e.remove()})}function r(e,o){var r;const i=function(e,t){const n=e._customElements.get(t);return n&&e.root.querySelector(n)||void 0}(e,"flowplayer-timeline-bar"),s=e.duration,c=null===(r=null==e?void 0:e.opts)||void 0===r?void 0:r.draw_cuepoints;i&&!e.hasState("is-live")&&isFinite(s)&&Array.isArray(o)&&c&&o.forEach(o=>{if(void 0===o.startTime||o.startTime<0||!o.endTime||o.startTime===o.endTime)return;const r=Math.round(o.startTime/s*1e3)/10;if(r>100||r<0)return;const c=o.endTime-o.startTime,u=t(e,"flowplayer-cue");n(u,"cue:attributes",{left:r+"%",width:c/s*100+"%"}),i.append(u)})}!function(){let e=!1;try{const t=Object.defineProperty({},"passive",{get:function(){e=!0}});window.addEventListener("testPassive",null,t),window.removeEventListener("testPassive",null,t)}catch(e){}}();class FlowplayerComponent extends HTMLElement{constructor(e){super(),this.player=e}}class CueComponent extends FlowplayerComponent{constructor(e){super(e),this.className="fp-cuepoint",this.addEventListener("cue:attributes",e=>{this.style.setProperty("left",e.detail.left),this.style.setProperty("width",e.detail.width)})}}var i;const s=((i=class Cuepoints{constructor(e){((e,t,n)=>{window.customElements.get(t)||window.customElements.define(t,n),e.customElements.get(t)||e.customElements.set(t,t)})(e,"flowplayer-cue",CueComponent)}init(e,t,n){if(!n.reaper)return;const s=n.addTextTrack("metadata","fp-cuepoints");s.removeCue=function(e){this===i&&TextTrack.prototype.removeCue.call(s,e)},n.reaper.set("cuepoints",[]),n.on("config",(function(t){var o;if(!n.reaper)return;(null===(o=t.data)||void 0===o?void 0:o.cuepoints)!==n.reaper.get("cuepoints")&&n.emit("cuepoints",{cuepoints:e.cuepoints})})),n.on("durationchange",()=>{n.reaper&&(o(n),r(n,n.reaper.get("cuepoints")))}),n.on("cuepoints",e=>{var t;if(!n.reaper)return;const i=(null===(t=e.data)||void 0===t?void 0:t.cuepoints)||[];n.reaper.set("cuepoints",i),Array.from(s.cues||{length:0}).forEach(e=>s.removeCue.call(this.constructor,e)),o(n),i.map((function(e){return function(e,t){try{const n=new VTTCue(t.startTime,t.endTime,t.text||"");return n.id=t.id||"",n.onenter=e.emit.bind(e,"cuepointstart",{cuepoint:t}),n.onexit=e.emit.bind(e,"cuepointend",{cuepoint:t}),n}catch(e){if(t.startTime===t.endTime)return console.warn("Cue(:error)> startTime cannot equal endTime on this platform");throw e}}(n,e)})).forEach((function(e){e&&s.addCue(e)})),r(n,i)})}}).events=e,i);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,s)}));
+!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.cuepoints=t())}(this,(function(){"use strict";var e=Object.freeze({__proto__:null,CUEPOINTS:"cuepoints",CUEPOINT_START:"cuepointstart",CUEPOINT_END:"cuepointend"});const t=(e,t)=>new(((e,t)=>{const n=e.get(t);if(!n)throw new Error(`no flowplayer component with the name ${t} exists`);const o=window.customElements.get(t);if(!o)throw new Error(`no default flowplayer component with the name ${t} exists`);const r=window.customElements.get(n);return"function"!=typeof r?o:r})(e._customElements,t))(e);function n(e,t,n){const o=function(e,t){const n=new CustomEvent(e,{detail:t,cancelable:!0});return t&&Object.defineProperty(n,"data",{get:()=>t}),n}(t,n);return e.dispatchEvent(o),e}function o(e){const t=e._customElements.get("flowplayer-cue");t&&Array.from(e.root.querySelectorAll(t)).forEach(e=>{e.remove()})}function r(e,o){var r;const i=function(e,t){const n=e._customElements.get(t);return n&&e.root.querySelector(n)||void 0}(e,"flowplayer-timeline-bar"),s=e.duration,c=null===(r=null==e?void 0:e.opts)||void 0===r?void 0:r.draw_cuepoints;i&&!e.hasState("is-live")&&isFinite(s)&&Array.isArray(o)&&c&&o.forEach(o=>{if(void 0===o.startTime||o.startTime<0||!o.endTime||o.startTime===o.endTime)return;const r=Math.round(o.startTime/s*1e3)/10;if(r>100||r<0)return;const c=o.endTime-o.startTime,u=t(e,"flowplayer-cue");n(u,"cue:attributes",{left:r+"%",width:c/s*100+"%"}),i.append(u)})}!function(){let e=!1;try{const t=Object.defineProperty({},"passive",{get:function(){e=!0}});window.addEventListener("testPassive",null,t),window.removeEventListener("testPassive",null,t)}catch(e){}}();class FlowplayerComponent extends HTMLElement{constructor(e){super(),this.player=e}}class CueComponent extends FlowplayerComponent{constructor(e){super(e),this.className="fp-cuepoint",this.addEventListener("cue:attributes",e=>{this.style.setProperty("left",e.detail.left),this.style.setProperty("width",e.detail.width)})}}var i;const s=((i=class Cuepoints{constructor(e){((e,t,n)=>{window.customElements.get(t)||window.customElements.define(t,n),e.customElements.get(t)||e.customElements.set(t,t)})(e,"flowplayer-cue",CueComponent)}init(e,t,n){if(!n.reaper)return;const s=n.addTextTrack("metadata","fp-cuepoints");s.removeCue=function(e){this===i&&TextTrack.prototype.removeCue.call(s,e)},n.reaper.set("cuepoints",[]),n.on("config",(function(t){var o;if(!n.reaper)return;(null===(o=t.data)||void 0===o?void 0:o.cuepoints)!==n.reaper.get("cuepoints")&&n.emit("cuepoints",{cuepoints:e.cuepoints})})),n.on("durationchange",()=>{n.reaper&&(o(n),r(n,n.reaper.get("cuepoints")))}),n.on("cuepoints",e=>{var t;if(!n.reaper)return;const i=(null===(t=e.data)||void 0===t?void 0:t.cuepoints)||[];n.reaper.set("cuepoints",i),Array.from(s.cues||{length:0}).forEach(e=>s.removeCue.call(this.constructor,e)),o(n),i.map((function(e){return function(e,t){try{const n=new VTTCue(t.startTime,t.endTime,t.text||"");return n.id=t.id||"",n.onenter=e.emit.bind(e,"cuepointstart",{cuepoint:t}),n.onexit=e.emit.bind(e,"cuepointend",{cuepoint:t}),n}catch(e){if(t.startTime===t.endTime)return console.warn("Cue(:error)> startTime cannot equal endTime on this platform");throw e}}(n,e)})).forEach((function(e){e&&s.addCue(e)})),r(n,i)})}}).pluginName="cuepoints",i.events=e,i);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,s)}));

package/plugins/dash.d.ts

@@ -4,11 +4,9 @@ import type { BitrateInfo } from 'dashjs';
 import type * as DashJS from 'dashjs';
 import type { Get } from 'type-fest';
 import type { Level } from 'hls.js';
-import type { MediaKeyFunc } from 'hls.js';
 import type { MediaPlayerClass } from 'dashjs';
 import type { MediaSettings } from 'dashjs';
 import type { ProtectionDataSet } from 'dashjs';
-import type { SetFieldType } from 'type-fest';
 import type { TupleToUnion } from 'type-fest';
 
 declare namespace allEvents {
@@ -329,41 +327,6 @@ declare const DESTROYED = "is-destroyed";
 
 declare const DISABLED = "is-disabled";
 
-/**
- * @public
- */
-declare type DRM_KEYSYSTEM = "com.widevine.alpha" | "com.microsoft.playready" | "org.w3.clearkey" | "com.apple.fps.1_0";
-
-/**
- * @public
- */
-declare type DRMConfiguration = {
-    license_server: string;
-    http_headers?: Record<string, string>;
-    certificate?: string;
-    vendor?: string | DRMVendorImplementation;
-    request_media_key_system_access_function?: MediaKeyFunc;
-    query_params?: Record<string, string>;
-};
-
-/**
- * @public
- */
-declare type DRMSourceConfiguration = {
-    [keysystem in DRM_KEYSYSTEM]?: DRMConfiguration;
-};
-
-/**
- * @public
- */
-declare type DRMVendorImplementation = {
-    fairplay_fetch_certificate: (url: string, cb: (certificate_data: Uint8Array) => void) => void;
-    fairplay_request_license: (url: string, params: {
-        message: any;
-        assetId: string;
-    }, cb: (license_data: Uint8Array) => void) => void;
-};
-
 /**
  * @public
  */
@@ -590,13 +553,13 @@ declare interface FlowplayerUMDWithPlugins<ConfigWithPlugins extends Config = Co
      * @param selector - query selector of the HTML element where player will render
      * @param config - Configuration of the flowplayer and the attached plugins
      */
-    (selector: string, config?: ConfigWithPlugins): WithOpts<PluginPlayer, ConfigWithPlugins>;
+    (selector: string, config?: ConfigWithPlugins): PlayerWithOpts<PluginPlayer, ConfigWithPlugins>;
     /**
      * Configure flowplayer, it's attached plugins and display flowplayer it in the UI
      * @param element - HTML element where player will render
      * @param config - Configuration of the flowplayer and the attached plugins
      */
-    (element: HTMLElement, config?: ConfigWithPlugins): WithOpts<PluginPlayer, ConfigWithPlugins>;
+    (element: HTMLElement, config?: ConfigWithPlugins): PlayerWithOpts<PluginPlayer, ConfigWithPlugins>;
 }
 
 /**
@@ -1213,6 +1176,11 @@ declare type PlayerState = FlowplayerStates[keyof FlowplayerStates];
  */
 declare type PlayerWith<T> = T & Player;
 
+declare type PlayerWithOpts<PluginPlayer extends Player = Player, PluginConfig extends Config = Config> = Omit<PluginPlayer, "opts" | "setOpts"> & {
+    opts: PluginConfig;
+    setOpts: (config: PluginConfig) => void;
+};
+
 declare const PLAYING = "is-playing";
 
 /**
@@ -1243,6 +1211,7 @@ declare interface Plugin_2<PluginConfig extends Config = Config, PluginPlayer ex
  */
 declare interface PluginCtor<PluginConfig extends Config = Config, PluginPlayer extends Player = Player> {
     new (umd: FlowplayerUMD, player: Player): Plugin_2<PluginConfig, PluginPlayer>;
+    pluginName: string;
 }
 
 /* Excluded from this release type: PluginRegisteredEventDetail */
@@ -1541,7 +1510,6 @@ declare type SourceObj<T = unknown> = {
      *  the MIME type (example `video/mp4` or `application/x-mpegurl`)
      */
     type?: string;
-    drm?: DRMSourceConfiguration;
 } & T;
 
 /**
@@ -1765,6 +1733,4 @@ declare const WILL_PLAY = "will-play";
 
 declare const WILL_SEEK = "will-seek";
 
-declare type WithOpts<PluginPlayer extends Player = Player, PluginConfig extends Config = Config> = SetFieldType<SetFieldType<PluginPlayer, "opts", PluginConfig>, "setOpts", (config: PluginConfig) => void>;
-
 export { }