Add TS to Cue utilities.

src/config.ts

@@ -17,7 +17,7 @@ import TimelineController from './controller/timeline-controller';
 import SubtitleTrackController from './controller/subtitle-track-controller';
 import { SubtitleStreamController } from './controller/subtitle-stream-controller';
 import EMEController from './controller/eme-controller';
-import { requestMediaKeySystemAccess } from './utils/mediakeys-helper';
+import { requestMediaKeySystemAccess, MediaKeyFunc } from './utils/mediakeys-helper';
 
 type ABRControllerConfig = {
   abrEwmaFastLive: number,
@@ -42,11 +42,11 @@ type CapLevelControllerConfig = {
   capLevelToPlayerSize: boolean
 };
 
-type EMEControllerConfig = {
+export type EMEControllerConfig = {
   licenseXhrSetup?: (xhr: XMLHttpRequest, url: string) => void,
   emeEnabled: boolean,
   widevineLicenseUrl?: string,
-  requestMediaKeySystemAccessFunc: Function, // TODO(typescript-mediakeys-helper) Type once file is done
+  requestMediaKeySystemAccessFunc: MediaKeyFunc | null,
 };
 
 type FragmentLoaderConfig = {

src/controller/eme-controller.ts

@@ -9,17 +9,11 @@ import Event from '../events';
 import { ErrorTypes, ErrorDetails } from '../errors';
 
 import { logger } from '../utils/logger';
+import { EMEControllerConfig } from '../config';
+import { KeySystems, MediaKeyFunc } from '../utils/mediakeys-helper';
 
 const MAX_LICENSE_REQUEST_FAILURES = 3;
 
-/**
- * @see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/requestMediaKeySystemAccess
- */
-enum KeySystems {
-  WIDEVINE = 'com.widevine.alpha',
-  PLAYREADY = 'com.microsoft.playready',
-}
-
 /**
  * @see https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemConfiguration
  * @param {Array<string>} audioCodecs List of required audio codecs to support
@@ -86,12 +80,13 @@ interface MediaKeysListItem {
  * @constructor
  */
 class EMEController extends EventHandler {
-  private _widevineLicenseUrl: string;
-  private _licenseXhrSetup: (xhr: XMLHttpRequest, url: string) => void;
+  private _widevineLicenseUrl?: string;
+  private _licenseXhrSetup?: (xhr: XMLHttpRequest, url: string) => void;
   private _emeEnabled: boolean;
-  private _requestMediaKeySystemAccess: (keySystem: KeySystems, supportedConfigurations: MediaKeySystemConfiguration[]) => Promise<MediaKeySystemAccess>
+  private _requestMediaKeySystemAccess: MediaKeyFunc | null
 
-  private _mediaKeysList: MediaKeysListItem[] = []
+  private _config: EMEControllerConfig;
+  private _mediaKeysList: MediaKeysListItem[] = [];
   private _media: HTMLMediaElement | null = null;
   private _hasSetMediaKeys: boolean = false;
   private _requestLicenseFailureCount: number = 0;
@@ -106,11 +101,12 @@ class EMEController extends EventHandler {
       Event.MEDIA_DETACHED,
       Event.MANIFEST_PARSED
     );
+    this._config = hls.config;
 
-    this._widevineLicenseUrl = hls.config.widevineLicenseUrl;
-    this._licenseXhrSetup = hls.config.licenseXhrSetup;
-    this._emeEnabled = hls.config.emeEnabled;
-    this._requestMediaKeySystemAccess = hls.config.requestMediaKeySystemAccessFunc;
+    this._widevineLicenseUrl = this._config.widevineLicenseUrl;
+    this._licenseXhrSetup = this._config.licenseXhrSetup;
+    this._emeEnabled = this._config.emeEnabled;
+    this._requestMediaKeySystemAccess = this._config.requestMediaKeySystemAccessFunc;
   }
 
   /**
@@ -121,6 +117,9 @@ class EMEController extends EventHandler {
   getLicenseServerUrl (keySystem: KeySystems): string {
     switch (keySystem) {
     case KeySystems.WIDEVINE:
+      if (!this._widevineLicenseUrl) {
+        break;
+      }
       return this._widevineLicenseUrl;
     }
 

src/controller/id3-track-controller.js

@@ -75,7 +75,7 @@ class ID3TrackController extends EventHandler {
           // Give a slight bump to the endTime if it's equal to startTime to avoid a SyntaxError in IE
           endTime += 0.0001;
         } else if (startTime > endTime) {
-          logger.warn("detected an id3 sample with endTime < startTime, adjusting endTime to (startTime + 0.25)");
+          logger.warn('detected an id3 sample with endTime < startTime, adjusting endTime to (startTime + 0.25)');
           endTime = startTime + 0.25;
         }