@flowplayer/player 3.23.0 → 3.24.0-rc.1

package/plugins/vtsel.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 */
@@ -262,41 +260,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
  */
@@ -530,13 +493,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>;
 }
 
 /**
@@ -1155,6 +1118,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";
 
 /**
@@ -1483,7 +1451,6 @@ declare type SourceObj<T = unknown> = {
      *  the MIME type (example `video/mp4` or `application/x-mpegurl`)
      */
     type?: string;
-    drm?: DRMSourceConfiguration;
 } & T;
 
 /**
@@ -1803,6 +1770,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/webos.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 */
@@ -262,41 +260,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
  */
@@ -523,13 +486,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>;
 }
 
 /**
@@ -1146,6 +1109,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";
 
 /**
@@ -1474,7 +1442,6 @@ declare type SourceObj<T = unknown> = {
      *  the MIME type (example `video/mp4` or `application/x-mpegurl`)
      */
     type?: string;
-    drm?: DRMSourceConfiguration;
 } & T;
 
 /**
@@ -1710,6 +1677,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/util/loader.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 */
@@ -270,41 +268,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
  */
@@ -531,13 +494,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>;
 }
 
 /**
@@ -1164,6 +1127,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";
 
 /**
@@ -1497,7 +1465,6 @@ declare type SourceObj<T = unknown> = {
      *  the MIME type (example `video/mp4` or `application/x-mpegurl`)
      */
     type?: string;
-    drm?: DRMSourceConfiguration;
 } & T;
 
 /**
@@ -1721,6 +1688,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/util/loader.js

@@ -1,7 +1,7 @@
 'use strict';
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.modules = exports.root = exports.isESM = exports.define = void 0;
+Object.defineProperty(exports, '__esModule', { value: true });
+
 /**
  * @public
  * adds support for asynchronous plugin loading
@@ -18,7 +18,7 @@ plugin // Only expose explicitly stated API with NoInfer
         return plugin;
     if (!("flowplayer" in root))
         root.flowplayer = { extensions: [] };
-    var self = root.flowplayer;
+    const self = root.flowplayer;
     if (typeof self === "function") {
         self(plugin);
         return plugin;
@@ -29,14 +29,12 @@ plugin // Only expose explicitly stated API with NoInfer
         self.extensions.push(plugin);
     return plugin;
 }
-exports.define = define;
 /**
  * @public
  */
 function isESM() {
     return document.currentScript === null;
 }
-exports.isESM = isESM;
 /**
  * @public
  */
@@ -47,16 +45,19 @@ function root() {
         return global;
     return {};
 }
-exports.root = root;
 /**
  * @public
  */
 function modules() {
-    var self = root();
+    const self = root();
     // naively check for existance of flowplayer umd
-    var mod = self.flowplayer ? self.flowplayer : { extensions: [] };
+    const mod = self.flowplayer ? self.flowplayer : { extensions: [] };
     if (!Array.isArray(mod.extensions))
         mod.extensions = [];
     return mod;
 }
+
+exports.define = define;
+exports.isESM = isESM;
 exports.modules = modules;
+exports.root = root;