adding xhrSetup only for aes key encryption

amiznikov · Feb 26, 2021 · 574c6d1 · 574c6d1
1 parent 9996ed8
commit 574c6d1
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 13 deletions.
diff --git a/dist/hls-demo.js b/dist/hls-demo.js
@@ -1405,7 +1405,7 @@ if (demoConfig) {
 }
 
 var hlsjsDefaults = {
-  debug: true,
+  debug: false,
   enableWorker: true,
   lowLatencyMode: true,
   liveBackBufferLength: 60 * 1.5
@@ -1646,9 +1646,10 @@ function loadSelectedStream() {
   if (!Hls.isSupported()) {
     handleUnsupported();
     return;
-  }
+  } // url = $('#streamURL').val();
+
 
-  url = $('#streamURL').val();
+  url = 'https://zhopa.gcdn.co/videos/676_gY5alQ2LUATbRebt_s_keyserver.gvideo.co/index-svod480n-v1-a1.m3u8';
   setupGlobals();
   hideCanvas();
 

diff --git a/dist/hls-demo.js.map b/dist/hls-demo.js.map
diff --git a/dist/hls.js b/dist/hls.js
@@ -17502,6 +17502,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
 /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
 /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 /*
  * Decrypt key Loader
  */
@@ -17571,7 +17577,9 @@ var KeyLoader = /*#__PURE__*/function () {
       }
 
       var Loader = config.loader;
-      var fragLoader = frag.loader = this.loaders[type] = new Loader(config);
+      console.log(config);
+      var fragLoader = frag.loader = this.loaders[type] = new Loader( // config
+      _objectSpread(_objectSpread({}, config), config.keyRequest));
       this.decrypturl = uri;
       this.decryptkey = null;
       var loaderContext = {
@@ -17594,6 +17602,7 @@ var KeyLoader = /*#__PURE__*/function () {
         onError: this.loaderror.bind(this),
         onTimeout: this.loadtimeout.bind(this)
       };
+      console.log('data', loaderConfig, loaderContext);
       fragLoader.load(loaderContext, loaderConfig, loaderCallbacks);
     } else if (this.decryptkey) {
       // Return the key if it's already been loaded

diff --git a/dist/hls.js.map b/dist/hls.js.map
diff --git a/dist/hls.light.js b/dist/hls.light.js
@@ -15418,6 +15418,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
 /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
 /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 /*
  * Decrypt key Loader
  */
@@ -15487,7 +15493,9 @@ var KeyLoader = /*#__PURE__*/function () {
       }
 
       var Loader = config.loader;
-      var fragLoader = frag.loader = this.loaders[type] = new Loader(config);
+      console.log(config);
+      var fragLoader = frag.loader = this.loaders[type] = new Loader( // config
+      _objectSpread(_objectSpread({}, config), config.keyRequest));
       this.decrypturl = uri;
       this.decryptkey = null;
       var loaderContext = {
@@ -15510,6 +15518,7 @@ var KeyLoader = /*#__PURE__*/function () {
         onError: this.loaderror.bind(this),
         onTimeout: this.loadtimeout.bind(this)
       };
+      console.log('data', loaderConfig, loaderContext);
       fragLoader.load(loaderContext, loaderConfig, loaderCallbacks);
     } else if (this.decryptkey) {
       // Return the key if it's already been loaded

diff --git a/dist/hls.light.js.map b/dist/hls.light.js.map
diff --git a/dist/hls.light.min.js b/dist/hls.light.min.js
diff --git a/dist/hls.light.min.js.map b/dist/hls.light.min.js.map
diff --git a/dist/hls.min.js b/dist/hls.min.js
diff --git a/dist/hls.min.js.map b/dist/hls.min.js.map
diff --git a/src/config.ts b/src/config.ts
@@ -148,6 +148,7 @@ export type HlsConfig = {
   minAutoBitrate: number;
   loader: { new (confg: HlsConfig): Loader<LoaderContext> };
   xhrSetup?: (xhr: XMLHttpRequest, url: string) => void;
+  keyRequest?: any,
 
   // Alt Audio
   audioStreamController?: typeof AudioStreamController;

diff --git a/src/loader/key-loader.ts b/src/loader/key-loader.ts
@@ -76,7 +76,7 @@ export default class KeyLoader implements ComponentAPI {
       }
       const Loader = config.loader;
       const fragLoader = (frag.loader = this.loaders[type] = new Loader(
-        config
+        { ...config, ...config.keyRequest}
       ) as Loader<FragmentLoaderContext>);
       this.decrypturl = uri;
       this.decryptkey = null;